npm - @codingame/monaco-vscode-remote-agent-service-override - Versions diffs - 1.85.6 → 2.0.0-v2.1 - Mend

@codingame/monaco-vscode-remote-agent-service-override 1.85.6 → 2.0.0-v2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-remote-agent-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-environment-service-override": "1.85.6"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2",
+    "@codingame/monaco-vscode-environment-service-override": "2.0.0-v2.1"
   }
 }

package/remoteAgent.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
 import { RemoteAgentService } from './vscode/src/vs/workbench/services/remote/browser/remoteAgentService.js';
 import { IRemoteSocketFactoryService, RemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService';
@@ -8,14 +8,14 @@ import { RemoteAuthorityResolverService } from './vscode/src/vs/platform/remote/
 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 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+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 { RemoteExtensionsScannerService } from './vscode/src/vs/workbench/services/remote/common/remoteExtensionsScanner.js';
 import { IRemoteExtensionsScannerService } from 'vscode/vscode/vs/platform/remote/common/remoteExtensionsScanner';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 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';

package/vscode/src/vs/platform/download/common/downloadIpc.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 class DownloadServiceChannel {
     constructor(service) {

package/vscode/src/vs/platform/files/common/diskFileSystemProviderClient.js CHANGED Viewed

@@ -1,11 +1,11 @@
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
-import { canceled } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable, DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { newWriteableStream } from 'monaco-editor/esm/vs/base/common/stream.js';
-import { generateUuid } from 'monaco-editor/esm/vs/base/common/uuid.js';
-import { createFileSystemProviderError, FileSystemProviderErrorCode } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { toErrorMessage } from 'vscode/vscode/vs/base/common/errorMessage';
+import { canceled } from 'vscode/vscode/vs/base/common/errors';
+import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { newWriteableStream } from 'vscode/vscode/vs/base/common/stream';
+import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
+import { createFileSystemProviderError, FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
 import { reviveFileChanges } from 'vscode/vscode/vs/platform/files/common/watcher';
 class DiskFileSystemProviderClient extends Disposable {

package/vscode/src/vs/platform/log/common/logIpc.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 class RemoteLoggerChannelClient extends Disposable {
     constructor(loggerService, channel) {

package/vscode/src/vs/platform/remote/browser/browserSocketFactory.js CHANGED Viewed

@@ -1,11 +1,11 @@
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SocketDiagnostics } from 'vscode/vscode/vs/base/parts/ipc/common/ipc.net';
 import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 class BrowserWebSocket extends Disposable {
     traceSocketEvent(type, data) {
@@ -51,7 +51,7 @@ class BrowserWebSocket extends Disposable {
             enqueue(blob);
         };
         this._socket.addEventListener('message', this._socketMessageListener);
-        this._register(dom.addDisposableListener(this._socket, 'open', (e) => {
+        this._register(addDisposableListener(this._socket, 'open', (e) => {
             this.traceSocketEvent("open" );
             this._onOpen.fire();
         }));
@@ -72,7 +72,7 @@ class BrowserWebSocket extends Disposable {
             pendingErrorEvent = err;
             sendPendingErrorNow();
         };
-        this._register(dom.addDisposableListener(this._socket, 'close', (e) => {
+        this._register(addDisposableListener(this._socket, 'close', (e) => {
             this.traceSocketEvent("close" , { code: e.code, reason: e.reason, wasClean: e.wasClean });
             this._isClosed = true;
             if (pendingErrorEvent) {
@@ -99,7 +99,7 @@ class BrowserWebSocket extends Disposable {
             }
             this._onClose.fire({ code: e.code, reason: e.reason, wasClean: e.wasClean, event: e });
         }));
-        this._register(dom.addDisposableListener(this._socket, 'error', (err) => {
+        this._register(addDisposableListener(this._socket, 'error', (err) => {
             this.traceSocketEvent("error" , { message: err?.message });
             sendErrorSoon(err);
         }));

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

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
-import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
-import * as errors from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { RemoteAuthorities } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as performance from 'monaco-editor/esm/vs/base/common/performance.js';
-import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { DeferredPromise } from 'vscode/vscode/vs/base/common/async';
+import { ErrorNoTelemetry } from 'vscode/vscode/vs/base/common/errors';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+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 { getRemoteAuthorityPrefix, WebSocketRemoteConnection } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
-import { getRemoteServerRootPath, parseAuthorityWithOptionalPort } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
+import { getRemoteServerRootPath, parseAuthorityWithOptionalPort } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extends Disposable {
     constructor(isWorkbenchOptionsBasedResolution, connectionToken, resourceUriProvider, productService, _logService) {
@@ -57,9 +57,9 @@ let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extend
         const authorityPrefix = getRemoteAuthorityPrefix(authority);
         const sw = StopWatch.create(false);
         this._logService.info(`Resolving connection token (${authorityPrefix})...`);
-        performance.mark(`code/willResolveConnectionToken/${authorityPrefix}`);
+        mark(`code/willResolveConnectionToken/${authorityPrefix}`);
         const connectionToken = await Promise.resolve(this._connectionTokens.get(authority) || this._connectionToken);
-        performance.mark(`code/didResolveConnectionToken/${authorityPrefix}`);
+        mark(`code/didResolveConnectionToken/${authorityPrefix}`);
         this._logService.info(`Resolved connection token (${authorityPrefix}) after ${sw.elapsed()} ms`);
         const defaultPort = (/^https:/.test(mainWindow.location.href) ? 443 : 80);
         const { host, port } = parseAuthorityWithOptionalPort(authority, defaultPort);
@@ -91,7 +91,7 @@ let RemoteAuthorityResolverService = class RemoteAuthorityResolverService extend
     _setResolvedAuthorityError(authority, err) {
         if (( this._resolveAuthorityRequests.has(authority))) {
             const request = this._resolveAuthorityRequests.get(authority);
-            request.error(errors.ErrorNoTelemetry.fromError(err));
+            request.error(ErrorNoTelemetry.fromError(err));
         }
     }
     _setAuthorityConnectionToken(authority, connectionToken) {

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { REMOTE_EXPLORER_TYPE_KEY, IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
-import { isStringArray } from 'monaco-editor/esm/vs/base/common/types.js';
+import { isStringArray } from 'vscode/vscode/vs/base/common/types';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { MenuId, MenuRegistry, registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+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 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { Disposable, DisposableMap } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 const SELECTED_REMOTE_IN_EXPLORER = ( new RawContextKey('selectedRemoteInExplorer', ''));
 let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
@@ -25,7 +25,7 @@ let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
         this.switchRemoteMenu = MenuId.for('workbench.remote.menu.switchRemoteMenu');
         this._register(MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
             submenu: this.switchRemoteMenu,
-            title: ( nls.localizeWithPath(
+            title: ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/explorerViewItems',
                 'switchRemote.label',
                 "Switch Remote"

package/vscode/src/vs/workbench/contrib/remote/browser/remote.contribution.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ShowCandidateContribution } from './showCandidate.js';
 import { TunnelFactoryContribution } from './tunnelFactory.js';
 import { RemoteAgentConnectionStatusListener, RemoteMarkers } from './remote.js';

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

@@ -1,49 +1,49 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/remoteViewlet.css.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { localize2WithPath, localizeWithPath } 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 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
+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 { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { isProposedApiEnabled, IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 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 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Extensions, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
+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 Severity from 'monaco-editor/esm/vs/base/common/severity.js';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 import { ReloadWindowAction } from 'vscode/vscode/vs/workbench/browser/actions/windowActions';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { SwitchRemoteViewItem } from './explorerViewItems.js';
-import { isStringArray } from 'monaco-editor/esm/vs/base/common/types.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 { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { WorkbenchAsyncDataTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+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 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { ITimerService } from 'vscode/vscode/vs/workbench/services/timer/browser/timerService';
-import { getRemoteName } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
+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 { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+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 {
@@ -60,15 +60,15 @@ class HelpTreeRenderer {
     }
     renderTemplate(container) {
         container.classList.add('remote-help-tree-node-item');
-        const icon = dom.append(container, dom.$('.remote-help-tree-node-item-icon'));
+        const icon = append(container, $('.remote-help-tree-node-item-icon'));
         const parent = container;
         return { parent, icon };
     }
     renderElement(element, index, templateData, height) {
         const container = templateData.parent;
-        dom.append(container, templateData.icon);
+        append(container, templateData.icon);
         templateData.icon.classList.add(...element.element.iconClasses);
-        const labelContainer = dom.append(container, dom.$('.help-item-label'));
+        const labelContainer = append(container, $('.help-item-label'));
         labelContainer.innerText = element.element.label;
     }
     disposeTemplate(templateData) {
@@ -113,7 +113,7 @@ class HelpModel {
         const getStarted = this.viewModel.helpInformation.filter(info => info.getStarted);
         if (getStarted.length) {
             const helpItemValues = ( getStarted.map((info) => this.createHelpItemValue(info, 'getStarted')));
-            const getStartedHelpItem = this.items?.find(item => item.icon === getStartedIcon) ?? ( new GetStartedHelpItem(getStartedIcon, ( nls.localizeWithPath(
+            const getStartedHelpItem = this.items?.find(item => item.icon === getStartedIcon) ?? ( new GetStartedHelpItem(getStartedIcon, ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remote',
                 'remote.help.getStarted',
                 "Get Started"
@@ -124,7 +124,7 @@ class HelpModel {
         const documentation = this.viewModel.helpInformation.filter(info => info.documentation);
         if (documentation.length) {
             const helpItemValues = ( documentation.map((info) => this.createHelpItemValue(info, 'documentation')));
-            const documentationHelpItem = this.items?.find(item => item.icon === documentationIcon) ?? ( new HelpItem(documentationIcon, ( nls.localizeWithPath(
+            const documentationHelpItem = this.items?.find(item => item.icon === documentationIcon) ?? ( new HelpItem(documentationIcon, ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remote',
                 'remote.help.documentation',
                 "Read Documentation"
@@ -135,7 +135,7 @@ class HelpModel {
         const issues = this.viewModel.helpInformation.filter(info => info.issues);
         if (issues.length) {
             const helpItemValues = ( issues.map((info) => this.createHelpItemValue(info, 'issues')));
-            const reviewIssuesHelpItem = this.items?.find(item => item.icon === reviewIssuesIcon) ?? ( new HelpItem(reviewIssuesIcon, ( nls.localizeWithPath(
+            const reviewIssuesHelpItem = this.items?.find(item => item.icon === reviewIssuesIcon) ?? ( new HelpItem(reviewIssuesIcon, ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remote',
                 'remote.help.issues',
                 "Review Issues"
@@ -145,7 +145,7 @@ class HelpModel {
         }
         if (helpItems.length) {
             const helpItemValues = ( this.viewModel.helpInformation.map(info => this.createHelpItemValue(info, 'reportIssue')));
-            const issueReporterItem = this.items?.find(item => item.icon === reportIssuesIcon) ?? ( new IssueReporterItem(reportIssuesIcon, ( nls.localizeWithPath(
+            const issueReporterItem = this.items?.find(item => item.icon === reportIssuesIcon) ?? ( new IssueReporterItem(reportIssuesIcon, ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remote',
                 'remote.help.report',
                 "Report Issue"
@@ -266,7 +266,7 @@ class HelpItemBase {
         if (this.values.length > 1) {
             const actions = await this.getActions();
             if (actions.length) {
-                const action = await this.quickInputService.pick(actions, { placeHolder: ( nls.localizeWithPath(
+                const action = await this.quickInputService.pick(actions, { placeHolder: ( localizeWithPath(
                     'vs/workbench/contrib/remote/browser/remote',
                     'pickRemoteExtension',
                     "Select url to open"
@@ -331,7 +331,7 @@ class IssueReporterItem extends HelpItemBase {
 }
 let HelpPanel = class HelpPanel extends ViewPane {
     static { this.ID = '~remote.helpPanel'; }
-    static { this.TITLE = ( nls.localize2WithPath(
+    static { this.TITLE = ( localize2WithPath(
         'vs/workbench/contrib/remote/browser/remote',
         'remote.help',
         "Help and feedback"
@@ -357,7 +357,7 @@ let HelpPanel = class HelpPanel extends ViewPane {
                 getAriaLabel: (item) => {
                     return item.label;
                 },
-                getWidgetAriaLabel: () => ( nls.localizeWithPath('vs/workbench/contrib/remote/browser/remote', 'remotehelp', "Remote Help"))
+                getWidgetAriaLabel: () => ( localizeWithPath('vs/workbench/contrib/remote/browser/remote', 'remotehelp', "Remote Help"))
             }
         });
         const model = ( new HelpModel(
@@ -486,7 +486,7 @@ let RemoteViewPaneContainer = class RemoteViewPaneContainer extends FilterViewPa
         this.remoteExplorerService.targetType = isStringArray(viewDescriptor.remoteAuthority) ? viewDescriptor.remoteAuthority : [viewDescriptor.remoteAuthority];
     }
     getTitle() {
-        const title = ( nls.localizeWithPath(
+        const title = ( localizeWithPath(
             'vs/workbench/contrib/remote/browser/remote',
             'remote.explorer',
             "Remote Explorer"
@@ -509,7 +509,7 @@ RemoteViewPaneContainer = ( __decorate([
 ], RemoteViewPaneContainer));
 ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
-    title: { value: ( nls.localizeWithPath(
+    title: { value: ( localizeWithPath(
         'vs/workbench/contrib/remote/browser/remote',
         'remote.explorer',
         "Remote Explorer"
@@ -606,7 +606,7 @@ class ReconnectionTimer {
     constructor(parent, completionTime) {
         this._parent = parent;
         this._completionTime = completionTime;
-        this._renderInterval = dom.disposableWindowInterval(mainWindow, () => this._render(), 1000);
+        this._renderInterval = disposableWindowInterval(mainWindow, () => this._render(), 1000);
         this._render();
     }
     dispose() {
@@ -619,7 +619,7 @@ class ReconnectionTimer {
         }
         const remainingTime = Math.ceil(remainingTimeMs / 1000);
         if (remainingTime === 1) {
-            this._parent.report(( nls.localizeWithPath(
+            this._parent.report(( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remote',
                 'reconnectionWaitOne',
                 "Attempting to reconnect in {0} second...",
@@ -627,7 +627,7 @@ class ReconnectionTimer {
             )));
         }
         else {
-            this._parent.report(( nls.localizeWithPath(
+            this._parent.report(( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remote',
                 'reconnectionWaitMany',
                 "Attempting to reconnect in {0} seconds...",
@@ -681,7 +681,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
             let lastIncomingDataTime = 0;
             let reconnectionAttempts = 0;
             const reconnectButton = {
-                label: ( nls.localizeWithPath(
+                label: ( localizeWithPath(
                     'vs/workbench/contrib/remote/browser/remote',
                     'reconnectNow',
                     "Reconnect Now"
@@ -691,7 +691,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                 }
             };
             const reloadButton = {
-                label: ( nls.localizeWithPath(
+                label: ( localizeWithPath(
                     'vs/workbench/contrib/remote/browser/remote',
                     'reloadWindow',
                     "Reload Window"
@@ -725,7 +725,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             if (!visibleProgress) {
                                 visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
                             }
-                            visibleProgress.report(( nls.localizeWithPath(
+                            visibleProgress.report(( localizeWithPath(
                                 'vs/workbench/contrib/remote/browser/remote',
                                 'connectionLost',
                                 "Connection Lost"
@@ -751,7 +751,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                         });
                         if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) {
                             visibleProgress = showProgress(null, [reloadButton]);
-                            visibleProgress.report(( nls.localizeWithPath(
+                            visibleProgress.report(( localizeWithPath(
                                 'vs/workbench/contrib/remote/browser/remote',
                                 'reconnectionRunning',
                                 "Disconnected. Attempting to reconnect..."
@@ -783,12 +783,12 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             this._reloadWindowShown = true;
                             dialogService.confirm({
                                 type: Severity.Error,
-                                message: ( nls.localizeWithPath(
+                                message: ( localizeWithPath(
                                     'vs/workbench/contrib/remote/browser/remote',
                                     'reconnectionPermanentFailure',
                                     "Cannot reconnect. Please reload the window."
                                 )),
-                                primaryButton: ( nls.localizeWithPath(
+                                primaryButton: ( localizeWithPath(
                                     'vs/workbench/contrib/remote/browser/remote',
                                     { key: 'reloadWindow.dialog', comment: ['&& denotes a mnemonic'] },
                                     "&&Reload Window"

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

@@ -1,43 +1,43 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { remoteConnectionLatencyMeasurer, IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { RunOnceScheduler, retry } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { MenuId, registerAction2, Action2, MenuRegistry, MenuItemAction, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+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, MenuItemAction, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+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 { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
+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 { isWeb, PlatformToString, platform } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { truncate } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { getRemoteName } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
+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 { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
-import { getCodiconAriaLabel } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { getCodiconAriaLabel } from 'vscode/vscode/vs/base/common/iconLabels';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 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 { VIEWLET_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
-import { MarkdownString } from 'monaco-editor/esm/vs/base/common/htmlContent.js';
+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 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
-import { DomEmitter } from 'monaco-editor/esm/vs/base/browser/event.js';
-import { ExtensionIdentifier } from 'monaco-editor/esm/vs/platform/extensions/common/extensions.js';
-import { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+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 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 var RemoteStatusIndicator_1;
 let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
@@ -111,7 +111,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         this.updateRemoteStatusIndicator();
     }
     registerActions() {
-        const category = { value: ( nls.localizeWithPath(
+        const category = { value: ( localizeWithPath(
             'vs/workbench/contrib/remote/browser/remoteIndicator',
             'remote.category',
             "Remote"
@@ -122,7 +122,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 super({
                     id: RemoteStatusIndicator_1.REMOTE_ACTIONS_COMMAND_ID,
                     category,
-                    title: { value: ( nls.localizeWithPath(
+                    title: { value: ( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'remote.showMenu',
                         "Show Remote Menu"
@@ -142,7 +142,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     super({
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
                         category,
-                        title: { value: ( nls.localizeWithPath(
+                        title: { value: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             'remote.close',
                             "Close Remote Connection"
@@ -158,7 +158,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     group: '6_close',
                     command: {
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
-                        title: ( nls.localizeWithPath(
+                        title: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             { key: 'miCloseRemote', comment: ['&& denotes a mnemonic'] },
                             "Close Re&&mote Connection"
@@ -174,7 +174,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     super({
                         id: RemoteStatusIndicator_1.INSTALL_REMOTE_EXTENSIONS_ID,
                         category,
-                        title: { value: ( nls.localizeWithPath(
+                        title: { value: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             'remote.install',
                             "Install Remote Development Extensions"
@@ -391,18 +391,18 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             const hostLabel = this.labelService.getHostLabel(Schemas.vscodeRemote, this.remoteAuthority) || this.remoteAuthority;
             switch (this.connectionState) {
                 case 'initializing':
-                    this.renderRemoteStatusIndicator(( nls.localizeWithPath(
+                    this.renderRemoteStatusIndicator(( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'host.open',
                         "Opening Remote..."
-                    )), ( nls.localizeWithPath(
+                    )), ( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'host.open',
                         "Opening Remote..."
                     )), undefined, true );
                     break;
                 case 'reconnecting':
-                    this.renderRemoteStatusIndicator(`${( nls.localizeWithPath(
+                    this.renderRemoteStatusIndicator(`${( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'host.reconnecting',
                         "Reconnecting to {0}...",
@@ -410,7 +410,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     ))}`, undefined, undefined, true );
                     break;
                 case 'disconnected':
-                    this.renderRemoteStatusIndicator(`$(alert) ${( nls.localizeWithPath(
+                    this.renderRemoteStatusIndicator(`$(alert) ${( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'disconnectedFrom',
                         "Disconnected from {0}",
@@ -424,7 +424,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                         tooltip.appendMarkdown(hostNameTooltip);
                     }
                     else {
-                        tooltip.appendText(( nls.localizeWithPath(
+                        tooltip.appendText(( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             { key: 'host.tooltip', comment: ['{0} is a remote host name, e.g. Dev Container'] },
                             "Editing on {0}",
@@ -445,7 +445,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     tooltip.appendMarkdown(hostNameTooltip);
                 }
                 else {
-                    tooltip.appendText(( nls.localizeWithPath(
+                    tooltip.appendText(( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         { key: 'workspace.tooltip', comment: ['{0} is a remote workspace name, e.g. GitHub'] },
                         "Editing on {0}",
@@ -454,7 +454,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 }
                 if (!isWeb || this.remoteAuthority) {
                     tooltip.appendMarkdown('\n\n');
-                    tooltip.appendMarkdown(( nls.localizeWithPath(
+                    tooltip.appendMarkdown(( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         { key: 'workspace.tooltip2', comment: ['[features are not available]({1}) is a link. Only translate `features are not available`. Do not change brackets and parentheses or {0}'] },
                         "Some [features are not available]({0}) for resources located on a virtual file system.",
@@ -465,7 +465,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 return;
             }
         }
-        this.renderRemoteStatusIndicator(`$(remote)`, ( nls.localizeWithPath(
+        this.renderRemoteStatusIndicator(`$(remote)`, ( localizeWithPath(
             'vs/workbench/contrib/remote/browser/remoteIndicator',
             'noHost.tooltip',
             "Open a Remote Window"
@@ -475,7 +475,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
     renderRemoteStatusIndicator(initialText, initialTooltip, command, showProgress) {
         const { text, tooltip, ariaLabel } = this.withNetworkStatus(initialText, initialTooltip, showProgress);
         const properties = {
-            name: ( nls.localizeWithPath(
+            name: ( localizeWithPath(
                 'vs/workbench/contrib/remote/browser/remoteIndicator',
                 'remoteHost',
                 "Remote Host"
@@ -506,7 +506,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         }
         switch (this.networkState) {
             case 'offline': {
-                const offlineMessage = ( nls.localizeWithPath(
+                const offlineMessage = ( localizeWithPath(
                     'vs/workbench/contrib/remote/browser/remoteIndicator',
                     'networkStatusOfflineTooltip',
                     "Network appears to be offline, certain features might be unavailable."
@@ -518,7 +518,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             }
             case 'high-latency':
                 text = textWithAlert();
-                tooltip = this.appendTooltipLine(tooltip, ( nls.localizeWithPath(
+                tooltip = this.appendTooltipLine(tooltip, ( localizeWithPath(
                     'vs/workbench/contrib/remote/browser/remoteIndicator',
                     'networkStatusHighLatencyTooltip',
                     "Network appears to have high latency ({0}ms last, {1}ms average), certain features may be slow to respond.",
@@ -631,7 +631,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                         const label = metadata.startConnectLabel;
                         const buttons = [{
                                 iconClass: ThemeIcon.asClassName(infoIcon),
-                                tooltip: ( nls.localizeWithPath(
+                                tooltip: ( localizeWithPath(
                                     'vs/workbench/contrib/remote/browser/remoteIndicator',
                                     'remote.startActions.help',
                                     "Learn More"
@@ -641,7 +641,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     }
                 }
                 items.push({
-                    type: 'separator', label: ( nls.localizeWithPath(
+                    type: 'separator', label: ( localizeWithPath(
                     'vs/workbench/contrib/remote/browser/remoteIndicator',
                     'remote.startActions.install',
                     'Install'
@@ -658,7 +658,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     items.push({
                         type: 'item',
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             'closeRemoteConnection.title',
                             'Close Remote Connection'
@@ -668,7 +668,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                         items.push({
                             type: 'item',
                             id: ReloadWindowAction.ID,
-                            label: ( nls.localizeWithPath(
+                            label: ( localizeWithPath(
                                 'vs/workbench/contrib/remote/browser/remoteIndicator',
                                 'reloadWindow',
                                 'Reload Window'
@@ -680,7 +680,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     items.push({
                         type: 'item',
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/remoteIndicator',
                             'closeVirtualWorkspace.title',
                             'Close Remote Workspace'
@@ -694,7 +694,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             return items;
         };
         const quickPick = this.quickInputService.createQuickPick();
-        quickPick.placeholder = ( nls.localizeWithPath(
+        quickPick.placeholder = ( localizeWithPath(
             'vs/workbench/contrib/remote/browser/remoteIndicator',
             'remoteActions',
             "Select an option to open a Remote Window"
@@ -710,7 +710,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 if (remoteExtension) {
                     quickPick.items = [];
                     quickPick.busy = true;
-                    quickPick.placeholder = ( nls.localizeWithPath(
+                    quickPick.placeholder = ( localizeWithPath(
                         'vs/workbench/contrib/remote/browser/remoteIndicator',
                         'remote.startActions.installingExtension',
                         'Installing extension... '

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.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';

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

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { TunnelPrivacyId, TunnelProtocol, ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/browser/environmentService';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { forwardedPortsViewEnabled } from 'vscode/vscode/vs/workbench/services/remote/common/tunnelModel';
 let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposable {
@@ -23,7 +23,7 @@ let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposab
                 privacyOptions = [
                     {
                         id: 'private',
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/tunnelFactory',
                             'tunnelPrivacy.private',
                             "Private"
@@ -32,7 +32,7 @@ let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposab
                     },
                     {
                         id: 'public',
-                        label: ( nls.localizeWithPath(
+                        label: ( localizeWithPath(
                             'vs/workbench/contrib/remote/browser/tunnelFactory',
                             'tunnelPrivacy.public',
                             "Public"

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

@@ -1,24 +1,24 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { OS, isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { OS, isWeb } from 'vscode/vscode/vs/base/common/platform';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { remoteConnectionLatencyMeasurer, IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
-import { ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Extensions as Extensions$1 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
+import { localizeWithPath } 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 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { firstOrDefault } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { firstOrDefault } from 'vscode/vscode/vs/base/common/arrays';
+import { registerAction2, Action2 } 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 { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { getRemoteName } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { IDownloadService } from 'vscode/vscode/vs/platform/download/common/download';
 import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
 import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';

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

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { getMediaOrTextMime } from 'monaco-editor/esm/vs/base/common/mime.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { FileOperationError, IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+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 { FileOperationError, IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 let BrowserRemoteResourceLoader = class BrowserRemoteResourceLoader extends Disposable {
     constructor(fileService, provider) {

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as nls from 'monaco-editor/esm/vs/nls.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 { RemoteAuthorityResolverError, IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { AbstractRemoteAgentService } from '../common/abstractRemoteAgentService.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
 import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { Severity } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+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 { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } 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';
@@ -44,12 +44,12 @@ let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFail
     async _presentConnectionError(err) {
         await this._dialogService.prompt({
             type: Severity.Error,
-            message: ( nls.localizeWithPath(
+            message: ( localizeWithPath(
                 'vs/workbench/services/remote/browser/remoteAgentService',
                 'connectionError',
                 "An unexpected error occurred that requires a reload of this page."
             )),
-            detail: ( nls.localizeWithPath(
+            detail: ( localizeWithPath(
                 'vs/workbench/services/remote/browser/remoteAgentService',
                 'connectionErrorDetail',
                 "The workbench failed to connect to the server (Error: {0})",
@@ -57,7 +57,7 @@ let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFail
             )),
             buttons: [
                 {
-                    label: ( nls.localizeWithPath(
+                    label: ( localizeWithPath(
                         'vs/workbench/services/remote/browser/remoteAgentService',
                         { key: 'reload', comment: ['&& denotes a mnemonic'] },
                         "&&Reload"

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

@@ -1,14 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.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 { connectRemoteAgentManagement } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
 import { IRemoteAuthorityResolverService } from 'vscode/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { RemoteExtensionEnvironmentChannelClient } from './remoteAgentEnvironmentChannel.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { ISignService } from 'vscode/vscode/vs/platform/sign/common/sign';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+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';

package/vscode/src/vs/workbench/services/remote/common/remoteAgentEnvironmentChannel.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { revive } from 'monaco-editor/esm/vs/base/common/marshalling.js';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { revive } from 'vscode/vscode/vs/base/common/marshalling';
 class RemoteExtensionEnvironmentChannelClient {
     static async getEnvironmentData(channel, remoteAuthority, profile) {

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

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../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 * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
+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 'monaco-editor/esm/vs/platform/log/common/log.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IActiveLanguagePackService } from 'vscode/vscode/vs/workbench/services/localization/common/locale';
 let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
@@ -26,7 +26,7 @@ let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
             const languagePack = await this.activeLanguagePackService.getExtensionIdProvidingCurrentLocale();
             return await this.withChannel(async (channel) => {
                 const profileLocation = this.userDataProfileService.currentProfile.isDefault ? undefined : (await this.remoteUserDataProfilesService.getRemoteProfile(this.userDataProfileService.currentProfile)).extensionsResource;
-                const scannedExtensions = await channel.call('scanExtensions', [platform.language, profileLocation, this.environmentService.extensionDevelopmentLocationURI, languagePack]);
+                const scannedExtensions = await channel.call('scanExtensions', [language, profileLocation, this.environmentService.extensionDevelopmentLocationURI, languagePack]);
                 scannedExtensions.forEach((extension) => {
                     extension.extensionLocation = URI.revive(extension.extensionLocation);
                 });
@@ -41,7 +41,7 @@ let RemoteExtensionsScannerService = class RemoteExtensionsScannerService {
     async scanSingleExtension(extensionLocation, isBuiltin) {
         try {
             return await this.withChannel(async (channel) => {
-                const extension = await channel.call('scanSingleExtension', [extensionLocation, isBuiltin, platform.language]);
+                const extension = await channel.call('scanSingleExtension', [extensionLocation, isBuiltin, language]);
                 if (extension !== null) {
                     extension.extensionLocation = URI.revive(extension.extensionLocation);
                 }

package/vscode/src/vs/workbench/services/remote/common/remoteFileSystemProviderClient.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { getErrorMessage } from 'monaco-editor/esm/vs/base/common/errors.js';
-import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { DiskFileSystemProviderClient } from '../../../../platform/files/common/diskFileSystemProviderClient.js';
 const REMOTE_FILE_SYSTEM_CHANNEL_NAME = 'remoteFilesystem';