web - first cut workbench.common.main to share dependencies between web and desktop

src/vs/workbench/contrib/tasks/browser/taskService.ts

@@ -9,7 +9,8 @@ import { ITaskSystem } from 'vs/workbench/contrib/tasks/common/taskSystem';
 import { ExecutionEngine, TaskRunSource } from 'vs/workbench/contrib/tasks/common/tasks';
 import { TerminalTaskSystem } from './terminalTaskSystem';
 import { AbstractTaskService, WorkspaceFolderConfigurationResult } from 'vs/workbench/contrib/tasks/browser/abstractTaskService';
-import { TaskFilter } from 'vs/workbench/contrib/tasks/common/taskService';
+import { TaskFilter, ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class TaskService extends AbstractTaskService {
 	private static readonly ProcessTaskSystemSupportMessage = nls.localize('taskService.processTaskSystem', 'Process task system is not support in the web.');
@@ -48,4 +49,6 @@ export class TaskService extends AbstractTaskService {
 	protected versionAndEngineCompatible(filter?: TaskFilter): boolean {
 		return this.executionEngine === ExecutionEngine.Terminal;
 	}
-}
\ No newline at end of file
+}
+
+registerSingleton(ITaskService, TaskService, true);

src/vs/workbench/contrib/tasks/electron-browser/taskService.ts

@@ -13,7 +13,8 @@ import * as TaskConfig from '../common/taskConfiguration';
 import { ProcessTaskSystem } from 'vs/workbench/contrib/tasks/node/processTaskSystem';
 import { ProcessRunnerDetector } from 'vs/workbench/contrib/tasks/node/processRunnerDetector';
 import { AbstractTaskService } from 'vs/workbench/contrib/tasks/browser/abstractTaskService';
-import { TaskFilter } from 'vs/workbench/contrib/tasks/common/taskService';
+import { TaskFilter, ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 interface WorkspaceFolderConfigurationResult {
 	workspaceFolder: IWorkspaceFolder;
@@ -132,4 +133,6 @@ export class TaskService extends AbstractTaskService {
 		}
 		return result;
 	}
-}
\ No newline at end of file
+}
+
+registerSingleton(ITaskService, TaskService, true);

src/vs/workbench/contrib/terminal/browser/terminalInstanceService.ts

@@ -10,6 +10,7 @@ import { WebLinksAddon as XTermWebLinksAddon } from 'xterm-addon-web-links';
 import { SearchAddon as XTermSearchAddon } from 'xterm-addon-search';
 import { IProcessEnvironment } from 'vs/base/common/platform';
 import { Emitter, Event } from 'vs/base/common/event';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 let Terminal: typeof XTermTerminal;
 let WebLinksAddon: typeof XTermWebLinksAddon;
@@ -63,3 +64,5 @@ export class TerminalInstanceService implements ITerminalInstanceService {
 		return {};
 	}
 }
+
+registerSingleton(ITerminalInstanceService, TerminalInstanceService, true);

src/vs/workbench/contrib/terminal/browser/terminalNativeService.ts

@@ -6,6 +6,7 @@
 import { IOpenFileRequest } from 'vs/platform/windows/common/windows';
 import { ITerminalNativeService, LinuxDistro } from 'vs/workbench/contrib/terminal/common/terminal';
 import { Emitter, Event } from 'vs/base/common/event';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class TerminalNativeService implements ITerminalNativeService {
 	public _serviceBrand: any;
@@ -30,4 +31,6 @@ export class TerminalNativeService implements ITerminalNativeService {
 	public getWindowsBuildNumber(): number {
 		throw new Error('Not implemented');
 	}
-}
\ No newline at end of file
+}
+
+registerSingleton(ITerminalNativeService, TerminalNativeService, true);

src/vs/workbench/contrib/webview/browser/webviewEditorService.ts

@@ -15,6 +15,7 @@ import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor
 import { ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP_TYPE } from 'vs/workbench/services/editor/common/editorService';
 import { RevivedWebviewEditorInput, WebviewEditorInput } from './webviewEditorInput';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export const IWebviewEditorService = createDecorator<IWebviewEditorService>('webviewEditorService');
 
