web - more cleanup of main files

src/vs/workbench/contrib/stats/electron-browser/workspaceStatsService.ts

@@ -19,6 +19,7 @@ import { localize } from 'vs/nls';
 import Severity from 'vs/base/common/severity';
 import { joinPath } from 'vs/base/common/resources';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export type Tags = { [index: string]: boolean | number | string | undefined };
 
@@ -503,3 +504,5 @@ export class WorkspaceStatsService implements IWorkspaceStatsService {
 		return arr.some(v => v.search(regEx) > -1) || undefined;
 	}
 }
+
+registerSingleton(IWorkspaceStatsService, WorkspaceStatsService, true);

src/vs/workbench/services/accessibility/node/accessibilityService.ts

@@ -9,9 +9,12 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { AbstractAccessibilityService } from 'vs/platform/accessibility/common/abstractAccessibilityService';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 export class AccessibilityService extends AbstractAccessibilityService implements IAccessibilityService {
-	_serviceBrand: any;
+
+	_serviceBrand!: ServiceIdentifier<any>;
 
 	private _accessibilitySupport = AccessibilitySupport.Unknown;
 
@@ -59,4 +62,6 @@ export class AccessibilityService extends AbstractAccessibilityService implement
 
 		return this._accessibilitySupport;
 	}
-}
\ No newline at end of file
+}
+
+registerSingleton(IAccessibilityService, AccessibilityService, true);

src/vs/workbench/services/backup/node/backupFileService.ts

@@ -7,13 +7,14 @@ import { BackupFileService as CommonBackupFileService } from 'vs/workbench/servi
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 import * as crypto from 'crypto';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 
 export class BackupFileService extends CommonBackupFileService {
 
 	protected hashPath(resource: URI): string {
 		return hashPath(resource);
 	}
-
 }
 
 /*
@@ -21,5 +22,8 @@ export class BackupFileService extends CommonBackupFileService {
  */
 export function hashPath(resource: URI): string {
 	const str = resource.scheme === Schemas.file || resource.scheme === Schemas.untitled ? resource.fsPath : resource.toString();
+
 	return crypto.createHash('md5').update(str).digest('hex');
-}
\ No newline at end of file
+}
+
+registerSingleton(IBackupFileService, BackupFileService);

src/vs/workbench/services/extensionManagement/node/extensionManagementService.ts

@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ILocalExtension, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { isLanguagePackExtension } from 'vs/platform/extensions/common/extensions';
 import { URI } from 'vs/base/common/uri';
 import { getManifest } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
 import { isUIExtension } from 'vs/workbench/services/extensions/common/extensionsUtil';
 import { ExtensionManagementService as BaseExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export class ExtensionManagementService extends BaseExtensionManagementService {
 
@@ -32,5 +33,6 @@ export class ExtensionManagementService extends BaseExtensionManagementService {
 		}
 		return Promise.reject('No Servers to Install');
 	}
-
 }
+
+registerSingleton(IExtensionManagementService, ExtensionManagementService);

src/vs/workbench/services/remote/node/tunnelService.ts

