@codingame/monaco-vscode-remote-agent-service-override 7.1.0 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-remote-agent-service-override",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.1.0",
-    "@codingame/monaco-vscode-environment-service-override": "7.1.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1",
+    "@codingame/monaco-vscode-environment-service-override": "7.1.1"
   }
 }

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 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';
@@ -14,7 +14,6 @@ import { getVirtualWorkspaceLocation } from 'vscode/vscode/vs/platform/workspace
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { Disposable, DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 
-const _moduleId = "vs/workbench/contrib/remote/browser/explorerViewItems";
 const SELECTED_REMOTE_IN_EXPLORER = ( (new RawContextKey('selectedRemoteInExplorer', '')));
 let SwitchRemoteViewItem = class SwitchRemoteViewItem extends Disposable {
     constructor(contextKeyService, remoteExplorerService, environmentService, storageService, workspaceContextService) {
@@ -29,7 +28,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: ( localizeWithPath(_moduleId, 0, "Switch Remote")),
+            title: ( localize(10837, "Switch Remote")),
             group: 'navigation',
             when: ( (ContextKeyExpr.equals('viewContainer', VIEWLET_ID))),
             order: 1,

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/remoteViewlet.css.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize, localize2 } 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.service';
@@ -50,7 +50,6 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
-const _moduleId = "vs/workbench/contrib/remote/browser/remote";
 class HelpTreeVirtualDelegate {
     getHeight(element) {
         return 22;
@@ -120,27 +119,27 @@ 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, ( localizeWithPath(_moduleId, 0, "Get Started")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService, this.commandService)));
+            const getStartedHelpItem = this.items?.find(item => item.icon === getStartedIcon) ?? ( (new GetStartedHelpItem(getStartedIcon, ( localize(8686, "Get Started")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService, this.commandService)));
             getStartedHelpItem.values = helpItemValues;
             helpItems.push(getStartedHelpItem);
         }
         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, ( localizeWithPath(_moduleId, 1, "Read Documentation")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
+            const documentationHelpItem = this.items?.find(item => item.icon === documentationIcon) ?? ( (new HelpItem(documentationIcon, ( localize(8687, "Read Documentation")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
             documentationHelpItem.values = helpItemValues;
             helpItems.push(documentationHelpItem);
         }
         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, ( localizeWithPath(_moduleId, 2, "Review Issues")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
+            const reviewIssuesHelpItem = this.items?.find(item => item.icon === reviewIssuesIcon) ?? ( (new HelpItem(reviewIssuesIcon, ( localize(8688, "Review Issues")), helpItemValues, this.quickInputService, this.environmentService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
             reviewIssuesHelpItem.values = helpItemValues;
             helpItems.push(reviewIssuesHelpItem);
         }
         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, ( localizeWithPath(_moduleId, 3, "Report Issue")), helpItemValues, this.quickInputService, this.environmentService, this.commandService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
+            const issueReporterItem = this.items?.find(item => item.icon === reportIssuesIcon) ?? ( (new IssueReporterItem(reportIssuesIcon, ( localize(8689, "Report Issue")), helpItemValues, this.quickInputService, this.environmentService, this.commandService, this.openerService, this.remoteExplorerService, this.workspaceContextService)));
             issueReporterItem.values = helpItemValues;
             helpItems.push(issueReporterItem);
         }
@@ -257,7 +256,7 @@ class HelpItemBase {
         if (this.values.length > 1) {
             const actions = await this.getActions();
             if (actions.length) {
-                const action = await this.quickInputService.pick(actions, { placeHolder: ( localizeWithPath(_moduleId, 4, "Select url to open")) });
+                const action = await this.quickInputService.pick(actions, { placeHolder: ( localize(8690, "Select url to open")) });
                 if (action) {
                     await this.takeAction(action.extensionDescription, action.url);
                 }
@@ -318,7 +317,7 @@ class IssueReporterItem extends HelpItemBase {
 }
 let HelpPanel = class HelpPanel extends ViewPane {
     static { this.ID = '~remote.helpPanel'; }
-    static { this.TITLE = ( localize2WithPath(_moduleId, 5, "Help and feedback")); }
+    static { this.TITLE = ( localize2(8691, "Help and feedback")); }
     constructor(viewModel, options, keybindingService, contextMenuService, contextKeyService, configurationService, instantiationService, viewDescriptorService, openerService, quickInputService, commandService, remoteExplorerService, environmentService, themeService, telemetryService, hoverService, workspaceContextService, walkthroughsService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.viewModel = viewModel;
@@ -340,7 +339,7 @@ let HelpPanel = class HelpPanel extends ViewPane {
                 getAriaLabel: (item) => {
                     return item.label;
                 },
-                getWidgetAriaLabel: () => ( localizeWithPath(_moduleId, 6, "Remote Help"))
+                getWidgetAriaLabel: () => ( localize(8692, "Remote Help"))
             }
         });
         const model = ( (new HelpModel(
@@ -470,7 +469,7 @@ let RemoteViewPaneContainer = class RemoteViewPaneContainer extends FilterViewPa
         this.remoteExplorerService.targetType = isStringArray(viewDescriptor.remoteAuthority) ? viewDescriptor.remoteAuthority : [viewDescriptor.remoteAuthority];
     }
     getTitle() {
-        const title = ( localizeWithPath(_moduleId, 7, "Remote Explorer"));
+        const title = ( localize(8693, "Remote Explorer"));
         return title;
     }
 };
@@ -489,7 +488,7 @@ RemoteViewPaneContainer = ( (__decorate([
 ], RemoteViewPaneContainer)));
 ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2WithPath(_moduleId, 7, "Remote Explorer")),
+    title: ( localize2(8693, "Remote Explorer")),
     ctorDescriptor: ( (new SyncDescriptor(RemoteViewPaneContainer))),
     hideIfEmpty: true,
     viewOrderDelegate: {
@@ -595,10 +594,10 @@ class ReconnectionTimer {
         }
         const remainingTime = Math.ceil(remainingTimeMs / 1000);
         if (remainingTime === 1) {
-            this._parent.report(( localizeWithPath(_moduleId, 8, "Attempting to reconnect in {0} second...", remainingTime)));
+            this._parent.report(( localize(8694, "Attempting to reconnect in {0} second...", remainingTime)));
         }
         else {
-            this._parent.report(( localizeWithPath(_moduleId, 9, "Attempting to reconnect in {0} seconds...", remainingTime)));
+            this._parent.report(( localize(8695, "Attempting to reconnect in {0} seconds...", remainingTime)));
         }
     }
 }
@@ -655,13 +654,13 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
             let lastIncomingDataTime = 0;
             let reconnectionAttempts = 0;
             const reconnectButton = {
-                label: ( localizeWithPath(_moduleId, 10, "Reconnect Now")),
+                label: ( localize(8696, "Reconnect Now")),
                 callback: () => {
                     reconnectWaitEvent?.skipWait();
                 }
             };
             const reloadButton = {
-                label: ( localizeWithPath(_moduleId, 11, "Reload Window")),
+                label: ( localize(8697, "Reload Window")),
                 callback: () => {
                     telemetryService.publicLog2('remoteReconnectionReload', {
                         remoteName: getRemoteName(environmentService.remoteAuthority),
@@ -691,7 +690,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             if (!visibleProgress) {
                                 visibleProgress = showProgress(null, [reconnectButton, reloadButton]);
                             }
-                            visibleProgress.report(( localizeWithPath(_moduleId, 12, "Connection Lost")));
+                            visibleProgress.report(( localize(8698, "Connection Lost")));
                         }
                         break;
                     case PersistentConnectionEventType.ReconnectionWait:
@@ -713,7 +712,7 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                         });
                         if (visibleProgress || e.millisSinceLastIncomingData > DISCONNECT_PROMPT_TIME) {
                             visibleProgress = showProgress(null, [reloadButton]);
-                            visibleProgress.report(( localizeWithPath(_moduleId, 13, "Disconnected. Attempting to reconnect...")));
+                            visibleProgress.report(( localize(8699, "Disconnected. Attempting to reconnect...")));
                             disposableListener = quickInputService.onShow(() => {
                                 if (visibleProgress && visibleProgress.location === ProgressLocation.Dialog) {
                                     visibleProgress = showProgress(ProgressLocation.Notification, [reloadButton], visibleProgress.lastReport);
@@ -741,8 +740,8 @@ let RemoteAgentConnectionStatusListener = class RemoteAgentConnectionStatusListe
                             this._reloadWindowShown = true;
                             dialogService.confirm({
                                 type: Severity$1.Error,
-                                message: ( localizeWithPath(_moduleId, 14, "Cannot reconnect. Please reload the window.")),
-                                primaryButton: ( localizeWithPath(_moduleId, 15, "&&Reload Window"))
+                                message: ( localize(8700, "Cannot reconnect. Please reload the window.")),
+                                primaryButton: ( localize(8701, "&&Reload Window"))
                             }).then(result => {
                                 if (result.confirmed) {
                                     commandService.executeCommand(ReloadWindowAction.ID);

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 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 { localize } from 'vscode/vscode/vs/nls';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
@@ -16,7 +16,6 @@ import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
-const _moduleId = "vs/workbench/contrib/remote/browser/remoteConnectionHealth";
 const REMOTE_UNSUPPORTED_CONNECTION_CHOICE_KEY = 'remote.unsupportedConnectionChoice';
 const BANNER_REMOTE_UNSUPPORTED_CONNECTION_DISMISSED_KEY = 'workbench.banner.remote.unsupportedConnection.dismissed';
 let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHealthContribution {
@@ -43,19 +42,18 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
         })(ConnectionChoice || (ConnectionChoice = {}))));
         const { result, checkboxChecked } = await this.dialogService.prompt({
             type: Severity$1.Warning,
-            message: ( localizeWithPath(
-                _moduleId,
-                0,
+            message: ( localize(
+                8741,
                 "You are about to connect to an OS version that is unsupported by {0}.",
                 this.productService.nameLong
             )),
             buttons: [
                 {
-                    label: ( localizeWithPath(_moduleId, 1, "&&Allow")),
+                    label: ( localize(8742, "&&Allow")),
                     run: () => ConnectionChoice.Allow
                 },
                 {
-                    label: ( localizeWithPath(_moduleId, 2, "&&Learn More")),
+                    label: ( localize(8743, "&&Learn More")),
                     run: async () => { await this.openerService.open('https://aka.ms/vscode-remote/faq/old-linux'); return ConnectionChoice.LearnMore; }
                 }
             ],
@@ -63,7 +61,7 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
                 run: () => ConnectionChoice.Cancel
             },
             checkbox: {
-                label: ( localizeWithPath(_moduleId, 3, "Do not show again")),
+                label: ( localize(8744, "Do not show again")),
             }
         });
         if (result === ConnectionChoice.LearnMore) {
@@ -89,15 +87,14 @@ let InitialRemoteConnectionHealthContribution = class InitialRemoteConnectionHea
                     if (shouldShowBanner) {
                         const actions = [
                             {
-                                label: ( localizeWithPath(_moduleId, 4, "Learn More")),
+                                label: ( localize(8745, "Learn More")),
                                 href: 'https://aka.ms/vscode-remote/faq/old-linux'
                             }
                         ];
                         this.bannerService.show({
                             id: 'unsupportedGlibcWarning.banner',
-                            message: ( localizeWithPath(
-                                _moduleId,
-                                5,
+                            message: ( localize(
+                                8746,
                                 "You are connected to an OS version that is unsupported by {0}.",
                                 this.productService.nameLong
                             )),

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 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';
@@ -53,7 +53,6 @@ import { workbenchConfigurationNodeBase } from 'vscode/vscode/vs/workbench/commo
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 var RemoteStatusIndicator_1;
-const _moduleId = "vs/workbench/contrib/remote/browser/remoteIndicator";
 let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
     static { RemoteStatusIndicator_1 = this; }
     static { this.ID = 'workbench.contrib.remoteStatusIndicator'; }
@@ -133,14 +132,14 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         this.updateRemoteStatusIndicator();
     }
     registerActions() {
-        const category = ( localize2WithPath(_moduleId, 0, "Remote"));
+        const category = ( localize2(8702, "Remote"));
         const that = this;
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: RemoteStatusIndicator_1.REMOTE_ACTIONS_COMMAND_ID,
                     category,
-                    title: ( localize2WithPath(_moduleId, 1, "Show Remote Menu")),
+                    title: ( localize2(8703, "Show Remote Menu")),
                     f1: true,
                     keybinding: {
                         weight: KeybindingWeight.WorkbenchContrib,
@@ -156,7 +155,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     super({
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
                         category,
-                        title: ( localize2WithPath(_moduleId, 2, "Close Remote Connection")),
+                        title: ( localize2(8704, "Close Remote Connection")),
                         f1: true,
                         precondition: ( (ContextKeyExpr.or(RemoteNameContext, VirtualWorkspaceContext)))
                     });
@@ -168,7 +167,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     group: '6_close',
                     command: {
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
-                        title: ( localizeWithPath(_moduleId, 3, "Close Re&&mote Connection"))
+                        title: ( localize(8705, "Close Re&&mote Connection"))
                     },
                     order: 3.5
                 });
@@ -180,7 +179,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     super({
                         id: RemoteStatusIndicator_1.INSTALL_REMOTE_EXTENSIONS_ID,
                         category,
-                        title: ( localize2WithPath(_moduleId, 4, "Install Remote Development Extensions")),
+                        title: ( localize2(8706, "Install Remote Development Extensions")),
                         f1: true
                     });
                     this.run = (accessor, input) => {
@@ -393,20 +392,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(( localizeWithPath(_moduleId, 5, "Opening Remote...")), ( localizeWithPath(_moduleId, 5, "Opening Remote...")), undefined, true );
+                    this.renderRemoteStatusIndicator(( localize(8707, "Opening Remote...")), ( localize(8707, "Opening Remote...")), undefined, true );
                     break;
                 case 'reconnecting':
-                    this.renderRemoteStatusIndicator(`${( localizeWithPath(
-                        _moduleId,
-                        6,
+                    this.renderRemoteStatusIndicator(`${( localize(
+                        8708,
                         "Reconnecting to {0}...",
                         truncate(hostLabel, RemoteStatusIndicator_1.REMOTE_STATUS_LABEL_MAX_LENGTH)
                     ))}`, undefined, undefined, true );
                     break;
                 case 'disconnected':
-                    this.renderRemoteStatusIndicator(`$(alert) ${( localizeWithPath(
-                        _moduleId,
-                        7,
+                    this.renderRemoteStatusIndicator(`$(alert) ${( localize(
+                        8709,
                         "Disconnected from {0}",
                         truncate(hostLabel, RemoteStatusIndicator_1.REMOTE_STATUS_LABEL_MAX_LENGTH)
                     ))}`);
@@ -418,7 +415,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                         tooltip.appendMarkdown(hostNameTooltip);
                     }
                     else {
-                        tooltip.appendText(( localizeWithPath(_moduleId, 8, "Editing on {0}", hostLabel)));
+                        tooltip.appendText(( localize(8710, "Editing on {0}", hostLabel)));
                     }
                     this.renderRemoteStatusIndicator(`$(remote) ${truncate(hostLabel, RemoteStatusIndicator_1.REMOTE_STATUS_LABEL_MAX_LENGTH)}`, tooltip);
                 }
@@ -434,13 +431,12 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     tooltip.appendMarkdown(hostNameTooltip);
                 }
                 else {
-                    tooltip.appendText(( localizeWithPath(_moduleId, 9, "Editing on {0}", workspaceLabel)));
+                    tooltip.appendText(( localize(8711, "Editing on {0}", workspaceLabel)));
                 }
                 if (!isWeb || this.remoteAuthority) {
                     tooltip.appendMarkdown('\n\n');
-                    tooltip.appendMarkdown(( localizeWithPath(
-                        _moduleId,
-                        10,
+                    tooltip.appendMarkdown(( localize(
+                        8712,
                         "Some [features are not available]({0}) for resources located on a virtual file system.",
                         `command:${LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID}`
                     )));
@@ -449,13 +445,13 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 return;
             }
         }
-        this.renderRemoteStatusIndicator(`$(remote)`, ( localizeWithPath(_moduleId, 11, "Open a Remote Window")));
+        this.renderRemoteStatusIndicator(`$(remote)`, ( localize(8713, "Open a Remote Window")));
         return;
     }
     renderRemoteStatusIndicator(initialText, initialTooltip, command, showProgress) {
         const { text, tooltip, ariaLabel } = this.withNetworkStatus(initialText, initialTooltip, showProgress);
         const properties = {
-            name: ( localizeWithPath(_moduleId, 12, "Remote Host")),
+            name: ( localize(8714, "Remote Host")),
             kind: this.networkState === 'offline' ? 'offline' : 'remote',
             ariaLabel,
             text,
@@ -482,9 +478,8 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
         }
         switch (this.networkState) {
             case 'offline': {
-                const offlineMessage = ( localizeWithPath(
-                    _moduleId,
-                    13,
+                const offlineMessage = ( localize(
+                    8715,
                     "Network appears to be offline, certain features might be unavailable."
                 ));
                 text = textWithAlert();
@@ -494,9 +489,8 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             }
             case 'high-latency':
                 text = textWithAlert();
-                tooltip = this.appendTooltipLine(tooltip, ( localizeWithPath(
-                    _moduleId,
-                    14,
+                tooltip = this.appendTooltipLine(tooltip, ( localize(
+                    8716,
                     "Network appears to have high latency ({0}ms last, {1}ms average), certain features may be slow to respond.",
                     remoteConnectionLatencyMeasurer.latency?.current?.toFixed(2),
                     remoteConnectionLatencyMeasurer.latency?.average?.toFixed(2)
@@ -612,13 +606,13 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                         const label = metadata.startConnectLabel;
                         const buttons = [{
                                 iconClass: ThemeIcon.asClassName(infoIcon),
-                                tooltip: ( localizeWithPath(_moduleId, 15, "Learn More"))
+                                tooltip: ( localize(8717, "Learn More"))
                             }];
                         notInstalledItems.push({ type: 'item', id: metadata.id, label: label, buttons: buttons });
                     }
                 }
                 items.push({
-                    type: 'separator', label: ( localizeWithPath(_moduleId, 16, 'Install'))
+                    type: 'separator', label: ( localize(8718, 'Install'))
                 });
                 items.push(...notInstalledItems);
             }
@@ -631,13 +625,13 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     items.push({
                         type: 'item',
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
-                        label: ( localizeWithPath(_moduleId, 17, 'Close Remote Connection'))
+                        label: ( localize(8719, 'Close Remote Connection'))
                     });
                     if (this.connectionState === 'disconnected') {
                         items.push({
                             type: 'item',
                             id: ReloadWindowAction.ID,
-                            label: ( localizeWithPath(_moduleId, 18, 'Reload Window'))
+                            label: ( localize(8720, 'Reload Window'))
                         });
                     }
                 }
@@ -645,7 +639,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                     items.push({
                         type: 'item',
                         id: RemoteStatusIndicator_1.CLOSE_REMOTE_COMMAND_ID,
-                        label: ( localizeWithPath(_moduleId, 19, 'Close Remote Workspace'))
+                        label: ( localize(8721, 'Close Remote Workspace'))
                     });
                 }
             }
@@ -655,7 +649,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
             return items;
         };
         const quickPick = this.quickInputService.createQuickPick();
-        quickPick.placeholder = ( localizeWithPath(_moduleId, 20, "Select an option to open a Remote Window"));
+        quickPick.placeholder = ( localize(8722, "Select an option to open a Remote Window"));
         quickPick.items = computeItems();
         quickPick.sortByLabel = false;
         quickPick.canSelectMany = false;
@@ -667,7 +661,7 @@ let RemoteStatusIndicator = class RemoteStatusIndicator extends Disposable {
                 if (remoteExtension) {
                     quickPick.items = [];
                     quickPick.busy = true;
-                    quickPick.placeholder = ( localizeWithPath(_moduleId, 21, 'Installing extension... '));
+                    quickPick.placeholder = ( localize(8723, 'Installing extension... '));
                     await this.installExtension(remoteExtension.id);
                     quickPick.hide();
                     await this.runRemoteStartCommand(remoteExtension.id, remoteExtension.startCommand);
@@ -729,9 +723,8 @@ RemoteStatusIndicator = RemoteStatusIndicator_1 = ( (__decorate([
     properties: {
         'workbench.remoteIndicator.showExtensionRecommendations': {
             type: 'boolean',
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                22,
+            markdownDescription: ( localize(
+                8724,
                 "When enabled, remote extensions recommendations will be shown in the Remote Indicator menu."
             )),
             default: true

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
@@ -12,7 +12,6 @@ import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/conte
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 
 var RemoteStartEntry_1;
-const _moduleId = "vs/workbench/contrib/remote/browser/remoteStartEntry";
 const showStartEntryInWeb = ( (new RawContextKey('showRemoteStartEntryInWeb', false)));
 let RemoteStartEntry = class RemoteStartEntry extends Disposable {
     static { RemoteStartEntry_1 = this; }
@@ -33,14 +32,14 @@ let RemoteStartEntry = class RemoteStartEntry extends Disposable {
         this.registerListeners();
     }
     registerActions() {
-        const category = ( localize2WithPath(_moduleId, 0, "Remote"));
+        const category = ( localize2(8747, "Remote"));
         const startEntry = this;
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: RemoteStartEntry_1.REMOTE_WEB_START_ENTRY_ACTIONS_COMMAND_ID,
                     category,
-                    title: ( localize2WithPath(_moduleId, 1, "Show Remote Start Entry for web")),
+                    title: ( localize2(8748, "Show Remote Start Entry for web")),
                     f1: false
                 });
             }

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 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';
@@ -11,7 +11,6 @@ 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';
 
-const _moduleId = "vs/workbench/contrib/remote/browser/tunnelFactory";
 let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposable {
     static { this.ID = 'workbench.contrib.tunnelFactory'; }
     constructor(tunnelService, environmentService, openerService, remoteExplorerService, logService, contextKeyService) {
@@ -26,12 +25,12 @@ let TunnelFactoryContribution = class TunnelFactoryContribution extends Disposab
                 privacyOptions = [
                     {
                         id: 'private',
-                        label: ( localizeWithPath(_moduleId, 0, "Private")),
+                        label: ( localize(8684, "Private")),
                         themeIcon: 'lock'
                     },
                     {
                         id: 'public',
-                        label: ( localizeWithPath(_moduleId, 1, "Public")),
+                        label: ( localize(8685, "Public")),
                         themeIcon: 'eye'
                     }
                 ];

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

@@ -7,7 +7,7 @@ import { OS, OperatingSystem, isWeb } from 'vscode/vscode/vs/base/common/platfor
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 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 { localize, localize2 } 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.service';
@@ -22,7 +22,6 @@ import { IDownloadService } from 'vscode/vscode/vs/platform/download/common/down
 import { DownloadServiceChannel } from '../../../../platform/download/common/downloadIpc.js';
 import { RemoteLoggerChannelClient } from '../../../../platform/log/common/logIpc.js';
 
-const _moduleId = "vs/workbench/contrib/remote/common/remote.contribution";
 let LabelContribution = class LabelContribution {
     static { this.ID = 'workbench.contrib.remoteLabel'; }
     constructor(labelService, remoteAgentService) {
@@ -101,9 +100,9 @@ let RemoteInvalidWorkspaceDetector = class RemoteInvalidWorkspaceDetector extend
         }
         const res = await this.dialogService.confirm({
             type: 'warning',
-            message: ( localizeWithPath(_moduleId, 0, "Workspace does not exist")),
-            detail: ( localizeWithPath(_moduleId, 1, "Please select another workspace to open.")),
-            primaryButton: ( localizeWithPath(_moduleId, 2, "&&Open Workspace..."))
+            message: ( localize(3569, "Workspace does not exist")),
+            detail: ( localize(3570, "Please select another workspace to open.")),
+            primaryButton: ( localize(3571, "&&Open Workspace..."))
         });
         if (res.confirmed) {
             if (workspace.configuration) {
@@ -130,7 +129,7 @@ registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidW
         constructor() {
             super({
                 id: 'workbench.action.triggerReconnect',
-                title: ( localize2WithPath(_moduleId, 3, 'Connection: Trigger Reconnect')),
+                title: ( localize2(3572, 'Connection: Trigger Reconnect')),
                 category: Categories.Developer,
                 f1: true,
             });
@@ -143,7 +142,7 @@ registerWorkbenchContribution2(RemoteInvalidWorkspaceDetector.ID, RemoteInvalidW
         constructor() {
             super({
                 id: 'workbench.action.pauseSocketWriting',
-                title: ( localize2WithPath(_moduleId, 4, 'Connection: Pause socket writing')),
+                title: ( localize2(3573, 'Connection: Pause socket writing')),
                 category: Categories.Developer,
                 f1: true,
             });
@@ -162,14 +161,12 @@ const extensionKindSchema = {
         'workspace'
     ],
     enumDescriptions: [
-        ( localizeWithPath(
-            _moduleId,
-            5,
+        ( localize(
+            3574,
             "UI extension kind. In a remote window, such extensions are enabled only when available on the local machine."
         )),
-        ( localizeWithPath(
-            _moduleId,
-            6,
+        ( localize(
+            3575,
             "Workspace extension kind. In a remote window, such extensions are enabled only when available on the remote."
         ))
     ],
@@ -177,14 +174,13 @@ const extensionKindSchema = {
 ( (Registry.as(Extensions$1.Configuration)))
     .registerConfiguration({
     id: 'remote',
-    title: ( localizeWithPath(_moduleId, 7, "Remote")),
+    title: ( localize(3576, "Remote")),
     type: 'object',
     properties: {
         'remote.extensionKind': {
             type: 'object',
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                8,
+            markdownDescription: ( localize(
+                3577,
                 "Override the kind of an extension. `ui` extensions are installed and run on the local machine while `workspace` extensions are run on the remote. By overriding an extension's default kind using this setting, you specify if that extension should be installed and enabled locally or remotely."
             )),
             patternProperties: {
@@ -199,41 +195,36 @@ const extensionKindSchema = {
         },
         'remote.restoreForwardedPorts': {
             type: 'boolean',
-            markdownDescription: ( localizeWithPath(_moduleId, 9, "Restores the ports you forwarded in a workspace.")),
+            markdownDescription: ( localize(3578, "Restores the ports you forwarded in a workspace.")),
             default: true
         },
         'remote.autoForwardPorts': {
             type: 'boolean',
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                10,
+            markdownDescription: ( localize(
+                3579,
                 "When enabled, new running processes are detected and ports that they listen on are automatically forwarded. Disabling this setting will not prevent all ports from being forwarded. Even when disabled, extensions will still be able to cause ports to be forwarded, and opening some URLs will still cause ports to forwarded."
             )),
             default: true
         },
         'remote.autoForwardPortsSource': {
             type: 'string',
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                11,
+            markdownDescription: ( localize(
+                3580,
                 "Sets the source from which ports are automatically forwarded when {0} is true. On Windows and macOS remotes, the `process` and `hybrid` options have no effect and `output` will be used.",
                 '`#remote.autoForwardPorts#`'
             )),
             enum: ['process', 'output', 'hybrid'],
             enumDescriptions: [
-                ( localizeWithPath(
-                    _moduleId,
-                    12,
+                ( localize(
+                    3581,
                     "Ports will be automatically forwarded when discovered by watching for processes that are started and include a port."
                 )),
-                ( localizeWithPath(
-                    _moduleId,
-                    13,
+                ( localize(
+                    3582,
                     "Ports will be automatically forwarded when discovered by reading terminal and debug output. Not all processes that use ports will print to the integrated terminal or debug console, so some ports will be missed. Ports forwarded based on output will not be \"un-forwarded\" until reload or until the port is closed by the user in the Ports view."
                 )),
-                ( localizeWithPath(
-                    _moduleId,
-                    14,
+                ( localize(
+                    3583,
                     "Ports will be automatically forwarded when discovered by reading terminal and debug output. Not all processes that use ports will print to the integrated terminal or debug console, so some ports will be missed. Ports will be \"un-forwarded\" by watching for processes that listen on that port to be terminated."
                 ))
             ],
@@ -242,17 +233,15 @@ const extensionKindSchema = {
         'remote.autoForwardPortsFallback': {
             type: 'number',
             default: 20,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                15,
+            markdownDescription: ( localize(
+                3584,
                 "The number of auto forwarded ports that will trigger the switch from `process` to `hybrid` when automatically forwarding ports and `remote.autoForwardPortsSource` is set to `process` by default. Set to `0` to disable the fallback. When `remote.autoForwardPortsFallback` hasn't been configured, but `remote.autoForwardPortsSource` has, `remote.autoForwardPortsFallback` will be treated as though it's set to `0`."
             ))
         },
         'remote.forwardOnOpen': {
             type: 'boolean',
-            description: ( localizeWithPath(
-                _moduleId,
-                16,
+            description: ( localize(
+                3585,
                 "Controls whether local URLs with a port will be forwarded when opened from the terminal and the debug console."
             )),
             default: true
@@ -262,9 +251,8 @@ const extensionKindSchema = {
             patternProperties: {
                 '(^\\d+(-\\d+)?$)|(.+)': {
                     type: 'object',
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        17,
+                    description: ( localize(
+                        3586,
                         "A port, range of ports (ex. \"40000-55000\"), host and port (ex. \"db:1234\"), or regular expression (ex. \".+\\\\/server.js\").  For a port number or range, the attributes will apply to that port number or range of port numbers. Attributes which use a regular expression will apply to ports whose associated process command line matches the expression."
                     )),
                     properties: {
@@ -272,59 +260,48 @@ const extensionKindSchema = {
                             type: 'string',
                             enum: ['notify', 'openBrowser', 'openBrowserOnce', 'openPreview', 'silent', 'ignore'],
                             enumDescriptions: [
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    18,
-                                    "Shows a notification when a port is automatically forwarded."
-                                )),
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    19,
+                                ( localize(3587, "Shows a notification when a port is automatically forwarded.")),
+                                ( localize(
+                                    3588,
                                     "Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."
                                 )),
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    20,
+                                ( localize(
+                                    3589,
                                     "Opens the browser when the port is automatically forwarded, but only the first time the port is forward during a session. Depending on your settings, this could open an embedded browser."
                                 )),
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    21,
+                                ( localize(
+                                    3590,
                                     "Opens a preview in the same window when the port is automatically forwarded."
                                 )),
-                                ( localizeWithPath(
-                                    _moduleId,
-                                    22,
+                                ( localize(
+                                    3591,
                                     "Shows no notification and takes no action when this port is automatically forwarded."
                                 )),
-                                ( localizeWithPath(_moduleId, 23, "This port will not be automatically forwarded."))
+                                ( localize(3592, "This port will not be automatically forwarded."))
                             ],
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                24,
+                            description: ( localize(
+                                3593,
                                 "Defines the action that occurs when the port is discovered for automatic forwarding"
                             )),
                             default: 'notify'
                         },
                         'elevateIfNeeded': {
                             type: 'boolean',
-                            description: ( localizeWithPath(
-                                _moduleId,
-                                25,
+                            description: ( localize(
+                                3594,
                                 "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port."
                             )),
                             default: false
                         },
                         'label': {
                             type: 'string',
-                            description: ( localizeWithPath(_moduleId, 26, "Label that will be shown in the UI for this port.")),
-                            default: ( localizeWithPath(_moduleId, 27, "Application"))
+                            description: ( localize(3595, "Label that will be shown in the UI for this port.")),
+                            default: ( localize(3596, "Application"))
                         },
                         'requireLocalPort': {
                             type: 'boolean',
-                            markdownDescription: ( localizeWithPath(
-                                _moduleId,
-                                28,
+                            markdownDescription: ( localize(
+                                3597,
                                 "When true, a modal dialog will show if the chosen local port isn't used for forwarding."
                             )),
                             default: false
@@ -332,24 +309,22 @@ const extensionKindSchema = {
                         'protocol': {
                             type: 'string',
                             enum: ['http', 'https'],
-                            description: ( localizeWithPath(_moduleId, 29, "The protocol to use when forwarding this port."))
+                            description: ( localize(3598, "The protocol to use when forwarding this port."))
                         }
                     },
                     default: {
-                        'label': ( localizeWithPath(_moduleId, 27, "Application")),
+                        'label': ( localize(3598, "Application")),
                         'onAutoForward': 'notify'
                     }
                 }
             },
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                30,
+            markdownDescription: ( localize(
+                3599,
                 "Set properties that are applied when a specific port number is forwarded. For example:\n\n```\n\"3000\": {\n  \"label\": \"Application\"\n},\n\"40000-55000\": {\n  \"onAutoForward\": \"ignore\"\n},\n\".+\\\\/server.js\": {\n \"onAutoForward\": \"openPreview\"\n}\n```"
             )),
             defaultSnippets: [{ body: { '${1:3000}': { label: '${2:Application}', onAutoForward: 'openPreview' } } }],
-            errorMessage: ( localizeWithPath(
-                _moduleId,
-                31,
+            errorMessage: ( localize(
+                3600,
                 "Must be a port number, range of port numbers, or regular expression."
             )),
             additionalProperties: false,
@@ -369,54 +344,44 @@ const extensionKindSchema = {
                     type: 'string',
                     enum: ['notify', 'openBrowser', 'openPreview', 'silent', 'ignore'],
                     enumDescriptions: [
-                        ( localizeWithPath(
-                            _moduleId,
-                            18,
-                            "Shows a notification when a port is automatically forwarded."
-                        )),
-                        ( localizeWithPath(
-                            _moduleId,
-                            19,
+                        ( localize(3600, "Shows a notification when a port is automatically forwarded.")),
+                        ( localize(
+                            3600,
                             "Opens the browser when the port is automatically forwarded. Depending on your settings, this could open an embedded browser."
                         )),
-                        ( localizeWithPath(
-                            _moduleId,
-                            21,
+                        ( localize(
+                            3600,
                             "Opens a preview in the same window when the port is automatically forwarded."
                         )),
-                        ( localizeWithPath(
-                            _moduleId,
-                            22,
+                        ( localize(
+                            3600,
                             "Shows no notification and takes no action when this port is automatically forwarded."
                         )),
-                        ( localizeWithPath(_moduleId, 23, "This port will not be automatically forwarded."))
+                        ( localize(3600, "This port will not be automatically forwarded."))
                     ],
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        24,
+                    description: ( localize(
+                        3600,
                         "Defines the action that occurs when the port is discovered for automatic forwarding"
                     )),
                     default: 'notify'
                 },
                 'elevateIfNeeded': {
                     type: 'boolean',
-                    description: ( localizeWithPath(
-                        _moduleId,
-                        25,
+                    description: ( localize(
+                        3600,
                         "Automatically prompt for elevation (if needed) when this port is forwarded. Elevate is required if the local port is a privileged port."
                     )),
                     default: false
                 },
                 'label': {
                     type: 'string',
-                    description: ( localizeWithPath(_moduleId, 26, "Label that will be shown in the UI for this port.")),
-                    default: ( localizeWithPath(_moduleId, 27, "Application"))
+                    description: ( localize(3600, "Label that will be shown in the UI for this port.")),
+                    default: ( localize(3600, "Application"))
                 },
                 'requireLocalPort': {
                     type: 'boolean',
-                    markdownDescription: ( localizeWithPath(
-                        _moduleId,
-                        28,
+                    markdownDescription: ( localize(
+                        3600,
                         "When true, a modal dialog will show if the chosen local port isn't used for forwarding."
                     )),
                     default: false
@@ -424,13 +389,12 @@ const extensionKindSchema = {
                 'protocol': {
                     type: 'string',
                     enum: ['http', 'https'],
-                    description: ( localizeWithPath(_moduleId, 29, "The protocol to use when forwarding this port."))
+                    description: ( localize(3600, "The protocol to use when forwarding this port."))
                 }
             },
             defaultSnippets: [{ body: { onAutoForward: 'ignore' } }],
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                32,
+            markdownDescription: ( localize(
+                3601,
                 "Set default properties that are applied to all ports that don't get properties from the setting {0}. For example:\n\n```\n{\n  \"onAutoForward\": \"ignore\"\n}\n```",
                 '`#remote.portsAttributes#`'
             )),
@@ -440,9 +404,8 @@ const extensionKindSchema = {
             type: 'string',
             enum: ['localhost', 'allInterfaces'],
             default: 'localhost',
-            description: ( localizeWithPath(
-                _moduleId,
-                33,
+            description: ( localize(
+                3602,
                 "Specifies the local host name that will be used for port forwarding."
             ))
         }

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 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';
@@ -16,7 +16,6 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 import { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
-const _moduleId = "vs/workbench/services/remote/browser/remoteAgentService";
 let RemoteAgentService = class RemoteAgentService extends AbstractRemoteAgentService {
     constructor(remoteSocketFactoryService, userDataProfileService, environmentService, productService, remoteAuthorityResolverService, signService, logService) {
         super(remoteSocketFactoryService, userDataProfileService, environmentService, productService, remoteAuthorityResolverService, signService, logService);
@@ -46,20 +45,15 @@ let RemoteConnectionFailureNotificationContribution = class RemoteConnectionFail
     async _presentConnectionError(err) {
         await this._dialogService.prompt({
             type: Severity$1.Error,
-            message: ( localizeWithPath(
-                _moduleId,
-                0,
-                "An unexpected error occurred that requires a reload of this page."
-            )),
-            detail: ( localizeWithPath(
-                _moduleId,
-                1,
+            message: ( localize(3554, "An unexpected error occurred that requires a reload of this page.")),
+            detail: ( localize(
+                3555,
                 "The workbench failed to connect to the server (Error: {0})",
                 err ? err.message : ''
             )),
             buttons: [
                 {
-                    label: ( localizeWithPath(_moduleId, 2, "&&Reload")),
+                    label: ( localize(3556, "&&Reload")),
                     run: () => this._hostService.reload()
                 }
             ]

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 { Emitter } from 'vscode/vscode/vs/base/common/event';
 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.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { connectRemoteAgentManagement } from 'vscode/vscode/vs/platform/remote/common/remoteAgentConnection';
 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 { IRemoteSocketFactoryService } from 'vscode/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';
 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 { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { RemoteExtensionEnvironmentChannelClient } from './remoteAgentEnvironmentChannel.js';
 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) {
@@ -73,6 +73,12 @@ let AbstractRemoteAgentService = class AbstractRemoteAgentService extends Dispos
             return Date.now() - start;
         }, undefined);
     }
+    async endConnection() {
+        if (this._connection) {
+            await this._connection.end();
+            this._connection.dispose();
+        }
+    }
     _withChannel(callback, fallback) {
         const connection = this.getConnection();
         if (!connection) {
@@ -110,6 +116,7 @@ class RemoteAgentConnection extends Disposable {
         this.onReconnecting = this._onReconnecting.event;
         this._onDidStateChange = this._register(( new Emitter()));
         this.onDidStateChange = this._onDidStateChange.event;
+        this.end = () => Promise.resolve();
         this.remoteAuthority = remoteAuthority;
         this._connection = null;
     }
@@ -171,6 +178,10 @@ class RemoteAgentConnection extends Disposable {
         connection.protocol.onDidDispose(() => {
             connection.dispose();
         });
+        this.end = () => {
+            connection.protocol.sendDisconnect();
+            return connection.protocol.drain();
+        };
         this._register(connection.onDidStateChange(e => this._onDidStateChange.fire(e)));
         return connection.client;
     }