fix: move IConfigurationResolverService to configuration service over…

…ride

src/service-override/configuration.ts

@@ -34,6 +34,8 @@ import { IUserDataProfileService } from 'vs/workbench/services/userDataProfile/c
 import { AbstractWorkspaceEditingService } from 'vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService'
 import { BrowserWorkspacesService } from 'vs/workbench/services/workspaces/browser/workspacesService'
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing.service'
+import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService'
+import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver.service'
 import getFileServiceOverride, { initFile } from './files'
 import { registerServiceInitializePreParticipant } from '../lifecycle'
 import { getService, withReadyServices } from '../services'
@@ -156,7 +158,8 @@ function getServiceOverride (defaultWorkspace?: URI | IAnyWorkspaceIdentifier):
     [ITextResourceConfigurationService.toString()]: new SyncDescriptor(TextResourceConfigurationService, [], true),
     [IWorkspaceEditingService.toString()]: new SyncDescriptor(MonacoWorkspaceEditingService, [], true),
     [IWorkspacesService.toString()]: new SyncDescriptor(BrowserWorkspacesService, [], true),
-    [ITextResourcePropertiesService.toString()]: new SyncDescriptor(TextResourcePropertiesService, [], true)
+    [ITextResourcePropertiesService.toString()]: new SyncDescriptor(TextResourcePropertiesService, [], true),
+    [IConfigurationResolverService.toString()]: new SyncDescriptor(ConfigurationResolverService, [], true)
   }
 }
 

src/service-override/debug.ts

@@ -4,8 +4,6 @@ import { IDebugService } from 'vs/workbench/contrib/debug/common/debug.service'
 import { DebugService } from 'vs/workbench/contrib/debug/browser/debugService'
 import { LanguageFeaturesService } from 'vscode/src/vs/editor/common/services/languageFeaturesService'
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures'
-import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService'
-import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver.service'
 import { IAction } from 'vs/base/common/actions'
 import { IExtensionHostDebugService } from 'vs/platform/debug/common/extensionHostDebug.service'
 import { BrowserExtensionHostDebugService } from 'vs/workbench/contrib/debug/browser/extensionHostDebugService'
@@ -27,7 +25,6 @@ export default function getServiceOverride (): IEditorOverrideServices {
   return {
     [ILanguageFeaturesService.toString()]: new SyncDescriptor(LanguageFeaturesService, [], true), // To restore inlineValuesProvider
     [IDebugService.toString()]: new SyncDescriptor(DebugService, [], true),
-    [IConfigurationResolverService.toString()]: new SyncDescriptor(ConfigurationResolverService, [], true),
     [IExtensionHostDebugService.toString()]: new SyncDescriptor(BrowserExtensionHostDebugService, [], true),
     [IDebugVisualizerService.toString()]: new SyncDescriptor(DebugVisualizerService, [], true)
   }