debt - register accessibility service declaratively

Benjamin Pasero · Benjamin Pasero · commit e9f899f5cc6e · 2019-03-07T12:12:27.000+01:00
diff --git a/src/vs/platform/accessibility/node/accessibilityService.ts b/src/vs/platform/accessibility/node/accessibilityService.ts
@@ -7,6 +7,7 @@ import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessi
 import { isWindows } from 'vs/base/common/platform';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IWindowService } from 'vs/platform/windows/common/windows';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class AccessibilityService implements IAccessibilityService {
 	_serviceBrand: any;
@@ -56,4 +57,6 @@ export class AccessibilityService implements IAccessibilityService {
 
 		return this._accessibilitySupport;
 	}
-}
+}
+
+registerSingleton(IAccessibilityService, AccessibilityService, true);
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
@@ -93,7 +93,6 @@ import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/serv
 import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
 import { WorkbenchThemeService } from 'vs/workbench/services/themes/browser/workbenchThemeService';
 import { IProductService } from 'vs/platform/product/common/product';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { WorkbenchContextKeysHandler } from 'vs/workbench/browser/contextkeys';
 import { IDimension } from 'vs/platform/layout/browser/layoutService';
 import { Part } from 'vs/workbench/browser/part';
@@ -114,7 +113,6 @@ import { ExtensionManagementChannelClient } from 'vs/platform/extensionManagemen
 import { ExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService';
 import { MultiExtensionManagementService } from 'vs/workbench/services/extensionManagement/node/multiExtensionManagement';
 import { LocalizationsChannelClient } from 'vs/platform/localizations/node/localizationsIpc';
-import { AccessibilityService } from 'vs/platform/accessibility/node/accessibilityService';
 import { ProductService } from 'vs/platform/product/node/productService';
 import { TextResourcePropertiesService } from 'vs/workbench/services/textfile/node/textResourcePropertiesService';
 import { RemoteFileService } from 'vs/workbench/services/files/node/remoteFileService';
@@ -477,9 +475,6 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 		this.editorService = this.instantiationService.createInstance(EditorService);
 		serviceCollection.set(IEditorService, this.editorService); // TODO@Ben use SyncDescriptor
 
-		// Accessibility
-		serviceCollection.set(IAccessibilityService, new SyncDescriptor(AccessibilityService, undefined, true));
-
 		// Contributed services
 		const contributedServices = getServices();
 		for (let contributedService of contributedServices) {
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
@@ -75,6 +75,7 @@ import 'vs/workbench/services/textmodelResolver/common/textModelResolverService'
 import 'vs/workbench/services/textfile/common/textFileService';
 import 'vs/workbench/services/dialogs/electron-browser/dialogService';
 import 'vs/workbench/services/backup/node/backupFileService';
+import 'vs/platform/accessibility/node/accessibilityService';
 import 'vs/workbench/services/history/browser/history';
 import 'vs/workbench/browser/parts/quickinput/quickInput';
 import 'vs/workbench/browser/parts/quickopen/quickOpenController';