@@ -14,6 +14,7 @@ import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remot
 import { ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
 import { nodeSocketFactory } from 'vs/platform/remote/node/nodeSocketFactory';
 import { ISignService } from 'vs/platform/sign/common/sign';
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
 export async function createRemoteTunnel(options: IConnectionOptions, tunnelRemotePort: number): Promise<RemoteTunnel> {
 	const tunnel = new NodeRemoteTunnel(options, tunnelRemotePort);
@@ -113,3 +114,5 @@ export class TunnelService implements ITunnelService {
 		return createRemoteTunnel(options, remotePort);
 	}
 }
+
+registerSingleton(ITunnelService, TunnelService, true);

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

@@ -45,6 +45,72 @@ 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';
+import 'vs/workbench/browser/parts/views/views';
+
+//#endregion
+
+
+//#region --- workbench services
+
+import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
+import 'vs/workbench/services/keybinding/common/keybindingEditing';
+import 'vs/workbench/services/decorations/browser/decorationsService';
+import 'vs/workbench/services/progress/browser/progressService';
+import 'vs/workbench/services/editor/browser/codeEditorService';
+import 'vs/workbench/services/preferences/browser/preferencesService';
+import 'vs/workbench/services/configuration/common/jsonEditingService';
+import 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
+import 'vs/workbench/services/dialogs/browser/fileDialogService';
+import 'vs/workbench/services/editor/browser/editorService';
+import 'vs/workbench/services/history/browser/history';
+import 'vs/workbench/services/activity/browser/activityService';
+import 'vs/workbench/services/keybinding/browser/keybindingService';
+import 'vs/workbench/services/untitled/common/untitledEditorService';
+import 'vs/workbench/services/textfile/common/textResourcePropertiesService';
+import 'vs/workbench/services/mode/common/workbenchModeService';
+import 'vs/workbench/services/commands/common/commandService';
+import 'vs/workbench/services/themes/browser/workbenchThemeService';
+import 'vs/workbench/services/label/common/labelService';
+import 'vs/workbench/services/extensionManagement/common/extensionEnablementService';
+import 'vs/workbench/services/notification/common/notificationService';
+
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
+import { IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IListService, ListService } from 'vs/platform/list/browser/listService';
+import { OpenerService } from 'vs/editor/browser/services/openerService';
+import { IOpenerService } from 'vs/platform/opener/common/opener';
+import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
+import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl';
+import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsServiceImpl';
+import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
+import { IMarkerService } from 'vs/platform/markers/common/markers';
+import { MarkerService } from 'vs/platform/markers/common/markerService';
+import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
+import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl';
+import { IMenuService } from 'vs/platform/actions/common/actions';
+import { MenuService } from 'vs/platform/actions/common/menuService';
+import { IDownloadService } from 'vs/platform/download/common/download';
+import { DownloadService } from 'vs/platform/download/common/downloadService';
+
+registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true);
+registerSingleton(IContextViewService, ContextViewService, true);
+registerSingleton(IListService, ListService, true);
+registerSingleton(IOpenerService, OpenerService, true);
+registerSingleton(IEditorWorkerService, EditorWorkerServiceImpl);
+registerSingleton(IMarkerDecorationsService, MarkerDecorationsService);
+registerSingleton(IMarkerService, MarkerService, true);
+registerSingleton(IContextKeyService, ContextKeyService);
+registerSingleton(IModelService, ModelServiceImpl, true);
+registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService);
+registerSingleton(IMenuService, MenuService, true);
+registerSingleton(IDownloadService, DownloadService, true);
 
 //#endregion
 
@@ -62,7 +128,6 @@ 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

src/vs/workbench/workbench.desktop.main.ts

@@ -27,34 +27,33 @@ import 'vs/workbench/electron-browser/main';
 
 
 //#region --- workbench services
+import 'vs/workbench/services/integrity/node/integrityService';
+import 'vs/workbench/services/textMate/electron-browser/textMateService';
+import 'vs/workbench/services/workspace/electron-browser/workspaceEditingService';
+import 'vs/workbench/services/extensions/common/inactiveExtensionUrlHandler';
+import 'vs/workbench/services/search/node/searchService';
+import 'vs/workbench/services/extensions/electron-browser/extensionHostDebugService';
+import 'vs/workbench/services/output/node/outputChannelModelService';
+import 'vs/workbench/services/textfile/node/textFileService';
+import 'vs/workbench/services/dialogs/electron-browser/dialogService';
+import 'vs/workbench/services/keybinding/electron-browser/nativeKeymapService';
+import 'vs/workbench/services/keybinding/electron-browser/keybinding.contribution';
+import 'vs/workbench/services/extensions/electron-browser/extensionService';
+import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService';
+import 'vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService';
+import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
+import 'vs/workbench/services/window/electron-browser/windowService';
+import 'vs/workbench/services/telemetry/electron-browser/telemetryService';
+import 'vs/workbench/services/configurationResolver/electron-browser/configurationResolverService';
+import 'vs/workbench/services/extensionManagement/node/extensionManagementService';
+import 'vs/workbench/services/accessibility/node/accessibilityService';
+import 'vs/workbench/services/remote/node/tunnelService';
+import 'vs/workbench/contrib/stats/electron-browser/workspaceStatsService';
+import 'vs/workbench/services/backup/node/backupFileService';
+
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { MenuService } from 'vs/platform/actions/common/menuService';
-import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
-import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl';
-import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsServiceImpl';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadService } from 'vs/platform/download/common/downloadService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ClipboardService } from 'vs/platform/clipboard/electron-browser/clipboardService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
-import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { AccessibilityService } from 'vs/workbench/services/accessibility/node/accessibilityService';
-import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
 import { IRequestService } from 'vs/platform/request/common/request';
 import { RequestService } from 'vs/platform/request/browser/requestService';
 import { LifecycleService } from 'vs/platform/lifecycle/electron-browser/lifecycleService';
