@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0

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

@@ -23,11 +23,11 @@ import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 const MISMATCH_LOCAL_PORT_COOLDOWN = 10 * 1000;
 const TUNNELS_TO_RESTORE = 'remote.tunnels.toRestore';
 const ACTIVATION_EVENT = 'onTunnel';
-const forwardedPortsViewEnabled = ( (new RawContextKey(
+const forwardedPortsViewEnabled = ( new RawContextKey(
     'forwardedPortsViewEnabled',
     false,
-     (nls.localize('tunnel.forwardedPortsViewEnabled', "Whether the Ports view is enabled."))
-)));
+    nls.localizeWithPath('vs/workbench/services/remote/common/tunnelModel', 'tunnel.forwardedPortsViewEnabled', "Whether the Ports view is enabled.")
+));
 function parseAddress(address) {
     const matches = address.match(/^([a-zA-Z0-9_-]+(?:\.[a-zA-Z0-9_-]+)*:)?([0-9]+)$/);
     if (!matches) {
@@ -36,24 +36,24 @@ function parseAddress(address) {
     return { host: matches[1]?.substring(0, matches[1].length - 1) || 'localhost', port: Number(matches[2]) };
 }
 var TunnelCloseReason;
-( ((function(TunnelCloseReason) {
+( (function(TunnelCloseReason) {
     TunnelCloseReason["Other"] = "Other";
     TunnelCloseReason["User"] = "User";
     TunnelCloseReason["AutoForwardEnd"] = "AutoForwardEnd";
-})(TunnelCloseReason || (TunnelCloseReason = {}))));
+})(TunnelCloseReason || (TunnelCloseReason = {})));
 var TunnelSource;
-( ((function(TunnelSource) {
+( (function(TunnelSource) {
     TunnelSource[TunnelSource["User"] = 0] = "User";
     TunnelSource[TunnelSource["Auto"] = 1] = "Auto";
     TunnelSource[TunnelSource["Extension"] = 2] = "Extension";
-})(TunnelSource || (TunnelSource = {}))));
+})(TunnelSource || (TunnelSource = {})));
 const UserTunnelSource = {
     source: TunnelSource.User,
-    description: ( (nls.localize('tunnel.source.user', "User Forwarded")))
+    description: nls.localizeWithPath('vs/workbench/services/remote/common/tunnelModel', 'tunnel.source.user', "User Forwarded")
 };
 const AutoTunnelSource = {
     source: TunnelSource.Auto,
-    description: ( (nls.localize('tunnel.source.auto', "Auto Forwarded")))
+    description: nls.localizeWithPath('vs/workbench/services/remote/common/tunnelModel', 'tunnel.source.auto', "Auto Forwarded")
 };
 function mapHasAddress(map, host, port) {
     const initialAddress = map.get(makeAddress(host, port));
@@ -63,7 +63,7 @@ function mapHasAddress(map, host, port) {
     if (isLocalhost(host)) {
         for (const testHost of LOCALHOST_ADDRESSES) {
             const testAddress = makeAddress(testHost, port);
-            if (( (map.has(testAddress)))) {
+            if (( map.has(testAddress))) {
                 return map.get(testAddress);
             }
         }
@@ -71,7 +71,7 @@ function mapHasAddress(map, host, port) {
     else if (isAllInterfaces(host)) {
         for (const testHost of ALL_INTERFACES_ADDRESSES) {
             const testAddress = makeAddress(testHost, port);
-            if (( (map.has(testAddress)))) {
+            if (( map.has(testAddress))) {
                 return map.get(testAddress);
             }
         }
@@ -93,14 +93,14 @@ function makeAddress(host, port) {
     return host + ':' + port;
 }
 var OnPortForward;
-( ((function(OnPortForward) {
+( (function(OnPortForward) {
     OnPortForward["Notify"] = "notify";
     OnPortForward["OpenBrowser"] = "openBrowser";
     OnPortForward["OpenBrowserOnce"] = "openBrowserOnce";
     OnPortForward["OpenPreview"] = "openPreview";
     OnPortForward["Silent"] = "silent";
     OnPortForward["Ignore"] = "ignore";
-})(OnPortForward || (OnPortForward = {}))));
+})(OnPortForward || (OnPortForward = {})));
 function isCandidatePort(candidate) {
     return candidate && 'host' in candidate && typeof candidate.host === 'string'
         && 'port' in candidate && typeof candidate.port === 'number'
@@ -116,7 +116,7 @@ class PortsAttributes extends Disposable {
         super();
         this.configurationService = configurationService;
         this.portsAttributes = [];
-        this._onDidChangeAttributes = ( (new Emitter()));
+        this._onDidChangeAttributes = ( new Emitter());
         this.onDidChangeAttributes = this._onDidChangeAttributes.event;
         this._register(configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(PortsAttributes.SETTING) || e.affectsConfiguration(PortsAttributes.DEFAULTS)) {
@@ -317,38 +317,38 @@ let TunnelModel = class TunnelModel extends Disposable {
         this.dialogService = dialogService;
         this.extensionService = extensionService;
         this.contextKeyService = contextKeyService;
-        this.inProgress = ( (new Map()));
-        this._onForwardPort = ( (new Emitter()));
+        this.inProgress = ( new Map());
+        this._onForwardPort = ( new Emitter());
         this.onForwardPort = this._onForwardPort.event;
-        this._onClosePort = ( (new Emitter()));
+        this._onClosePort = ( new Emitter());
         this.onClosePort = this._onClosePort.event;
-        this._onPortName = ( (new Emitter()));
+        this._onPortName = ( new Emitter());
         this.onPortName = this._onPortName.event;
-        this._onCandidatesChanged = ( (new Emitter()));
+        this._onCandidatesChanged = ( new Emitter());
         this.onCandidatesChanged = this._onCandidatesChanged.event;
-        this._onEnvironmentTunnelsSet = ( (new Emitter()));
+        this._onEnvironmentTunnelsSet = ( new Emitter());
         this.onEnvironmentTunnelsSet = this._onEnvironmentTunnelsSet.event;
         this._environmentTunnelsSet = false;
         this.restoreListener = undefined;
         this.restoreComplete = false;
-        this.onRestoreComplete = ( (new Emitter()));
-        this.unrestoredExtensionTunnels = ( (new Map()));
-        this.sessionCachedProperties = ( (new Map()));
+        this.onRestoreComplete = ( new Emitter());
+        this.unrestoredExtensionTunnels = ( new Map());
+        this.sessionCachedProperties = ( new Map());
         this.portAttributesProviders = [];
-        this.mismatchCooldown = ( (new Date()));
-        this.configPortsAttributes = ( (new PortsAttributes(configurationService)));
+        this.mismatchCooldown = ( new Date());
+        this.configPortsAttributes = ( new PortsAttributes(configurationService));
         this.tunnelRestoreValue = this.getTunnelRestoreValue();
         this._register(this.configPortsAttributes.onDidChangeAttributes(this.updateAttributes, this));
-        this.forwarded = ( (new Map()));
-        this.remoteTunnels = ( (new Map()));
+        this.forwarded = ( new Map());
+        this.remoteTunnels = ( new Map());
         this.tunnelService.tunnels.then(async (tunnels) => {
-            const attributes = await this.getAttributes(( (tunnels.map(tunnel => {
+            const attributes = await this.getAttributes(( tunnels.map(tunnel => {
                 return { port: tunnel.tunnelRemotePort, host: tunnel.tunnelRemoteHost };
-            }))));
+            })));
             for (const tunnel of tunnels) {
                 if (tunnel.localAddress) {
                     const key = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
-                    const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( (new Map())), tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
+                    const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( new Map()), tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
                     this.forwarded.set(key, {
                         remotePort: tunnel.tunnelRemotePort,
                         remoteHost: tunnel.tunnelRemoteHost,
@@ -366,14 +366,14 @@ let TunnelModel = class TunnelModel extends Disposable {
                 }
             }
         });
-        this.detected = ( (new Map()));
+        this.detected = ( new Map());
         this._register(this.tunnelService.onTunnelOpened(async (tunnel) => {
             const key = makeAddress(tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
             if (!mapHasAddressLocalhostOrAllInterfaces(this.forwarded, tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort)
                 && !mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort)
                 && !mapHasAddressLocalhostOrAllInterfaces(this.inProgress, tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort)
                 && tunnel.localAddress) {
-                const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( (new Map())), tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
+                const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( new Map()), tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
                 const attributes = (await this.getAttributes([{ port: tunnel.tunnelRemotePort, host: tunnel.tunnelRemoteHost }]))?.get(tunnel.tunnelRemotePort);
                 this.forwarded.set(key, {
                     remoteHost: tunnel.tunnelRemoteHost,
@@ -418,7 +418,7 @@ let TunnelModel = class TunnelModel extends Disposable {
     }
     async onTunnelClosed(address, reason) {
         const key = makeAddress(address.host, address.port);
-        if (( (this.forwarded.has(key)))) {
+        if (( this.forwarded.has(key))) {
             this.forwarded.delete(key);
             await this.storeForwarded();
             this._onClosePort.fire(address);
@@ -426,14 +426,10 @@ let TunnelModel = class TunnelModel extends Disposable {
     }
     makeLocalUri(localAddress, attributes) {
         if (localAddress.startsWith('http')) {
-            return (
-                 (URI.parse(localAddress))
-            );
+            return ( URI.parse(localAddress));
         }
         const protocol = attributes?.protocol ?? 'http';
-        return (
-             (URI.parse(`${protocol}://${localAddress}`))
-        );
+        return ( URI.parse(`${protocol}://${localAddress}`));
     }
     async getStorageKey() {
         const workspace = this.workspaceContextService.getWorkspace();
@@ -462,7 +458,7 @@ let TunnelModel = class TunnelModel extends Disposable {
             const tunnelRestoreValue = await this.tunnelRestoreValue;
             if (tunnelRestoreValue && (tunnelRestoreValue !== this.knownPortsRestoreValue)) {
                 const tunnels = JSON.parse(tunnelRestoreValue) ?? [];
-                this.logService.trace(`ForwardedPorts: (TunnelModel) restoring ports ${( ( tunnels.map(tunnel => tunnel.remotePort))).join(', ')}`);
+                this.logService.trace(`ForwardedPorts: (TunnelModel) restoring ports ${( tunnels.map(tunnel => tunnel.remotePort)).join(', ')}`);
                 for (const tunnel of tunnels) {
                     const alreadyForwarded = mapHasAddressLocalhostOrAllInterfaces(this.detected, tunnel.remoteHost, tunnel.remotePort);
                     if ((tunnel.source.source !== TunnelSource.Extension && !alreadyForwarded) || (tunnel.source.source === TunnelSource.Extension && alreadyForwarded)) {
@@ -485,7 +481,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         this.onRestoreComplete.fire();
         if (!this.restoreListener) {
             const key = await this.getStorageKey();
-            this.restoreListener = this._register(( (new DisposableStore())));
+            this.restoreListener = this._register(( new DisposableStore()));
             this.restoreListener.add(this.storageService.onDidChangeValue(0 , undefined, this.restoreListener)(async (e) => {
                 if (e.key === key) {
                     this.tunnelRestoreValue = Promise.resolve(this.storageService.get(key, 0 ));
@@ -496,7 +492,7 @@ let TunnelModel = class TunnelModel extends Disposable {
     }
     async storeForwarded() {
         if (this.configurationService.getValue('remote.restoreForwardedPorts')) {
-            const valueToStore = JSON.stringify(Array.from(( (this.forwarded.values()))));
+            const valueToStore = JSON.stringify(Array.from(( this.forwarded.values())));
             if (valueToStore !== this.knownPortsRestoreValue) {
                 this.knownPortsRestoreValue = valueToStore;
                 const key = await this.getStorageKey();
@@ -513,18 +509,12 @@ let TunnelModel = class TunnelModel extends Disposable {
         if (tunnel.tunnelLocalPort === expectedLocal) {
             return;
         }
-        const newCooldown = ( (new Date()));
+        const newCooldown = ( new Date());
         if ((this.mismatchCooldown.getTime() + MISMATCH_LOCAL_PORT_COOLDOWN) > newCooldown.getTime()) {
             return;
         }
         this.mismatchCooldown = newCooldown;
-        const mismatchString = ( (nls.localize(
-            'remote.localPortMismatch.single',
-            "Local port {0} could not be used for forwarding to remote port {1}.\n\nThis usually happens when there is already another process using local port {0}.\n\nPort number {2} has been used instead.",
-            expectedLocal,
-            tunnel.tunnelRemotePort,
-            tunnel.tunnelLocalPort
-        )));
+        const mismatchString = nls.localizeWithPath('vs/workbench/services/remote/common/tunnelModel', 'remote.localPortMismatch.single', "Local port {0} could not be used for forwarding to remote port {1}.\n\nThis usually happens when there is already another process using local port {0}.\n\nPort number {2} has been used instead.", expectedLocal, tunnel.tunnelRemotePort, tunnel.tunnelLocalPort);
         return this.dialogService.info(mismatchString);
     }
     async forward(tunnelProperties, attributes) {
@@ -555,7 +545,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                 noTunnelValue = tunnel;
             }
             else if (tunnel && tunnel.localAddress) {
-                const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( (new Map())), tunnelProperties.remote.host, tunnelProperties.remote.port);
+                const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( new Map()), tunnelProperties.remote.host, tunnelProperties.remote.port);
                 const protocol = (tunnel.protocol ?
                     ((tunnel.protocol === TunnelProtocol.Https) ? TunnelProtocol.Https : TunnelProtocol.Http)
                     : (attributes?.protocol ?? TunnelProtocol.Http));
@@ -590,7 +580,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         return noTunnelValue;
     }
     mergeCachedAndUnrestoredProperties(key, tunnelProperties) {
-        const map = ( (this.unrestoredExtensionTunnels.has(key))) ? this.unrestoredExtensionTunnels : (( (this.sessionCachedProperties.has(key))) ? this.sessionCachedProperties : undefined);
+        const map = ( this.unrestoredExtensionTunnels.has(key)) ? this.unrestoredExtensionTunnels : (( this.sessionCachedProperties.has(key)) ? this.sessionCachedProperties : undefined);
         if (map) {
             const updateProps = map.get(key);
             map.delete(key);
@@ -605,11 +595,11 @@ let TunnelModel = class TunnelModel extends Disposable {
     async mergeAttributesIntoExistingTunnel(existingTunnel, tunnelProperties, attributes) {
         const newName = attributes?.label ?? tunnelProperties.name;
         let MergedAttributeAction;
-        ( ((function(MergedAttributeAction) {
+        ( (function(MergedAttributeAction) {
             MergedAttributeAction[MergedAttributeAction["None"] = 0] = "None";
             MergedAttributeAction[MergedAttributeAction["Fire"] = 1] = "Fire";
             MergedAttributeAction[MergedAttributeAction["Reopen"] = 2] = "Reopen";
-        })(MergedAttributeAction || (MergedAttributeAction = {}))));
+        })(MergedAttributeAction || (MergedAttributeAction = {})));
         let mergedAction = MergedAttributeAction.None;
         if (newName !== existingTunnel.name) {
             existingTunnel.name = newName;
@@ -643,7 +633,7 @@ let TunnelModel = class TunnelModel extends Disposable {
             this._onPortName.fire({ host, port });
             return;
         }
-        else if (( (this.detected.has(key)))) {
+        else if (( this.detected.has(key))) {
             this.detected.get(key).name = name;
             this._onPortName.fire({ host, port });
         }
@@ -671,7 +661,7 @@ let TunnelModel = class TunnelModel extends Disposable {
     addEnvironmentTunnels(tunnels) {
         if (tunnels) {
             for (const tunnel of tunnels) {
-                const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( (new Map())), tunnel.remoteAddress.host, tunnel.remoteAddress.port);
+                const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( new Map()), tunnel.remoteAddress.host, tunnel.remoteAddress.port);
                 const localAddress = typeof tunnel.localAddress === 'string' ? tunnel.localAddress : makeAddress(tunnel.localAddress.host, tunnel.localAddress.port);
                 this.detected.set(makeAddress(tunnel.remoteAddress.host, tunnel.remoteAddress.port), {
                     remoteHost: tunnel.remoteAddress.host,
@@ -686,7 +676,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                     privacy: TunnelPrivacyId.ConstantPrivate,
                     source: {
                         source: TunnelSource.Extension,
-                        description: ( (nls.localize('tunnel.staticallyForwarded', "Statically Forwarded")))
+                        description: nls.localizeWithPath('vs/workbench/services/remote/common/tunnelModel', 'tunnel.staticallyForwarded', "Statically Forwarded")
                     }
                 });
                 this.tunnelService.setEnvironmentTunnel(tunnel.remoteAddress.host, tunnel.remoteAddress.port, localAddress, TunnelPrivacyId.ConstantPrivate, TunnelProtocol.Http);
@@ -705,12 +695,12 @@ let TunnelModel = class TunnelModel extends Disposable {
             processedCandidates = await this._candidateFilter(candidates);
         }
         const removedCandidates = this.updateInResponseToCandidates(processedCandidates);
-        this.logService.trace(`ForwardedPorts: (TunnelModel) removed candidates ${( ( Array.from(( ( removedCandidates.values()))).map(candidate => candidate.port))).join(', ')}`);
+        this.logService.trace(`ForwardedPorts: (TunnelModel) removed candidates ${( Array.from(( removedCandidates.values())).map(candidate => candidate.port)).join(', ')}`);
         this._onCandidatesChanged.fire(removedCandidates);
     }
     updateInResponseToCandidates(candidates) {
-        const removedCandidates = this._candidates ?? ( (new Map()));
-        const candidatesMap = ( (new Map()));
+        const removedCandidates = this._candidates ?? ( new Map());
+        const candidatesMap = ( new Map());
         this._candidates = candidatesMap;
         candidates.forEach(value => {
             const addressKey = makeAddress(value.host, value.port);
@@ -720,7 +710,7 @@ let TunnelModel = class TunnelModel extends Disposable {
                 detail: value.detail,
                 pid: value.pid
             });
-            if (( (removedCandidates.has(addressKey)))) {
+            if (( removedCandidates.has(addressKey))) {
                 removedCandidates.delete(addressKey);
             }
             const forwardedValue = mapHasAddressLocalhostOrAllInterfaces(this.forwarded, value.host, value.port);
@@ -751,16 +741,16 @@ let TunnelModel = class TunnelModel extends Disposable {
         return removedCandidates;
     }
     get candidates() {
-        return this._candidates ? Array.from(( (this._candidates.values()))) : [];
+        return this._candidates ? Array.from(( this._candidates.values())) : [];
     }
     get candidatesOrUndefined() {
         return this._candidates ? this.candidates : undefined;
     }
     async updateAttributes() {
-        const tunnels = Array.from(( (this.forwarded.values())));
-        const allAttributes = await this.getAttributes(( (tunnels.map(tunnel => {
+        const tunnels = Array.from(( this.forwarded.values()));
+        const allAttributes = await this.getAttributes(( tunnels.map(tunnel => {
             return { port: tunnel.remotePort, host: tunnel.remoteHost };
-        }))), false);
+        })), false);
         if (!allAttributes) {
             return;
         }
@@ -783,20 +773,20 @@ let TunnelModel = class TunnelModel extends Disposable {
         }
     }
     async getAttributes(forwardedPorts, checkProviders = true) {
-        const matchingCandidates = ( (new Map()));
-        const pidToPortsMapping = ( (new Map()));
+        const matchingCandidates = ( new Map());
+        const pidToPortsMapping = ( new Map());
         forwardedPorts.forEach(forwardedPort => {
-            const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( (new Map())), LOCALHOST_ADDRESSES[0], forwardedPort.port) ?? forwardedPort;
+            const matchingCandidate = mapHasAddressLocalhostOrAllInterfaces(this._candidates ?? ( new Map()), LOCALHOST_ADDRESSES[0], forwardedPort.port) ?? forwardedPort;
             if (matchingCandidate) {
                 matchingCandidates.set(forwardedPort.port, matchingCandidate);
                 const pid = isCandidatePort(matchingCandidate) ? matchingCandidate.pid : undefined;
-                if (!( (pidToPortsMapping.has(pid)))) {
+                if (!( pidToPortsMapping.has(pid))) {
                     pidToPortsMapping.set(pid, []);
                 }
                 pidToPortsMapping.get(pid)?.push(forwardedPort.port);
             }
         });
-        const configAttributes = ( (new Map()));
+        const configAttributes = ( new Map());
         forwardedPorts.forEach(forwardedPort => {
             const attributes = this.configPortsAttributes.getAttributes(forwardedPort.port, forwardedPort.host, matchingCandidates.get(forwardedPort.port)?.detail);
             if (attributes) {
@@ -806,16 +796,14 @@ let TunnelModel = class TunnelModel extends Disposable {
         if ((this.portAttributesProviders.length === 0) || !checkProviders) {
             return (configAttributes.size > 0) ? configAttributes : undefined;
         }
-        const allProviderResults = await Promise.all(flatten(( (this.portAttributesProviders.map(provider => {
-            return (
-                 (Array.from(pidToPortsMapping.entries()).map(entry => {
-                    const portGroup = entry[1];
-                    const matchingCandidate = matchingCandidates.get(portGroup[0]);
-                    return provider.providePortAttributes(portGroup, matchingCandidate?.pid, matchingCandidate?.detail, ( (new CancellationTokenSource())).token);
-                }))
-            );
-        })))));
-        const providedAttributes = ( (new Map()));
+        const allProviderResults = await Promise.all(flatten(( this.portAttributesProviders.map(provider => {
+            return ( Array.from(pidToPortsMapping.entries()).map(entry => {
+                const portGroup = entry[1];
+                const matchingCandidate = matchingCandidates.get(portGroup[0]);
+                return provider.providePortAttributes(portGroup, matchingCandidate?.pid, matchingCandidate?.detail, ( new CancellationTokenSource()).token);
+            }));
+        }))));
+        const providedAttributes = ( new Map());
         allProviderResults.forEach(attributes => attributes.forEach(attribute => {
             if (attribute) {
                 providedAttributes.set(attribute.port, attribute);
@@ -824,7 +812,7 @@ let TunnelModel = class TunnelModel extends Disposable {
         if (!configAttributes && !providedAttributes) {
             return undefined;
         }
-        const mergedAttributes = ( (new Map()));
+        const mergedAttributes = ( new Map());
         forwardedPorts.forEach(forwardedPorts => {
             const config = configAttributes.get(forwardedPorts.port);
             const provider = providedAttributes.get(forwardedPorts.port);
@@ -842,19 +830,19 @@ let TunnelModel = class TunnelModel extends Disposable {
         this.portAttributesProviders.push(provider);
     }
 };
-TunnelModel.__decorator = ( (__decorate([
+TunnelModel.__decorator = ( __decorate([
     debounce(1000)
-], TunnelModel.prototype, "storeForwarded", null)));
-TunnelModel = ( (__decorate([
-    ( (__param(0, ITunnelService))),
-    ( (__param(1, IStorageService))),
-    ( (__param(2, IConfigurationService))),
-    ( (__param(3, IWorkbenchEnvironmentService))),
-    ( (__param(4, IRemoteAuthorityResolverService))),
-    ( (__param(5, IWorkspaceContextService))),
-    ( (__param(6, ILogService))),
-    ( (__param(7, IDialogService))),
-    ( (__param(8, IExtensionService))),
-    ( (__param(9, IContextKeyService)))
-], TunnelModel)));
+], TunnelModel.prototype, "storeForwarded", null));
+TunnelModel = ( __decorate([
+    ( __param(0, ITunnelService)),
+    ( __param(1, IStorageService)),
+    ( __param(2, IConfigurationService)),
+    ( __param(3, IWorkbenchEnvironmentService)),
+    ( __param(4, IRemoteAuthorityResolverService)),
+    ( __param(5, IWorkspaceContextService)),
+    ( __param(6, ILogService)),
+    ( __param(7, IDialogService)),
+    ( __param(8, IExtensionService)),
+    ( __param(9, IContextKeyService))
+], TunnelModel));
 export { ACTIVATION_EVENT, AutoTunnelSource, OnPortForward, PortsAttributes, TunnelCloseReason, TunnelModel, TunnelSource, UserTunnelSource, forwardedPortsViewEnabled, isCandidatePort, makeAddress, mapHasAddress, mapHasAddressLocalhostOrAllInterfaces, parseAddress };

package/vscode/src/vs/workbench/services/search/common/queryBuilder.js

@@ -327,11 +327,7 @@ let QueryBuilder = class QueryBuilder {
             else {
                 const probableWorkspaceFolderNameMatch = searchPath.match(/\.[\/\\](.+)[\/\\]?/);
                 const probableWorkspaceFolderName = probableWorkspaceFolderNameMatch ? probableWorkspaceFolderNameMatch[1] : searchPath;
-                const searchPathNotFoundError = ( nls.localize(
-                    'search.noWorkspaceWithName',
-                    "Workspace folder does not exist: {0}",
-                    probableWorkspaceFolderName
-                ));
+                const searchPathNotFoundError = nls.localizeWithPath('vs/workbench/services/search/common/queryBuilder', 'search.noWorkspaceWithName', "Workspace folder does not exist: {0}", probableWorkspaceFolderName);
                 throw new Error(searchPathNotFoundError);
             }
         }

package/vscode/src/vs/workbench/services/textfile/browser/textFileService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { TextFileOperationError, toBufferOrReadable, stringToSnapshot } from '../common/textfiles.js';
 import { SaveSourceRegistry } from '../../../common/editor.js';
 import { ILifecycleService } from '../../lifecycle/common/lifecycle.js';
@@ -41,8 +41,8 @@ import { IDialogService, IFileDialogService } from '../../../../platform/dialogs
 var AbstractTextFileService_1;
 let AbstractTextFileService = class AbstractTextFileService extends Disposable {
     static { AbstractTextFileService_1 = this; }
-    static { this.TEXTFILE_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('textFileCreate.source', ( localize('textFileCreate.source', "File Created"))); }
-    static { this.TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', ( localize('textFileOverwrite.source', "File Replaced"))); }
+    static { this.TEXTFILE_SAVE_CREATE_SOURCE = SaveSourceRegistry.registerSource('textFileCreate.source', localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'textFileCreate.source', "File Created")); }
+    static { this.TEXTFILE_SAVE_REPLACE_SOURCE = SaveSourceRegistry.registerSource('textFileOverwrite.source', localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'textFileOverwrite.source', "File Replaced")); }
     constructor(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, codeEditorService, pathService, workingCopyFileService, uriIdentityService, languageService, logService, elevatedFileService, decorationsService) {
         super();
         this.fileService = fileService;
@@ -72,7 +72,7 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
             constructor(files) {
                 super();
                 this.files = files;
-                this.label = ( localize('textFileModelDecorations', "Text File Model Decorations"));
+                this.label = localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'textFileModelDecorations', "Text File Model Decorations");
                 this._onDidChange = this._register(( new Emitter()));
                 this.onDidChange = this._onDidChange.event;
                 this.registerListeners();
@@ -99,20 +99,20 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
                         color: listErrorForeground,
                         letter: Codicon.lockSmall,
                         strikethrough: true,
-                        tooltip: ( localize('readonlyAndDeleted', "Deleted, Read-only")),
+                        tooltip: localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'readonlyAndDeleted', "Deleted, Read-only"),
                     };
                 }
                 else if (isReadonly) {
                     return {
                         letter: Codicon.lockSmall,
-                        tooltip: ( localize('readonly', "Read-only")),
+                        tooltip: localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'readonly', "Read-only"),
                     };
                 }
                 else if (isOrphaned) {
                     return {
                         color: listErrorForeground,
                         strikethrough: true,
-                        tooltip: ( localize('deleted', "Deleted")),
+                        tooltip: localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'deleted', "Deleted"),
                     };
                 }
                 return undefined;
@@ -165,7 +165,7 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
         catch (error) {
             cts.dispose(true);
             if (error.decodeStreamErrorKind === 1 ) {
-                throw new TextFileOperationError(localize('fileBinaryError', "File seems to be binary and cannot be opened as text"), 0 , options);
+                throw new TextFileOperationError(localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'fileBinaryError', "File seems to be binary and cannot be opened as text"), 0 , options);
             }
             else {
                 throw error;
@@ -364,21 +364,9 @@ let AbstractTextFileService = class AbstractTextFileService extends Disposable {
     async confirmOverwrite(resource) {
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
-            message: ( localize(
-                'confirmOverwrite',
-                "'{0}' already exists. Do you want to replace it?",
-                basename(resource)
-            )),
-            detail: ( localize(
-                'irreversible',
-                "A file or folder with the name '{0}' already exists in the folder '{1}'. Replacing it will overwrite its current contents.",
-                basename(resource),
-                basename(dirname(resource))
-            )),
-            primaryButton: ( localize(
-                { key: 'replaceButtonLabel', comment: ['&& denotes a mnemonic'] },
-                "&&Replace"
-            )),
+            message: localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'confirmOverwrite', "'{0}' already exists. Do you want to replace it?", basename(resource)),
+            detail: localizeWithPath('vs/workbench/services/textfile/browser/textFileService', 'irreversible', "A file or folder with the name '{0}' already exists in the folder '{1}'. Replacing it will overwrite its current contents.", basename(resource), basename(dirname(resource))),
+            primaryButton: localizeWithPath('vs/workbench/services/textfile/browser/textFileService', { key: 'replaceButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Replace"),
         });
         return confirmed;
     }