debt - declarative notification service

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

@@ -272,9 +272,6 @@ export class Workbench extends Disposable implements IWorkbenchLayoutService {
 		// Parts
 		serviceCollection.set(IWorkbenchLayoutService, this); // TODO@Ben use SyncDescriptor
 
-		// Notifications
-		serviceCollection.set(INotificationService, new SyncDescriptor(NotificationService, undefined, true));
-
 		// Window
 		serviceCollection.set(IWindowService, new SyncDescriptor(WindowService, [this.configuration]));
 

src/vs/workbench/services/notification/common/notificationService.ts

@@ -7,6 +7,7 @@ import { INotificationService, INotification, INotificationHandle, Severity, Not
 import { INotificationsModel, NotificationsModel, ChoiceAction } from 'vs/workbench/common/notifications';
 import { dispose, Disposable, IDisposable } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class NotificationService extends Disposable implements INotificationService {
 
@@ -103,4 +104,6 @@ export class NotificationService extends Disposable implements INotificationServ
 
 		return handle;
 	}
-}
\ No newline at end of file
+}
+
+registerSingleton(INotificationService, NotificationService, true);
\ No newline at end of file

src/vs/workbench/workbench.main.ts

@@ -116,6 +116,7 @@ import 'vs/workbench/services/extensionManagement/node/multiExtensionManagement'
 import 'vs/workbench/services/label/common/labelService';
 import 'vs/workbench/services/extensions/node/extensionManagementServerService';
 import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
+import 'vs/workbench/services/notification/common/notificationService';
 
 registerSingleton(IMenuService, MenuService, true);
 registerSingleton(IListService, ListService, true);