@@ -76,72 +75,10 @@ import { IMenubarService } from 'vs/platform/menubar/common/menubar';
 import { MenubarService } from 'vs/platform/menubar/electron-browser/menubarService';
 import { IURLService } from 'vs/platform/url/common/url';
 import { RelayURLService } from 'vs/platform/url/electron-browser/urlService';
-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';
-import 'vs/workbench/services/keybinding/common/keybindingEditing';
-import 'vs/workbench/services/textMate/electron-browser/textMateService';
-import 'vs/workbench/services/workspace/electron-browser/workspaceEditingService';
-import 'vs/workbench/services/extensions/common/inactiveExtensionUrlHandler';
-import 'vs/workbench/services/decorations/browser/decorationsService';
-import 'vs/workbench/services/search/node/searchService';
-import 'vs/workbench/services/progress/browser/progressService';
-import 'vs/workbench/services/editor/browser/codeEditorService';
-import 'vs/workbench/services/extensions/electron-browser/extensionHostDebugService';
-import 'vs/workbench/services/preferences/browser/preferencesService';
-import 'vs/workbench/services/output/node/outputChannelModelService';
-import 'vs/workbench/services/configuration/common/jsonEditingService';
-import 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
-import 'vs/workbench/services/textfile/node/textFileService';
-import 'vs/workbench/services/dialogs/browser/fileDialogService';
-import 'vs/workbench/services/dialogs/electron-browser/dialogService';
-import 'vs/workbench/services/editor/browser/editorService';
-import 'vs/workbench/services/history/browser/history';
-import 'vs/workbench/services/activity/browser/activityService';
-import 'vs/workbench/browser/parts/views/views';
-import 'vs/workbench/services/keybinding/electron-browser/nativeKeymapService';
-import 'vs/workbench/services/keybinding/electron-browser/keybinding.contribution';
-import 'vs/workbench/services/keybinding/browser/keybindingService';
-import 'vs/workbench/services/untitled/common/untitledEditorService';
-import 'vs/workbench/services/textfile/common/textResourcePropertiesService';
-import 'vs/workbench/services/mode/common/workbenchModeService';
-import 'vs/workbench/services/commands/common/commandService';
-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/label/common/labelService';
-import 'vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService';
-import 'vs/workbench/services/extensionManagement/common/extensionEnablementService';
-import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
-import 'vs/workbench/services/notification/common/notificationService';
-import 'vs/workbench/services/window/electron-browser/windowService';
-import 'vs/workbench/services/telemetry/electron-browser/telemetryService';
-import 'vs/workbench/services/configurationResolver/electron-browser/configurationResolverService';
-import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
-import { BackupFileService } from 'vs/workbench/services/backup/node/backupFileService';
-import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/node/extensionManagementService';
-
-registerSingleton(IExtensionManagementService, ExtensionManagementService);
-registerSingleton(IBackupFileService, BackupFileService);
-registerSingleton(IMenuService, MenuService, true);
-registerSingleton(IListService, ListService, true);
-registerSingleton(IOpenerService, OpenerService, true);
-registerSingleton(IEditorWorkerService, EditorWorkerServiceImpl);
-registerSingleton(IMarkerDecorationsService, MarkerDecorationsService);
-registerSingleton(IMarkerService, MarkerService, true);
-registerSingleton(IDownloadService, DownloadService, true);
 registerSingleton(IClipboardService, ClipboardService, true);
