@codingame/monaco-vscode-remote-agent-service-override 4.4.1 → 4.5.0-improve-code-splitting.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-remote-agent-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0-improve-code-splitting.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,8 +17,16 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1",
-    "@codingame/monaco-vscode-environment-service-override": "4.4.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0-improve-code-splitting.1",
+    "@codingame/monaco-vscode-environment-service-override": "4.5.0-improve-code-splitting.1"
   }
 }

package/remoteAgent.js

@@ -1,27 +1,30 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { RemoteAgentService } from './vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js';
-import { RemoteSocketFactoryService, IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
-import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
+import { RemoteSocketFactoryService } from './vscode/src/vs/platform/remote/common/remoteSocketFactoryService.js';
+import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
+import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { RemoteAuthorityResolverService } from './vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.js';
 import { BrowserSocketFactory } from './vscode/src/vs/platform/remote/browser/browserSocketFactory.js';
 import { RemoteFileSystemProviderClient } from './vscode/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.js';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IRemoteExplorerService, RemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
-import { IExternalUriOpenerService, ExternalUriOpenerService } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { RemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
+import { ExternalUriOpenerService } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
+import { IExternalUriOpenerService } from 'vscode/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.service';
 import { RemoteExtensionsScannerService } from './vscode/src/vs/workbench/services/remote/common/remoteExtensionsScanner.js';
-import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
+import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
 import { BrowserRemoteResourceLoader } from './vscode/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.js';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IRemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale';
-import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IRemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale.service';
+import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel.service';
 import { TunnelService } from './vscode/src/vs/workbench/services/tunnel/browser/tunnelService.js';
 import getServiceOverride$1 from '@codingame/monaco-vscode-environment-service-override';
 import { getWorkbenchConstructionOptions } from 'vscode/workbench';

package/vscode/src/vs/platform/remote/browser/remoteAuthorityResolverService.js

@@ -7,8 +7,8 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { RemoteAuthorities } from 'vscode/vscode/vs/base/common/network';
 import { mark } from 'vscode/vscode/vs/base/common/performance';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { getRemoteAuthorityPrefix, WebSocketRemoteConnection } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { parseAuthorityWithOptionalPort } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 

package/vscode/src/vs/platform/remote/common/remoteExtensionsScanner.js

@@ -0,0 +1,3 @@
+const RemoteExtensionsScannerChannelName = 'remoteExtensionsScanner';
+
+export { RemoteExtensionsScannerChannelName };

package/vscode/src/vs/platform/remote/common/remoteSocketFactoryService.js

@@ -0,0 +1,30 @@
+import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+
+class RemoteSocketFactoryService {
+    constructor() {
+        this.factories = {};
+    }
+    register(type, factory) {
+        this.factories[type] ??= [];
+        this.factories[type].push(factory);
+        return toDisposable(() => {
+            const idx = this.factories[type]?.indexOf(factory);
+            if (typeof idx === 'number' && idx >= 0) {
+                this.factories[type]?.splice(idx, 1);
+            }
+        });
+    }
+    getSocketFactory(messagePassing) {
+        const factories = (this.factories[messagePassing.type] || []);
+        return factories.find(factory => factory.supports(messagePassing));
+    }
+    connect(connectTo, path, query, debugLabel) {
+        const socketFactory = this.getSocketFactory(connectTo);
+        if (!socketFactory) {
+            throw new Error(`No socket factory found for ${connectTo}`);
+        }
+        return socketFactory.connect(connectTo, path, query, debugLabel);
+    }
+}
+
+export { RemoteSocketFactoryService };

package/vscode/src/vs/workbench/contrib/remote/browser/explorerViewItems.js

@@ -1,14 +1,16 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IRemoteExplorerService, REMOTE_EXPLORER_TYPE_KEY } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { REMOTE_EXPLORER_TYPE_KEY } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
 import { isStringArray } from 'vscode/vscode/vs/base/common/types';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { RawContextKey, IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { MenuId, MenuRegistry, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteExplorer';
 import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 
 const SELECTED_REMOTE_IN_EXPLORER = ( new RawContextKey('selectedRemoteInExplorer', ''));

package/vscode/src/vs/workbench/contrib/remote/browser/remote.js

@@ -1,50 +1,51 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/remoteViewlet.css.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { append, $, disposableWindowInterval } from 'vscode/vscode/vs/base/browser/dom';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { IExtensionService, isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { isProposedApiEnabled } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { FilterViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewsViewlet';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteExplorer';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IViewDescriptorService, Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { ReloadWindowAction } from 'vscode/vscode/vs/workbench/browser/actions/windowActions';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SwitchRemoteViewItem } from './explorerViewItems.js';
 import { isStringArray } from 'vscode/vscode/vs/base/common/types';
-import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { remoteExplorerViewIcon, getStartedIcon, documentationIcon, reviewIssuesIcon, reportIssuesIcon } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteIcons';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { ITimerService } from 'vscode/vscode/vs/workbench/services/timer/browser/timerService';
+import { getStartedIcon, documentationIcon, reviewIssuesIcon, reportIssuesIcon, remoteExplorerViewIcon } from 'vscode/vscode/vs/workbench/contrib/remote/browser/remoteIcons';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ITimerService } from 'vscode/vscode/vs/workbench/services/timer/browser/timerService.service';
 import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
-import { IWalkthroughsService } from 'vscode/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService';
+import { IWalkthroughsService } from 'vscode/vscode/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 class HelpTreeVirtualDelegate {
     getHeight(element) {

package/vscode/src/vs/workbench/contrib/remote/browser/remoteConnectionHealth.js

@@ -1,19 +1,19 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IRemoteAgentService, remoteConnectionLatencyMeasurer } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { remoteConnectionLatencyMeasurer } from '../../../services/remote/common/remoteAgentService.js';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
-import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IBannerService } from 'vscode/vscode/vs/workbench/services/banner/browser/bannerService.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 const REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY = 'remote.unsupportedConnectionChoice';
 const BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY = 'workbench.banner.remote.unsupportedConnection.dismissed';

package/vscode/src/vs/workbench/contrib/remote/browser/remoteIndicator.js

@@ -1,47 +1,51 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
-import { remoteConnectionLatencyMeasurer, IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
+import { remoteConnectionLatencyMeasurer } from '../../../services/remote/common/remoteAgentService.js';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { RunOnceScheduler, retry } from 'vscode/vscode/vs/base/common/async';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { MenuId, registerAction2, Action2, MenuRegistry, IMenuService, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { MenuId, registerAction2, Action2, MenuRegistry, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
+import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 import { isWeb, PlatformToString, platform } from 'vscode/vscode/vs/base/common/platform';
 import { truncate } from 'vscode/vscode/vs/base/common/strings';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
 import { getCodiconAriaLabel } from 'vscode/vscode/vs/base/common/iconLabels';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { ReloadWindowAction } from 'vscode/vscode/vs/workbench/browser/actions/windowActions';
-import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionGalleryService, IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { VIEWLET_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { RemoteNameContext, VirtualWorkspaceContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { DomEmitter } from 'vscode/vscode/vs/base/browser/event';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { infoIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/common/configuration';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 var RemoteStatusIndicator_1;
 let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {

package/vscode/src/vs/workbench/contrib/remote/browser/remoteStartEntry.js

@@ -1,14 +1,15 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
-import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 
 var RemoteStartEntry_1;
 const showStartEntryInWeb = ( new RawContextKey('showRemoteStartEntryInWeb', false));

package/vscode/src/vs/workbench/contrib/remote/browser/showCandidate.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
 
 let ShowCandidateContribution = class ShowCandidateContribution extends Disposable {
     static { this.ID = 'workbench.contrib.showPortCandidate'; }

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelFactory.js

@@ -1,13 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { TunnelPrivacyId, TunnelProtocol, ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
+import { TunnelPrivacyId, TunnelProtocol } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
+import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { forwardedPortsViewEnabled } from 'vscode/vscode/vs/workbench/services/remote/common/tunnelModel';
 
 let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/remote/common/remote.contribution.js

@@ -1,26 +1,25 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { OS, isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
-import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { PersistentConnection } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
-import { IDownloadService } from 'vscode/vscode/vs/platform/download/common/download';
+import { IDownloadService } from 'vscode/vscode/vs/platform/download/common/download.service';
 import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
 import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
-import { IDialogService, IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 let LabelContribution = class LabelContribution {
     static { this.ID = 'workbench.contrib.remoteLabel'; }

package/vscode/src/vs/workbench/services/remote/browser/browserRemoteResourceHandler.js

@@ -3,7 +3,8 @@ import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { getMediaOrTextMime } from 'vscode/vscode/vs/base/common/mime';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IFileService, FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
+import { FileOperationError } from 'vscode/vscode/vs/platform/files/common/files';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 
 let BrowserRemoteResourceLoader = class BrowserRemoteResourceLoader extends Disposable {
     constructor(fileService, provider) {

package/vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js

@@ -1,19 +1,20 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { IRemoteAuthorityResolverService, RemoteAuthorityResolverError } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { RemoteAuthorityResolverError } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
+import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { AbstractRemoteAgentService } from '../common/abstractRemoteAgentService.js';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 let RemoteAgentService = class RemoteAgentService extends AbstractRemoteAgentService {
     constructor(remoteSocketFactoryService, userDataProfileService, environmentService, productService, remoteAuthorityResolverService, signService, logService) {
@@ -43,7 +44,7 @@ let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFail
     }
     async _presentConnectionError(err) {
         await this._dialogService.prompt({
-            type: Severity.Error,
+            type: Severity$1.Error,
             message: ( localizeWithPath(
                 'vs/workbench/services/remote/browser/remoteAgentService',
                 'connectionError',

package/vscode/src/vs/workbench/services/remote/common/abstractRemoteAgentService.js

@@ -1,16 +1,16 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { getDelayedChannel } from 'vscode/vscode/vs/base/parts/ipc/common/ipc';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { connectRemoteAgentManagement } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
-import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
+import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { RemoteExtensionEnvironmentChannelClient } from './remoteAgentEnvironmentChannel.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
+import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
 
 let AbstractRemoteAgentService = class AbstractRemoteAgentService extends Disposable {
     constructor(remoteSocketFactoryService, userDataProfileService, _environmentService, productService, _remoteAuthorityResolverService, signService, logService) {

package/vscode/src/vs/workbench/services/remote/common/remoteAgentService.js

@@ -0,0 +1,59 @@
+import { timeout } from 'vscode/vscode/vs/base/common/async';
+
+const remoteConnectionLatencyMeasurer = new class {
+    constructor() {
+        this.maxSampleCount = 5;
+        this.sampleDelay = 2000;
+        this.initial = [];
+        this.maxInitialCount = 3;
+        this.average = [];
+        this.maxAverageCount = 100;
+        this.highLatencyMultiple = 2;
+        this.highLatencyMinThreshold = 500;
+        this.highLatencyMaxThreshold = 1500;
+        this.lastMeasurement = undefined;
+    }
+    get latency() { return this.lastMeasurement; }
+    async measure(remoteAgentService) {
+        let currentLatency = Infinity;
+        for (let i = 0; i < this.maxSampleCount; i++) {
+            const rtt = await remoteAgentService.getRoundTripTime();
+            if (rtt === undefined) {
+                return undefined;
+            }
+            currentLatency = Math.min(currentLatency, rtt / 2 );
+            await timeout(this.sampleDelay);
+        }
+        this.average.push(currentLatency);
+        if (this.average.length > this.maxAverageCount) {
+            this.average.shift();
+        }
+        let initialLatency = undefined;
+        if (this.initial.length < this.maxInitialCount) {
+            this.initial.push(currentLatency);
+        }
+        else {
+            initialLatency = this.initial.reduce((sum, value) => sum + value, 0) / this.initial.length;
+        }
+        this.lastMeasurement = {
+            initial: initialLatency,
+            current: currentLatency,
+            average: this.average.reduce((sum, value) => sum + value, 0) / this.average.length,
+            high: (() => {
+                if (typeof initialLatency === 'undefined') {
+                    return false;
+                }
+                if (currentLatency > this.highLatencyMaxThreshold) {
+                    return true;
+                }
+                if (currentLatency > this.highLatencyMinThreshold && currentLatency > initialLatency * this.highLatencyMultiple) {
+                    return true;
+                }
+                return false;
+            })()
+        };
+        return this.lastMeasurement;
+    }
+};
+
+export { remoteConnectionLatencyMeasurer };

package/vscode/src/vs/workbench/services/remote/common/remoteExtensionsScanner.js

@@ -1,13 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { RemoteExtensionsScannerChannelName } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { RemoteExtensionsScannerChannelName } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { language } from 'vscode/vscode/vs/base/common/platform';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IRemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IRemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale.service';
 
 let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
     constructor(remoteAgentService, environmentService, userDataProfileService, remoteUserDataProfilesService, logService, activeLanguagePackService) {

package/vscode/src/vs/workbench/services/tunnel/browser/tunnelService.js

@@ -1,8 +1,9 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { AbstractTunnelService, isTunnelProvider } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 
 let TunnelService = class TunnelService extends AbstractTunnelService {
     constructor(logService, environmentService, configurationService) {

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,10 +0,0 @@
-export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
-
-var ConfirmResult;
-( (function(ConfirmResult) {
-    ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";
-    ConfirmResult[ConfirmResult["DONT_SAVE"] = 1] = "DONT_SAVE";
-    ConfirmResult[ConfirmResult["CANCEL"] = 2] = "CANCEL";
-})(ConfirmResult || (ConfirmResult = {})));
-
-export { ConfirmResult };