debt - register keybinding editing service as singleton

src/vs/workbench/electron-browser/workbench.ts

@@ -40,7 +40,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
 import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IKeybindingEditingService, KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IActivityService } from 'vs/workbench/services/activity/common/activity';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -718,9 +717,6 @@ export class Workbench extends Disposable implements IPartService {
 		// Workspace Editing
 		serviceCollection.set(IWorkspaceEditingService, new SyncDescriptor(WorkspaceEditingService, undefined, true));
 
-		// Keybinding Editing
-		serviceCollection.set(IKeybindingEditingService, new SyncDescriptor(KeybindingsEditingService, undefined, true));
-
 		// Configuration Resolver
 		serviceCollection.set(IConfigurationResolverService, new SyncDescriptor(ConfigurationResolverService, [process.env], true));
 
@@ -746,6 +742,7 @@ export class Workbench extends Disposable implements IPartService {
 		Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).start(this.instantiationService, this.lifecycleService);
 		Registry.as<IEditorInputFactoryRegistry>(EditorExtensions.EditorInputFactories).setInstantiationService(this.instantiationService);
 
+		// TODO@Sandeep debt around cyclic dependencies
 		this.configurationService.acquireInstantiationService(this.instantiationService);
 	}
 

src/vs/workbench/services/keybinding/common/keybindingEditing.ts

@@ -24,7 +24,7 @@ import { ServiceIdentifier, createDecorator } from 'vs/platform/instantiation/co
 import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export const IKeybindingEditingService = createDecorator<IKeybindingEditingService>('keybindingEditingService');
 
@@ -252,3 +252,5 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
 		return '// ' + localize('emptyKeybindingsHeader', "Place your key bindings in this file to override the defaults") + EOL + '[]';
 	}
 }
+
+registerSingleton(IKeybindingEditingService, KeybindingsEditingService, true);
\ No newline at end of file

src/vs/workbench/workbench.main.ts

@@ -41,6 +41,7 @@ import 'vs/workbench/api/browser/viewsExtensionPoint';
 
 import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
 import 'vs/workbench/services/integrity/node/integrityService';
+import 'vs/workbench/services/keybinding/common/keybindingEditing';
 
 //#endregion