-registerSingleton(IContextKeyService, ContextKeyService);
-registerSingleton(IModelService, ModelServiceImpl, true);
-registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService);
-registerSingleton(IAccessibilityService, AccessibilityService, true);
-registerSingleton(IContextViewService, ContextViewService, true);
-registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true);
 registerSingleton(IRequestService, RequestService, true);
 registerSingleton(ILifecycleService, LifecycleService);
 registerSingleton(ILocalizationsService, LocalizationsService);
@@ -153,9 +90,7 @@ registerSingleton(IIssueService, IssueService);
 registerSingleton(IWorkspacesService, WorkspacesService);
 registerSingleton(IMenubarService, MenubarService);
 registerSingleton(IURLService, RelayURLService);
-registerSingleton(ITunnelService, TunnelService, true);
 registerSingleton(ICredentialsService, KeytarCredentialsService, true);
-registerSingleton(IWorkspaceStatsService, WorkspaceStatsService, true);
 
 //#endregion
 

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

@@ -26,130 +26,39 @@ import 'vs/workbench/browser/web.main';
 
 
 //#region --- workbench services
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IMenuService } from 'vs/platform/actions/common/actions';
-import { MenuService } from 'vs/platform/actions/common/menuService';
-import { IListService, ListService } from 'vs/platform/list/browser/listService';
-import { OpenerService } from 'vs/editor/browser/services/openerService';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
-import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl';
-import { MarkerDecorationsService } from 'vs/editor/common/services/markerDecorationsServiceImpl';
-import { IMarkerDecorationsService } from 'vs/editor/common/services/markersDecorationService';
-import { IMarkerService } from 'vs/platform/markers/common/markers';
-import { MarkerService } from 'vs/platform/markers/common/markerService';
-import { IDownloadService } from 'vs/platform/download/common/download';
-import { DownloadService } from 'vs/platform/download/common/downloadService';
-import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
-import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
-import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IModelService } from 'vs/editor/common/services/modelService';
-import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
-import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
-import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl';
-import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
-import { BrowserAccessibilityService } from 'vs/platform/accessibility/common/accessibilityService';
-import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService';
-import { ExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionGalleryService';
-import { BrowserLifecycleService } from 'vs/platform/lifecycle/browser/lifecycleService';
-import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
-import { DialogService } from 'vs/platform/dialogs/browser/dialogService';
-// import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
-// import { LocalizationsService } from 'vs/platform/localizations/electron-browser/localizationsService';
-// import { ISharedProcessService, SharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
-// import { IWindowsService } from 'vs/platform/windows/common/windows';
-// import { WindowsService } from 'vs/platform/windows/electron-browser/windowsService';
-// import { IUpdateService } from 'vs/platform/update/common/update';
-// import { UpdateService } from 'vs/platform/update/electron-browser/updateService';
-// import { IIssueService } from 'vs/platform/issue/common/issue';
-// import { IssueService } from 'vs/platform/issue/electron-browser/issueService';
-// import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
-// import { WorkspacesService } from 'vs/platform/workspaces/electron-browser/workspacesService';
-// import { IMenubarService } from 'vs/platform/menubar/common/menubar';
-// import { MenubarService } from 'vs/platform/menubar/electron-browser/menubarService';
-// import { IURLService } from 'vs/platform/url/common/url';
-// import { RelayURLService } from 'vs/platform/url/electron-browser/urlService';
-// 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 'vs/workbench/services/bulkEdit/browser/bulkEditService';
-// import 'vs/workbench/services/integrity/node/integrityService';
-import 'vs/workbench/services/keybinding/common/keybindingEditing';
 import 'vs/workbench/services/textMate/browser/textMateService';
-// import 'vs/workbench/services/workspace/electron-browser/workspaceEditingService';
-// import 'vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler';
-import 'vs/workbench/services/decorations/browser/decorationsService';
 import 'vs/workbench/services/search/common/searchService';
-import 'vs/workbench/services/progress/browser/progressService';
-import 'vs/workbench/services/editor/browser/codeEditorService';
-import 'vs/workbench/services/preferences/browser/preferencesService';
 import 'vs/workbench/services/output/common/outputChannelModelService';
-import 'vs/workbench/services/configuration/common/jsonEditingService';
-import 'vs/workbench/services/textmodelResolver/common/textModelResolverService';
 import 'vs/workbench/services/textfile/browser/textFileService';
-import 'vs/workbench/services/dialogs/browser/fileDialogService';
-// import 'vs/workbench/services/dialogs/electron-browser/dialogService';
-import 'vs/workbench/services/editor/browser/editorService';
-import 'vs/workbench/services/history/browser/history';
-import 'vs/workbench/services/activity/browser/activityService';
-import 'vs/workbench/browser/parts/views/views';
 import 'vs/workbench/services/keybinding/browser/keymapService';
-import 'vs/workbench/services/keybinding/browser/keybindingService';
-import 'vs/workbench/services/untitled/common/untitledEditorService';
-import 'vs/workbench/services/textfile/common/textResourcePropertiesService';
-import 'vs/workbench/services/mode/common/workbenchModeService';
-import 'vs/workbench/services/commands/common/commandService';
-import 'vs/workbench/services/themes/browser/workbenchThemeService';
 import 'vs/workbench/services/extensions/browser/extensionService';
-// import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService';
-import 'vs/workbench/services/label/common/labelService';
 import 'vs/workbench/services/extensionManagement/common/extensionManagementServerService';
-import 'vs/workbench/services/extensionManagement/common/extensionEnablementService';
-// import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
-import 'vs/workbench/services/notification/common/notificationService';
-// import 'vs/workbench/services/window/electron-browser/windowService';
 import 'vs/workbench/services/telemetry/browser/telemetryService';
 import 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
-import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
+import 'vs/workbench/browser/web.simpleservices';
+
+import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { BrowserClipboardService } from 'vs/platform/clipboard/browser/clipboardService';
+import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
+import { BrowserAccessibilityService } from 'vs/platform/accessibility/common/accessibilityService';
+import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { BrowserLifecycleService } from 'vs/platform/lifecycle/browser/lifecycleService';
+import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
+import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { DialogService } from 'vs/platform/dialogs/browser/dialogService';
+import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuService';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { BackupFileService } from 'vs/workbench/services/backup/common/backupFileService';
 import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
 
-import 'vs/workbench/browser/web.simpleservices';
-
 registerSingleton(IExtensionManagementService, ExtensionManagementService);
 registerSingleton(IBackupFileService, BackupFileService);
 registerSingleton(IDialogService, DialogService, true);
-registerSingleton(IMenuService, MenuService, true);
-registerSingleton(IListService, ListService, true);
-registerSingleton(IOpenerService, OpenerService, true);
-registerSingleton(IEditorWorkerService, EditorWorkerServiceImpl);
-registerSingleton(IMarkerDecorationsService, MarkerDecorationsService);
-registerSingleton(IMarkerService, MarkerService, true);
-registerSingleton(IDownloadService, DownloadService, true);
 registerSingleton(IClipboardService, BrowserClipboardService, true);
-registerSingleton(IContextKeyService, ContextKeyService);
-registerSingleton(IModelService, ModelServiceImpl, true);
-registerSingleton(ITextResourceConfigurationService, TextResourceConfigurationService);
 registerSingleton(IAccessibilityService, BrowserAccessibilityService, true);
-registerSingleton(IContextViewService, ContextViewService, true);
-registerSingleton(IExtensionGalleryService, ExtensionGalleryService, true);
 registerSingleton(ILifecycleService, BrowserLifecycleService);
-// registerSingleton(ILocalizationsService, LocalizationsService);
-// registerSingleton(ISharedProcessService, SharedProcessService, true);
-// registerSingleton(IWindowsService, WindowsService);
-// registerSingleton(IUpdateService, UpdateService);
-// registerSingleton(IIssueService, IssueService);
-// registerSingleton(IWorkspacesService, WorkspacesService);
-// registerSingleton(IMenubarService, MenubarService);
-// registerSingleton(IURLService, RelayURLService);
-// registerSingleton(ITunnelService, TunnelService, true);
-// registerSingleton(ICredentialsService, KeytarCredentialsService, true);
 registerSingleton(IContextMenuService, ContextMenuService);
 
 //#endregion