web - cleanup main files

src/vs/workbench/workbench.main.ts

@@ -91,8 +91,8 @@ import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 import { TunnelService } from 'vs/workbench/services/remote/node/tunnelService';
 import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/electron-browser/configurationResolverService';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-
-import 'vs/platform/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';
@@ -166,6 +166,7 @@ registerSingleton(ICredentialsService, KeytarCredentialsService, true);
 
 //#endregion
 
+
 //#region --- workbench parts
 
 import 'vs/workbench/browser/parts/quickinput/quickInput';
@@ -179,6 +180,7 @@ import 'vs/workbench/browser/parts/statusbar/statusbarPart';
 
 //#endregion
 
+
 //#region --- workbench contributions
 
 // Workspace File Watching
@@ -330,7 +332,5 @@ import 'vs/workbench/contrib/experiments/electron-browser/experiments.contributi
 
 // Issues
 import 'vs/workbench/contrib/issue/electron-browser/issue.contribution';
-import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
-import { KeytarCredentialsService } from 'vs/platform/credentials/node/credentialsService';
 
 //#endregion

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

@@ -73,8 +73,6 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS
 // 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 { RemoteAuthorityResolverService } from 'vs/platform/remote/electron-browser/remoteAuthorityResolverService';
-// import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remoteAuthorityResolver';
 // import { IProductService } from 'vs/platform/product/common/product';
 // import { ProductService } from 'vs/platform/product/node/productService';
 // import { IWindowsService } from 'vs/platform/windows/common/windows';
@@ -89,14 +87,14 @@ import { ContextViewService } from 'vs/platform/contextview/browser/contextViewS
 // 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 { IHeapService, NullHeapService } from 'vs/workbench/services/heap/common/heap';
 import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
-
-import 'vs/workbench/browser/web.simpleservices';
+import { ISearchService } from 'vs/workbench/services/search/common/search';
+import { RemoteSearchService } from 'vs/workbench/services/search/common/searchService';
 import 'vs/platform/dialogs/browser/dialogService';
-
-
 import 'vs/workbench/services/bulkEdit/browser/bulkEditService';
 // import 'vs/workbench/services/integrity/node/integrityService';
 import 'vs/workbench/services/keybinding/common/keybindingEditing';
@@ -107,6 +105,7 @@ 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/common/outputChannelModelService';
 import 'vs/workbench/services/configuration/common/jsonEditingService';
@@ -128,7 +127,7 @@ import 'vs/workbench/services/themes/browser/workbenchThemeService';
 // import 'vs/workbench/services/extensionManagement/node/extensionEnablementService';
 import 'vs/workbench/services/extensions/browser/extensionService';
 // import 'vs/workbench/services/contextmenu/electron-browser/contextmenuService';
-// import 'vs/workbench/services/extensionManagement/node/multiExtensionManagement';
+// import 'vs/workbench/services/extensions/node/multiExtensionManagement';
 import 'vs/workbench/services/label/common/labelService';
 // import 'vs/workbench/services/extensions/electron-browser/extensionManagementServerService';
 // import 'vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl';
@@ -137,6 +136,7 @@ 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/browser/web.simpleservices';
 
 registerSingleton(IMenuService, MenuService, true);
 registerSingleton(IListService, ListService, true);
@@ -170,6 +170,7 @@ registerSingleton(IConfigurationResolverService, ConfigurationResolverService, t
 
 //#endregion
 
+
 //#region --- workbench parts
 
 import 'vs/workbench/browser/parts/quickinput/quickInput';
@@ -183,6 +184,7 @@ import 'vs/workbench/browser/parts/statusbar/statusbarPart';
 
 //#endregion
 
+
 //#region --- workbench contributions
 
 // Workspace File Watching
@@ -236,7 +238,6 @@ import 'vs/workbench/contrib/scm/browser/scmViewlet';
 // import 'vs/workbench/contrib/debug/browser/debugEditorContribution';
 // import 'vs/workbench/contrib/debug/browser/repl';
 // import 'vs/workbench/contrib/debug/browser/debugViewlet';
-// import 'vs/workbench/services/extensions/electron-browser/extensionHostDebugService';
 
 // Markers
 import 'vs/workbench/contrib/markers/browser/markers.contribution';
@@ -248,7 +249,12 @@ import 'vs/workbench/contrib/markers/browser/markers.contribution';
 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';
+
+import { IWebviewService } from 'vs/workbench/contrib/webview/common/webview';
+import { NullWebviewService } from 'vs/workbench/contrib/webview/browser/webviewService';
+import { IWebviewEditorService, WebviewEditorService } from 'vs/workbench/contrib/webview/browser/webviewEditorService';
 registerSingleton(IWebviewService, NullWebviewService, true);
 registerSingleton(IWebviewEditorService, WebviewEditorService, true);
 
@@ -263,8 +269,14 @@ 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';
+
+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);
 
@@ -274,6 +286,9 @@ registerSingleton(ITerminalInstanceService, TerminalInstanceService, true);
 // Tasks
 // import 'vs/workbench/contrib/tasks/electron-browser/task.contribution';
 
+// Remote
+// import 'vs/workbench/contrib/remote/electron-browser/remote.contribution';
+
 // Emmet
 import 'vs/workbench/contrib/emmet/browser/emmet.contribution';
 
@@ -323,17 +338,11 @@ import 'vs/workbench/contrib/welcome/walkThrough/browser/walkThrough.contributio
 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';
-import { IWebviewService } from 'vs/workbench/contrib/webview/common/webview';
-import { NullWebviewService } from 'vs/workbench/contrib/webview/browser/webviewService';
-import { IWebviewEditorService, WebviewEditorService } from 'vs/workbench/contrib/webview/browser/webviewEditorService';
-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';
-import { ISearchService } from 'vs/workbench/services/search/common/search';
-import { RemoteSearchService } from 'vs/workbench/services/search/common/searchService';
 
 // Experiments
 // import 'vs/workbench/contrib/experiments/electron-browser/experiments.contribution';