@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -21,7 +21,7 @@ import { ITerminalService } from '../../terminal/browser/terminal.service.js';
 import { IDebugService } from '../../debug/common/debug.service.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.service.js';
 import { OperatingSystem, isWeb } from '../../../../base/common/platform.js';
-import { TunnelPrivacyId } from '../../../../platform/tunnel/common/tunnel.js';
+import { isLocalhost, isAllInterfaces, TunnelPrivacyId } from '../../../../platform/tunnel/common/tunnel.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
@@ -40,6 +40,18 @@ import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 
 const VIEWLET_ID = "workbench.view.remote";
+const TOGGLE_VIEW_ACTION_ID = "remoteExplorer.toggleForwardedPortsView";
+function isCandidateRemappedTunnelLocalEndpoint(candidate, tunnels) {
+    if (!isLocalhost(candidate.host) && !isAllInterfaces(candidate.host)) {
+        return false;
+    }
+    for (const tunnel of tunnels) {
+        if (tunnel.localPort === candidate.port && tunnel.remotePort !== candidate.port) {
+            return true;
+        }
+    }
+    return false;
+}
 let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     constructor(
         contextKeyService,
@@ -61,11 +73,11 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         this.hasPortsInSession = false;
         this._register(( Registry.as(Extensions.ViewsRegistry)).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
             content: this.environmentService.remoteAuthority ? ( localize(
-                13451,
+                15218,
                 "No forwarded ports. Forward a port to access your running services locally.\n[Forward a Port]({0})",
                 `command:${ForwardPortAction.INLINE_ID}`
             )) : ( localize(
-                13452,
+                15219,
                 "No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})",
                 `command:${ForwardPortAction.INLINE_ID}`
             ))
@@ -81,7 +93,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     async getViewContainer() {
         return ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
             id: TUNNEL_VIEW_CONTAINER_ID,
-            title: ( localize2(13453, "Ports")),
+            title: ( localize2(15220, "Ports")),
             icon: portsViewIcon,
             ctorDescriptor: ( new SyncDescriptor(ViewPaneContainer, [TUNNEL_VIEW_CONTAINER_ID, {
                 mergeViewWithContainerWhenSingleView: true
@@ -142,7 +154,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
             this.activityBadge.value = this.activityService.showViewActivity(TUNNEL_VIEW_ID, {
                 badge: ( new NumberBadge(
                     this.remoteExplorerService.tunnelModel.forwarded.size,
-                    n => n === 1 ? ( localize(13454, "1 forwarded port")) : ( localize(13455, "{0} forwarded ports", n))
+                    n => n === 1 ? ( localize(15221, "1 forwarded port")) : ( localize(15222, "{0} forwarded ports", n))
                 ))
             });
         } else {
@@ -166,22 +178,22 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         const count = this.remoteExplorerService.tunnelModel.forwarded.size + this.remoteExplorerService.tunnelModel.detected.size;
         const text = `${count}`;
         if (count === 0) {
-            tooltip = ( localize(13456, "No Ports Forwarded"));
+            tooltip = ( localize(15223, "No Ports Forwarded"));
         } else {
             const allTunnels = Array.from(( this.remoteExplorerService.tunnelModel.forwarded.values()));
             allTunnels.push(...Array.from(( this.remoteExplorerService.tunnelModel.detected.values())));
             tooltip = ( localize(
-                13457,
+                15224,
                 "Forwarded Ports: {0}",
                 ( allTunnels.map(forwarded => forwarded.remotePort)).join(", ")
             ));
         }
         return {
-            name: ( localize(13458, "Forwarded Ports")),
+            name: ( localize(15225, "Forwarded Ports")),
             text: `$(radio-tower) ${text}`,
             ariaLabel: tooltip,
             tooltip,
-            command: `${TUNNEL_VIEW_ID}.focus`
+            command: TOGGLE_VIEW_ACTION_ID
         };
     }
 };
@@ -281,14 +293,14 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                     await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID);
                     this.notificationService.notify({
                         message: ( localize(
-                            13459,
+                            15226,
                             "Over 20 ports have been automatically forwarded. The `process` based automatic port forwarding has been switched to `hybrid` in settings. Some ports may no longer be detected."
                         )),
                         severity: Severity$1.Warning,
                         actions: {
                             primary: [toAction({
                                 id: "switchBack",
-                                label: ( localize(13460, "Undo")),
+                                label: ( localize(15227, "Undo")),
                                 run: async () => {
                                     await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS);
                                     await this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, ConfigurationTarget.WORKSPACE);
@@ -297,7 +309,7 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                                 }
                             }), toAction({
                                 id: "showPortSourceSetting",
-                                label: ( localize(13461, "Show Setting")),
+                                label: ( localize(15228, "Show Setting")),
                                 run: async () => {
                                     await this.preferencesService.openSettings({
                                         query: "remote.autoForwardPortsSource"
@@ -531,14 +543,14 @@ class OnAutoForwardedAction extends Disposable {
         }], false);
         const label = properties?.get(tunnel.tunnelRemotePort)?.label;
         return localize(
-            13462,
+            15229,
             "Your application{0} running on port {1} is available.  ",
             label ? ` (${label})` : "",
             tunnel.tunnelRemotePort
         );
     }
     linkMessage() {
-        return localize(13463, "[See all forwarded ports]({0})", `command:${TunnelPanel.ID}.focus`);
+        return localize(15230, "[See all forwarded ports]({0})", `command:${TunnelPanel.ID}.focus`);
     }
     async showNotification(tunnel) {
         if (!(await this.hostService.hadLastFocus())) {
@@ -552,7 +564,7 @@ class OnAutoForwardedAction extends Disposable {
         }
         if ((tunnel.tunnelLocalPort !== tunnel.tunnelRemotePort) && this.tunnelService.canElevate && this.tunnelService.isPortPrivileged(tunnel.tunnelRemotePort)) {
             message += ( localize(
-                13464,
+                15231,
                 "You'll need to run as superuser to use port {0} locally.  ",
                 tunnel.tunnelRemotePort
             ));
@@ -577,7 +589,7 @@ class OnAutoForwardedAction extends Disposable {
     }
     makePublicChoice(tunnel) {
         return {
-            label: ( localize(13465, "Make Public")),
+            label: ( localize(15232, "Make Public")),
             run: async () => {
                 const oldTunnelDetails = mapHasAddressLocalhostOrAllInterfaces(
                     this.remoteExplorerService.tunnelModel.forwarded,
@@ -623,7 +635,7 @@ class OnAutoForwardedAction extends Disposable {
     }
     elevateChoice(tunnel) {
         return {
-            label: ( localize(13466, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(15233, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 await this.remoteExplorerService.close({
                     host: tunnel.tunnelRemoteHost,
@@ -877,6 +889,12 @@ class ProcAutomaticPortForwarding extends Disposable {
                 this.logService.trace(`ForwardedPorts: (ProcForwarding) Port ${value.port} missing detail`);
                 continue;
             }
+            if (isCandidateRemappedTunnelLocalEndpoint(value, ( this.remoteExplorerService.tunnelModel.forwarded.values()))) {
+                this.logService.trace(
+                    `ForwardedPorts: (ProcForwarding) Port ${value.port} is the local port of a forwarded tunnel`
+                );
+                continue;
+            }
             if (!attributes) {
                 attributes = await this.remoteExplorerService.tunnelModel.getAttributes(this.remoteExplorerService.tunnelModel.candidates);
             }
@@ -966,4 +984,4 @@ class ProcAutomaticPortForwarding extends Disposable {
     }
 }
 
-export { AutomaticPortForwarding, ForwardedPortsView, PortRestore, VIEWLET_ID };
+export { AutomaticPortForwarding, ForwardedPortsView, PortRestore, TOGGLE_VIEW_ACTION_ID, VIEWLET_ID, isCandidateRemappedTunnelLocalEndpoint };

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

@@ -3,26 +3,26 @@ import { localize } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const getStartedIcon = registerIcon("remote-explorer-get-started", Codicon.star, ( localize(13467, "Getting started icon in the remote explorer view.")));
-const documentationIcon = registerIcon("remote-explorer-documentation", Codicon.book, ( localize(13468, "Documentation icon in the remote explorer view.")));
-registerIcon("remote-explorer-feedback", Codicon.twitter, ( localize(13469, "Feedback icon in the remote explorer view.")));
-const reviewIssuesIcon = registerIcon("remote-explorer-review-issues", Codicon.issues, ( localize(13470, "Review issue icon in the remote explorer view.")));
-const reportIssuesIcon = registerIcon("remote-explorer-report-issues", Codicon.comment, ( localize(13471, "Report issue icon in the remote explorer view.")));
-const remoteExplorerViewIcon = registerIcon("remote-explorer-view-icon", Codicon.remoteExplorer, ( localize(13472, "View icon of the remote explorer view.")));
-const portsViewIcon = registerIcon("ports-view-icon", Codicon.plug, ( localize(13473, "View icon of the remote ports view.")));
-registerIcon("ports-view-icon", Codicon.plug, ( localize(13474, "Icon representing a remote port.")));
-const privatePortIcon = registerIcon("private-ports-view-icon", Codicon.lock, ( localize(13475, "Icon representing a private remote port.")));
-const forwardPortIcon = registerIcon("ports-forward-icon", Codicon.plus, ( localize(13476, "Icon for the forward action.")));
-const stopForwardIcon = registerIcon("ports-stop-forward-icon", Codicon.x, ( localize(13477, "Icon for the stop forwarding action.")));
-const openBrowserIcon = registerIcon("ports-open-browser-icon", Codicon.globe, ( localize(13478, "Icon for the open browser action.")));
-const openPreviewIcon = registerIcon("ports-open-preview-icon", Codicon.openPreview, ( localize(13479, "Icon for the open preview action.")));
-const copyAddressIcon = registerIcon("ports-copy-address-icon", Codicon.clippy, ( localize(13480, "Icon for the copy local address action.")));
-const labelPortIcon = registerIcon("ports-label-icon", Codicon.tag, ( localize(13481, "Icon for the label port action.")));
+const getStartedIcon = registerIcon("remote-explorer-get-started", Codicon.star, ( localize(15234, "Getting started icon in the remote explorer view.")));
+const documentationIcon = registerIcon("remote-explorer-documentation", Codicon.book, ( localize(15235, "Documentation icon in the remote explorer view.")));
+registerIcon("remote-explorer-feedback", Codicon.twitter, ( localize(15236, "Feedback icon in the remote explorer view.")));
+const reviewIssuesIcon = registerIcon("remote-explorer-review-issues", Codicon.issues, ( localize(15237, "Review issue icon in the remote explorer view.")));
+const reportIssuesIcon = registerIcon("remote-explorer-report-issues", Codicon.comment, ( localize(15238, "Report issue icon in the remote explorer view.")));
+const remoteExplorerViewIcon = registerIcon("remote-explorer-view-icon", Codicon.remoteExplorer, ( localize(15239, "View icon of the remote explorer view.")));
+const portsViewIcon = registerIcon("ports-view-icon", Codicon.plug, ( localize(15240, "View icon of the remote ports view.")));
+registerIcon("ports-view-icon", Codicon.plug, ( localize(15241, "Icon representing a remote port.")));
+const privatePortIcon = registerIcon("private-ports-view-icon", Codicon.lock, ( localize(15242, "Icon representing a private remote port.")));
+const forwardPortIcon = registerIcon("ports-forward-icon", Codicon.plus, ( localize(15243, "Icon for the forward action.")));
+const stopForwardIcon = registerIcon("ports-stop-forward-icon", Codicon.x, ( localize(15244, "Icon for the stop forwarding action.")));
+const openBrowserIcon = registerIcon("ports-open-browser-icon", Codicon.globe, ( localize(15245, "Icon for the open browser action.")));
+const openPreviewIcon = registerIcon("ports-open-preview-icon", Codicon.openPreview, ( localize(15246, "Icon for the open preview action.")));
+const copyAddressIcon = registerIcon("ports-copy-address-icon", Codicon.clippy, ( localize(15247, "Icon for the copy local address action.")));
+const labelPortIcon = registerIcon("ports-label-icon", Codicon.tag, ( localize(15248, "Icon for the label port action.")));
 const forwardedPortWithoutProcessIcon = registerIcon(
     "ports-forwarded-without-process-icon",
     Codicon.circleOutline,
-    ( localize(13482, "Icon for forwarded ports that don't have a running process."))
+    ( localize(15249, "Icon for forwarded ports that don't have a running process."))
 );
-const forwardedPortWithProcessIcon = registerIcon("ports-forwarded-with-process-icon", Codicon.circleFilled, ( localize(13483, "Icon for forwarded ports that do have a running process.")));
+const forwardedPortWithProcessIcon = registerIcon("ports-forwarded-with-process-icon", Codicon.circleFilled, ( localize(15250, "Icon for forwarded ports that do have a running process.")));
 
 export { copyAddressIcon, documentationIcon, forwardPortIcon, forwardedPortWithProcessIcon, forwardedPortWithoutProcessIcon, getStartedIcon, labelPortIcon, openBrowserIcon, openPreviewIcon, portsViewIcon, privatePortIcon, remoteExplorerViewIcon, reportIssuesIcon, reviewIssuesIcon, stopForwardIcon };

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.d.ts

@@ -103,7 +103,7 @@ declare class TunnelItem implements ITunnelItem {
     constructor(tunnelType: TunnelType, remoteHost: string, remotePort: number, source: {
         source: TunnelSource;
         description: string;
-    }, hasRunningProcess: boolean, protocol: TunnelProtocol, localUri?: URI | undefined, localAddress?: string | undefined, localPort?: number | undefined, closeable?: boolean | undefined, name?: string | undefined, runningProcess?: string | undefined, pid?: number | undefined, _privacy?: (TunnelPrivacyId | string) | undefined, remoteExplorerService?: IRemoteExplorerService | undefined, tunnelService?: ITunnelService | undefined);
+    }, hasRunningProcess: boolean, protocol: TunnelProtocol, localUri?: URI | undefined, localAddress?: string | undefined, localPort?: number | undefined, closeable?: boolean | undefined, name?: string | undefined, runningProcess?: string | undefined, pid?: number | undefined, _privacy?: TunnelPrivacyId | string | undefined, remoteExplorerService?: IRemoteExplorerService | undefined, tunnelService?: ITunnelService | undefined);
     get label(): string;
     set processDescription(description: string | undefined);
     get processDescription(): string | undefined;
@@ -181,12 +181,12 @@ export declare namespace OpenPortInBrowserAction {
     const ID = "remote.tunnel.open";
     const LABEL: string;
     function handler(): ICommandHandler;
-    function run(model: TunnelModel, openerService: IOpenerService, key: string): Promise<boolean> | Promise<void>;
+    function run(model: TunnelModel, openerService: IOpenerService, key: string): Promise<void> | Promise<boolean>;
 }
 export declare namespace OpenPortInPreviewAction {
     const ID = "remote.tunnel.openPreview";
     const LABEL: string;
     function handler(): ICommandHandler;
-    function run(model: TunnelModel, openerService: IOpenerService, externalOpenerService: IExternalUriOpenerService, key: string): Promise<boolean | void>;
+    function run(model: TunnelModel, openerService: IOpenerService, externalOpenerService: IExternalUriOpenerService, key: string): Promise<void | boolean>;
 }
 export {};