@@ -264,3 +265,5 @@ export class WebviewEditorService implements IWebviewEditorService {
 		return rootPaths;
 	}
 }
+
+registerSingleton(IWebviewEditorService, WebviewEditorService, true);

src/vs/workbench/contrib/webview/browser/webviewService.ts

@@ -7,6 +7,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IFrameWebview } from 'vs/workbench/contrib/webview/browser/webviewElement';
 import { IWebviewService, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/common/webview';
 import { DynamicWebviewEditorOverlay } from './dynamicWebviewEditorOverlay';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class WebviewService implements IWebviewService {
 	_serviceBrand: any;
@@ -31,3 +32,5 @@ export class WebviewService implements IWebviewService {
 		return this._instantiationService.createInstance(DynamicWebviewEditorOverlay, id, options, contentOptions);
 	}
 }
+
+registerSingleton(IWebviewService, WebviewService, true);

src/vs/workbench/workbench.common.main.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//#region --- editor/workbench core
+
+import 'vs/editor/editor.all';
+
+import 'vs/workbench/api/browser/extensionHost.contribution';
+import 'vs/workbench/browser/workbench.contribution';
+
+//#endregion
+
+
+//#region --- workbench actions
+
+import 'vs/workbench/browser/actions/layoutActions';
+import 'vs/workbench/browser/actions/windowActions';
+import 'vs/workbench/browser/actions/developerActions';
+import 'vs/workbench/browser/actions/listCommands';
+import 'vs/workbench/browser/actions/navigationActions';
+import 'vs/workbench/browser/parts/quickopen/quickOpenActions';
+import 'vs/workbench/browser/parts/quickinput/quickInputActions';
+
+//#endregion
+
+
+//#region --- API Extension Points
+
+import 'vs/workbench/api/common/menusExtensionPoint';
+import 'vs/workbench/api/common/configurationExtensionPoint';
+import 'vs/workbench/api/browser/viewsExtensionPoint';
+
+//#endregion
+
+
+//#region --- workbench parts
+
+import 'vs/workbench/browser/parts/quickinput/quickInput';
+import 'vs/workbench/browser/parts/quickopen/quickOpenController';
+import 'vs/workbench/browser/parts/titlebar/titlebarPart';
+import 'vs/workbench/browser/parts/editor/editorPart';
+import 'vs/workbench/browser/parts/activitybar/activitybarPart';
+import 'vs/workbench/browser/parts/panel/panelPart';
+import 'vs/workbench/browser/parts/sidebar/sidebarPart';
+import 'vs/workbench/browser/parts/statusbar/statusbarPart';
+
+//#endregion
+
+
+//#region --- workbench contributions
+
+// Workspace File Watching
+import 'vs/workbench/services/files/common/workspaceWatcher';
+
+// Telemetry
+import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
+
+// Preferences
+import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
+import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
+import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences';
+import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
+
+// Logs
+import 'vs/workbench/contrib/logs/common/logs.contribution';
+
+// Quick Open Handlers
+import 'vs/workbench/contrib/quickopen/browser/quickopen.contribution';
+
+// Explorer
+import 'vs/workbench/contrib/files/browser/explorerViewlet';
+import 'vs/workbench/contrib/files/browser/fileActions.contribution';
+import 'vs/workbench/contrib/files/browser/files.contribution';
+
+// Backup
+import 'vs/workbench/contrib/backup/common/backup.contribution';
+
+// Search
+import 'vs/workbench/contrib/search/browser/search.contribution';
+import 'vs/workbench/contrib/search/browser/searchView';
+import 'vs/workbench/contrib/search/browser/openAnythingHandler';
+
+// SCM
+import 'vs/workbench/contrib/scm/browser/scm.contribution';
+import 'vs/workbench/contrib/scm/browser/scmViewlet';
+
+// Debug
+import 'vs/workbench/contrib/debug/browser/debug.contribution';
+import 'vs/workbench/contrib/debug/browser/debugQuickOpen';
+import 'vs/workbench/contrib/debug/browser/debugEditorContribution';
+import 'vs/workbench/contrib/debug/browser/repl';
+import 'vs/workbench/contrib/debug/browser/debugViewlet';
+
+// Markers
+import 'vs/workbench/contrib/markers/browser/markers.contribution';
+
+// Comments
+import 'vs/workbench/contrib/comments/browser/comments.contribution';
+
+// URL Support
+import 'vs/workbench/contrib/url/common/url.contribution';
+
+// Webview
+import 'vs/workbench/contrib/webview/browser/webview.contribution';
+
+// Extensions Management
+import 'vs/workbench/contrib/extensions/browser/extensions.contribution';
+import 'vs/workbench/contrib/extensions/browser/extensionsQuickOpen';
+import 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
+
+// Output Panel
+import 'vs/workbench/contrib/output/browser/output.contribution';
+import 'vs/workbench/contrib/output/browser/outputPanel';
+
+// Terminal
+import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
+import 'vs/workbench/contrib/terminal/browser/terminalQuickOpen';
+import 'vs/workbench/contrib/terminal/browser/terminalPanel';
+
+// Relauncher
+import 'vs/workbench/contrib/relauncher/common/relauncher.contribution';
+
+// Tasks
+import 'vs/workbench/contrib/tasks/browser/task.contribution';
+
+// Remote
+import 'vs/workbench/contrib/remote/common/remote.contribution';
+
+// Emmet
+import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
+
+// CodeEditor Contributions
+import 'vs/workbench/contrib/codeEditor/browser/codeEditor.contribution';
+
+// Execution
+import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution';
+
+// Snippets
+import 'vs/workbench/contrib/snippets/browser/snippets.contribution';
+import 'vs/workbench/contrib/snippets/browser/snippetsService';
+import 'vs/workbench/contrib/snippets/browser/insertSnippet';
+import 'vs/workbench/contrib/snippets/browser/configureSnippets';
+import 'vs/workbench/contrib/snippets/browser/tabCompletion';
+
+// Formatter Help
+import 'vs/workbench/contrib/format/browser/format.contribution';
+
+// Themes
+import 'vs/workbench/contrib/themes/browser/themes.contribution';
+
+// Watermark
+import 'vs/workbench/contrib/watermark/browser/watermark';
+
+// Welcome
+import 'vs/workbench/contrib/welcome/walkThrough/browser/walkThrough.contribution';
+import 'vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay';
+
+// Call Hierarchy
+import 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
+
+// Outline
+import 'vs/workbench/contrib/outline/browser/outline.contribution';
+
+//#endregion

src/vs/workbench/workbench.main.ts

@@ -3,38 +3,25 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//#region --- workbench/editor core
 
-import 'vs/editor/editor.all';
+// #######################################################################
+// ###                                                                 ###
+// ### !!! PLEASE ADD COMMON IMPORTS INTO WORKBENCH.COMMON.MAIN.TS !!! ###
+// ###                                                                 ###
+// #######################################################################
 
-import 'vs/workbench/api/browser/extensionHost.contribution';
 
-import 'vs/workbench/electron-browser/main.contribution';
-import 'vs/workbench/browser/workbench.contribution';
-
-import 'vs/workbench/electron-browser/main';
-
-//#endregion
+//#region --- workbench common
 
-
-//#region --- workbench actions
-
-import 'vs/workbench/browser/actions/layoutActions';
-import 'vs/workbench/browser/actions/windowActions';
-import 'vs/workbench/browser/actions/developerActions';
-import 'vs/workbench/browser/actions/listCommands';
-import 'vs/workbench/browser/actions/navigationActions';
-import 'vs/workbench/browser/parts/quickopen/quickOpenActions';
-import 'vs/workbench/browser/parts/quickinput/quickInputActions';
+import 'vs/workbench/workbench.common.main';
 
 //#endregion
 
 
-//#region --- API Extension Points
+//#region --- workbench (desktop main)
 
-import 'vs/workbench/api/common/menusExtensionPoint';
-import 'vs/workbench/api/common/configurationExtensionPoint';
-import 'vs/workbench/api/browser/viewsExtensionPoint';
+import 'vs/workbench/electron-browser/main.contribution';
+import 'vs/workbench/electron-browser/main';
 
 //#endregion
 
@@ -93,6 +80,7 @@ import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 import { TunnelService } from 'vs/workbench/services/remote/node/tunnelService';
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
 import { KeytarCredentialsService } from 'vs/platform/credentials/node/credentialsService';
+import { IWorkspaceStatsService, WorkspaceStatsService } from 'vs/workbench/contrib/stats/electron-browser/workspaceStatsService';
 
 import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
 import 'vs/workbench/services/integrity/node/integrityService';
@@ -172,138 +160,40 @@ registerSingleton(IWorkspaceStatsService, WorkspaceStatsService, true);
 //#endregion
 
 
-//#region --- workbench parts
-
-import 'vs/workbench/browser/parts/quickinput/quickInput';
-import 'vs/workbench/browser/parts/quickopen/quickOpenController';
-import 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import 'vs/workbench/browser/parts/editor/editorPart';
-import 'vs/workbench/browser/parts/activitybar/activitybarPart';
-import 'vs/workbench/browser/parts/panel/panelPart';
-import 'vs/workbench/browser/parts/sidebar/sidebarPart';
-import 'vs/workbench/browser/parts/statusbar/statusbarPart';
-
-//#endregion
-
-
 //#region --- workbench contributions
 
-// Workspace File Watching
-import 'vs/workbench/services/files/common/workspaceWatcher';
-
-// Telemetry
-import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
-
 // Localizations
 import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
 
-// Preferences
-import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
-import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
-import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences';
-import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
-registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
-
 // Logs
-import 'vs/workbench/contrib/logs/common/logs.contribution';
 import 'vs/workbench/contrib/logs/electron-browser/logs.contribution';
 
-// Quick Open Handlers
-import 'vs/workbench/contrib/quickopen/browser/quickopen.contribution';
-
-// Explorer
-import 'vs/workbench/contrib/files/browser/explorerViewlet';
-import 'vs/workbench/contrib/files/browser/fileActions.contribution';
-import 'vs/workbench/contrib/files/browser/files.contribution';
-
-// Backup
-import 'vs/workbench/contrib/backup/common/backup.contribution';
-
 // Stats
 import 'vs/workbench/contrib/stats/electron-browser/stats.contribution';
 
 // Rapid Render Splash
 import 'vs/workbench/contrib/splash/electron-browser/partsSplash.contribution';
 
-// Search
-import 'vs/workbench/contrib/search/browser/search.contribution';
-import 'vs/workbench/contrib/search/browser/searchView';
-import 'vs/workbench/contrib/search/browser/openAnythingHandler';
-
-// SCM
-import 'vs/workbench/contrib/scm/browser/scm.contribution';
-import 'vs/workbench/contrib/scm/browser/scmViewlet';
-
 // Debug
-import 'vs/workbench/contrib/debug/browser/debug.contribution';
-import 'vs/workbench/contrib/debug/browser/debugQuickOpen';
-import 'vs/workbench/contrib/debug/browser/debugEditorContribution';
-import 'vs/workbench/contrib/debug/browser/repl';
-import 'vs/workbench/contrib/debug/browser/debugViewlet';
 import 'vs/workbench/contrib/debug/node/debugHelperService';
 
-// Markers
-import 'vs/workbench/contrib/markers/browser/markers.contribution';
-
-// Comments
-import 'vs/workbench/contrib/comments/browser/comments.contribution';
-
-// URL Support
-import 'vs/workbench/contrib/url/common/url.contribution';
-
 // Webview
-import 'vs/workbench/contrib/webview/browser/webview.contribution';
 import 'vs/workbench/contrib/webview/electron-browser/webview.contribution';
 
 // Extensions Management
-import 'vs/workbench/contrib/extensions/browser/extensions.contribution';
 import 'vs/workbench/contrib/extensions/electron-browser/extensions.contribution';
-import 'vs/workbench/contrib/extensions/browser/extensionsQuickOpen';
-import 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
-
-// Output Panel
-import 'vs/workbench/contrib/output/browser/output.contribution';
-import 'vs/workbench/contrib/output/browser/outputPanel';
 
 // Terminal
-import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
 import 'vs/workbench/contrib/terminal/electron-browser/terminal.contribution';
-import 'vs/workbench/contrib/terminal/browser/terminalQuickOpen';
-import 'vs/workbench/contrib/terminal/browser/terminalPanel';
-
-// Relauncher
-import 'vs/workbench/contrib/relauncher/common/relauncher.contribution';
-
-// Tasks
-import 'vs/workbench/contrib/tasks/browser/task.contribution';
-import { TaskService } from 'vs/workbench/contrib/tasks/electron-browser/taskService';
-import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
-registerSingleton(ITaskService, TaskService, true);
 
 // Remote
-import 'vs/workbench/contrib/remote/common/remote.contribution';
 import 'vs/workbench/contrib/remote/electron-browser/remote.contribution';
 
-// Emmet
-import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
-
 // CodeEditor Contributions
-import 'vs/workbench/contrib/codeEditor/browser/codeEditor.contribution';
 import 'vs/workbench/contrib/codeEditor/electron-browser/codeEditor.contribution';
 
 // Execution
 import 'vs/workbench/contrib/externalTerminal/node/externalTerminalService';
-import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution';
-
-// Snippets
-import 'vs/workbench/contrib/snippets/browser/snippets.contribution';
-import 'vs/workbench/contrib/snippets/browser/snippetsService';
-import 'vs/workbench/contrib/snippets/browser/insertSnippet';
-import 'vs/workbench/contrib/snippets/browser/configureSnippets';
-import 'vs/workbench/contrib/snippets/browser/tabCompletion';
-
-// Formatter Help
-import 'vs/workbench/contrib/format/browser/format.contribution';
 
 // Send a Smile
 import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
@@ -322,29 +212,19 @@ import 'vs/workbench/contrib/performance/electron-browser/performance.contributi
 import 'vs/workbench/contrib/cli/node/cli.contribution';
 
 // Themes Support
-import 'vs/workbench/contrib/themes/browser/themes.contribution';
 import 'vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution';
 
-// Watermark
-import 'vs/workbench/contrib/watermark/browser/watermark';
-
 // Welcome
-import 'vs/workbench/contrib/welcome/walkThrough/browser/walkThrough.contribution';
 import 'vs/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution';
-import 'vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay';
 import 'vs/workbench/contrib/welcome/page/browser/welcomePage.contribution';
 
-// Call Hierarchy
-import 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
-
-// Outline
-import 'vs/workbench/contrib/outline/browser/outline.contribution';
-
 // Experiments
 import 'vs/workbench/contrib/experiments/electron-browser/experiments.contribution';
 
 // Issues
 import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
-import { IWorkspaceStatsService, WorkspaceStatsService } from 'vs/workbench/contrib/stats/electron-browser/workspaceStatsService';
+
+// Tasks
+import 'vs/workbench/contrib/tasks/electron-browser/taskService';
 
 //#endregion

src/vs/workbench/workbench.web.main.ts

@@ -3,37 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-//#region --- workbench/editor core
 
-import 'vs/editor/editor.all';
+// #######################################################################
+// ###                                                                 ###
+// ### !!! PLEASE ADD COMMON IMPORTS INTO WORKBENCH.COMMON.MAIN.TS !!! ###
+// ###                                                                 ###
+// #######################################################################
 
-import 'vs/workbench/api/browser/extensionHost.contribution';
 
-import 'vs/workbench/browser/workbench.contribution';
+//#region --- workbench common
 
-import 'vs/workbench/browser/web.main';
+import 'vs/workbench/workbench.common.main';
 
 //#endregion
 
 
-//#region --- workbench actions
-
-import 'vs/workbench/browser/actions/layoutActions';
-import 'vs/workbench/browser/actions/windowActions';
-import 'vs/workbench/browser/actions/developerActions';
-import 'vs/workbench/browser/actions/listCommands';
-import 'vs/workbench/browser/actions/navigationActions';
-import 'vs/workbench/browser/parts/quickopen/quickOpenActions';
-import 'vs/workbench/browser/parts/quickinput/quickInputActions';
-
-//#endregion
+//#region --- workbench (web main)
 
-
-//#region --- API Extension Points
-
-import 'vs/workbench/api/common/menusExtensionPoint';
-import 'vs/workbench/api/common/configurationExtensionPoint';
-import 'vs/workbench/api/browser/viewsExtensionPoint';
+import 'vs/workbench/browser/web.main';
 
 //#endregion
 
@@ -168,191 +155,26 @@ registerSingleton(IContextMenuService, ContextMenuService);
 //#endregion
 
 
-//#region --- workbench parts
-
-import 'vs/workbench/browser/parts/quickinput/quickInput';
-import 'vs/workbench/browser/parts/quickopen/quickOpenController';
-import 'vs/workbench/browser/parts/titlebar/titlebarPart';
-import 'vs/workbench/browser/parts/editor/editorPart';
-import 'vs/workbench/browser/parts/activitybar/activitybarPart';
-import 'vs/workbench/browser/parts/panel/panelPart';
-import 'vs/workbench/browser/parts/sidebar/sidebarPart';
-import 'vs/workbench/browser/parts/statusbar/statusbarPart';
-
-//#endregion
-
-
 //#region --- workbench contributions
 
 // Resource Service Worker
 import 'vs/workbench/contrib/resources/browser/resourceServiceWorkerClient';
 
-// Workspace File Watching
-import 'vs/workbench/services/files/common/workspaceWatcher';
-
-// Telemetry
-import 'vs/workbench/contrib/telemetry/browser/telemetry.contribution';
-
-// Localizations
-// import 'vs/workbench/contrib/localizations/browser/localizations.contribution';
-
 // Preferences
-import 'vs/workbench/contrib/preferences/browser/preferences.contribution';
-import 'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution';
 import 'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';
-import { IPreferencesSearchService } from 'vs/workbench/contrib/preferences/common/preferences';
-import { PreferencesSearchService } from 'vs/workbench/contrib/preferences/browser/preferencesSearch';
-registerSingleton(IPreferencesSearchService, PreferencesSearchService, true);
-
-// Logs
-import 'vs/workbench/contrib/logs/common/logs.contribution';
-
-// Quick Open Handlers
-import 'vs/workbench/contrib/quickopen/browser/quickopen.contribution';
-
-// Explorer
-import 'vs/workbench/contrib/files/browser/explorerViewlet';
-import 'vs/workbench/contrib/files/browser/fileActions.contribution';
-import 'vs/workbench/contrib/files/browser/files.contribution';
-
-// Backup
-import 'vs/workbench/contrib/backup/common/backup.contribution';
-
-// Stats
-// import 'vs/workbench/contrib/stats/electron-browser/stats.contribution';
-
-// Rapid Render Splash
-// import 'vs/workbench/contrib/splash/electron-browser/partsSplash.contribution';
-
-// Search
-import 'vs/workbench/contrib/search/browser/search.contribution';
-import 'vs/workbench/contrib/search/browser/searchView';
-import 'vs/workbench/contrib/search/browser/openAnythingHandler';
-
-// SCM
-import 'vs/workbench/contrib/scm/browser/scm.contribution';
-import 'vs/workbench/contrib/scm/browser/scmViewlet';
 
 // Debug
-import 'vs/workbench/contrib/debug/browser/debug.contribution';
-import 'vs/workbench/contrib/debug/browser/debugQuickOpen';
-import 'vs/workbench/contrib/debug/browser/debugEditorContribution';
-import 'vs/workbench/contrib/debug/browser/repl';
-import 'vs/workbench/contrib/debug/browser/debugViewlet';
 import 'vs/workbench/contrib/debug/browser/extensionHostDebugService';
 
-// Markers
-import 'vs/workbench/contrib/markers/browser/markers.contribution';
-
-// Comments
-import 'vs/workbench/contrib/comments/browser/comments.contribution';
-
-// URL Support
-import 'vs/workbench/contrib/url/common/url.contribution';
-
 // Webview
-import 'vs/workbench/contrib/webview/browser/webview.contribution';
-
-import { IWebviewService } from 'vs/workbench/contrib/webview/common/webview';
-import { WebviewService } from 'vs/workbench/contrib/webview/browser/webviewService';
-import { IWebviewEditorService, WebviewEditorService } from 'vs/workbench/contrib/webview/browser/webviewEditorService';
-registerSingleton(IWebviewService, WebviewService, true);
-registerSingleton(IWebviewEditorService, WebviewEditorService, true);
-
-// Extensions Management
-import 'vs/workbench/contrib/extensions/browser/extensions.contribution';
-import 'vs/workbench/contrib/extensions/browser/extensionsQuickOpen';
-import 'vs/workbench/contrib/extensions/browser/extensionsViewlet';
-
-// Output Panel
-import 'vs/workbench/contrib/output/browser/output.contribution';
-import 'vs/workbench/contrib/output/browser/outputPanel';
+import 'vs/workbench/contrib/webview/browser/webviewService';
+import 'vs/workbench/contrib/webview/browser/webviewEditorService';
 
 // Terminal
-import 'vs/workbench/contrib/terminal/browser/terminal.contribution';
-// import 'vs/workbench/contrib/terminal/electron-browser/terminal.contribution';
-import 'vs/workbench/contrib/terminal/browser/terminalQuickOpen';
-import 'vs/workbench/contrib/terminal/browser/terminalPanel';
-
-import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
-import { ITerminalNativeService } from 'vs/workbench/contrib/terminal/common/terminal';
-import { TerminalNativeService } from 'vs/workbench/contrib/terminal/browser/terminalNativeService';
-import { TerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminalInstanceService';
-registerSingleton(ITerminalNativeService, TerminalNativeService, true);
-registerSingleton(ITerminalInstanceService, TerminalInstanceService, true);
-
-// Relauncher
-import 'vs/workbench/contrib/relauncher/common/relauncher.contribution';
+import 'vs/workbench/contrib/terminal/browser/terminalNativeService';
+import 'vs/workbench/contrib/terminal/browser/terminalInstanceService';
 
 // Tasks
-import 'vs/workbench/contrib/tasks/browser/task.contribution';
-import { TaskService } from 'vs/workbench/contrib/tasks/browser/taskService';
-import { ITaskService } from 'vs/workbench/contrib/tasks/common/taskService';
-registerSingleton(ITaskService, TaskService, true);
-
-// Remote
-import 'vs/workbench/contrib/remote/common/remote.contribution';
-// import 'vs/workbench/contrib/remote/electron-browser/remote.contribution';
-
-// Emmet
-import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
-
-// CodeEditor Contributions
-import 'vs/workbench/contrib/codeEditor/browser/codeEditor.contribution';
-// import 'vs/workbench/contrib/codeEditor/electron-browser/codeEditor.contribution';
-
-// External terminal
-import 'vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution';
-
-// Snippets
-import 'vs/workbench/contrib/snippets/browser/snippets.contribution';
-import 'vs/workbench/contrib/snippets/browser/snippetsService';
-import 'vs/workbench/contrib/snippets/browser/insertSnippet';
-import 'vs/workbench/contrib/snippets/browser/configureSnippets';
-import 'vs/workbench/contrib/snippets/browser/tabCompletion';
-
-// Formatter Help
-import 'vs/workbench/contrib/format/browser/format.contribution';
-
-// Send a Smile
-// import 'vs/workbench/contrib/feedback/browser/feedback.contribution';
-
-// Update
-// import 'vs/workbench/contrib/update/electron-browser/update.contribution';
-
-// Surveys
-// import 'vs/workbench/contrib/surveys/electron-browser/nps.contribution';
-// import 'vs/workbench/contrib/surveys/electron-browser/languageSurveys.contribution';
-
-// Performance
-// import 'vs/workbench/contrib/performance/electron-browser/performance.contribution';
-
-// CLI
-// import 'vs/workbench/contrib/cli/node/cli.contribution';
-
-// Themes Support
-import 'vs/workbench/contrib/themes/browser/themes.contribution';
-// import 'vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution';
-
-// Watermark
-import 'vs/workbench/contrib/watermark/browser/watermark';
-
-// Welcome
-import 'vs/workbench/contrib/welcome/walkThrough/browser/walkThrough.contribution';
-// import 'vs/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution';
-import 'vs/workbench/contrib/welcome/overlay/browser/welcomeOverlay';
-// import 'vs/workbench/contrib/welcome/page/browser/welcomePage.contribution';
-
-// Call Hierarchy
-import 'vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution';
-
-// Outline
-import 'vs/workbench/contrib/outline/browser/outline.contribution';
-
-// Experiments
-// import 'vs/workbench/contrib/experiments/electron-browser/experiments.contribution';
-
-// Issues
-// import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
+import 'vs/workbench/contrib/tasks/browser/taskService';
 
 //#endregion