debt - declarative label service

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

@@ -58,8 +58,6 @@ import { restoreFontInfo, readFontInfo, saveFontInfo } from 'vs/editor/browser/c
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 import { ILogService } from 'vs/platform/log/common/log';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { ILabelService } from 'vs/platform/label/common/label';
-import { LabelService } from 'vs/workbench/services/label/common/labelService';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { combinedAppender, LogAppender, NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IExtensionManagementServerService } from 'vs/platform/extensionManagement/common/extensionManagement';
@@ -293,9 +291,6 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 		// Parts
 		serviceCollection.set(IWorkbenchLayoutService, this); // TODO@Ben use SyncDescriptor
 
-		// Labels
-		serviceCollection.set(ILabelService, new SyncDescriptor(LabelService, undefined, true));
-
 		// Notifications
 		serviceCollection.set(INotificationService, new SyncDescriptor(NotificationService, undefined, true));
 

src/vs/workbench/services/label/common/labelService.ts

@@ -21,6 +21,7 @@ import { ILabelService, ResourceLabelFormatter, ResourceLabelFormatting } from '
 import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 import { match } from 'vs/base/common/glob';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint<ResourceLabelFormatter[]>({
 	extensionPoint: 'resourceLabelFormatters',
@@ -257,3 +258,5 @@ export class LabelService implements ILabelService {
 		return suffix ? `${label} (${suffix})` : label;
 	}
 }
+
+registerSingleton(ILabelService, LabelService, true);
\ No newline at end of file

src/vs/workbench/workbench.main.ts

@@ -106,6 +106,7 @@ import 'vs/workbench/services/themes/browser/workbenchThemeService';
 import 'vs/workbench/services/extensions/electron-browser/extensionService';
 import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService';
 import 'vs/workbench/services/extensionManagement/node/multiExtensionManagement';
+import 'vs/workbench/services/label/common/labelService';
 
 registerSingleton(IMenuService, MenuService, true);
 registerSingleton(IListService, ListService, true);