From 59babb4ccc8a0ed49ff0f122c272e8912fa53ede Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Mon, 11 Sep 2023 13:18:29 +0200 Subject: [PATCH] Use host+port instead of string for managed tunnel (#192762) Fixes https://github.com/microsoft/vscode-remote-release/issues/8933 --- src/vs/workbench/api/node/extHostTunnelService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTunnelService.ts b/src/vs/workbench/api/node/extHostTunnelService.ts index 561f731654d..2ab734a61a6 100644 --- a/src/vs/workbench/api/node/extHostTunnelService.ts +++ b/src/vs/workbench/api/node/extHostTunnelService.ts @@ -22,7 +22,7 @@ import { NodeRemoteTunnel } from 'vs/platform/tunnel/node/tunnelService'; import { IExtHostInitDataService } from 'vs/workbench/api/common/extHostInitDataService'; import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService'; import { ExtHostTunnelService } from 'vs/workbench/api/common/extHostTunnelService'; -import { CandidatePort } from 'vs/workbench/services/remote/common/tunnelModel'; +import { CandidatePort, parseAddress } from 'vs/workbench/services/remote/common/tunnelModel'; import * as vscode from 'vscode'; export function getSockets(stdout: string): Record { @@ -349,7 +349,7 @@ export class NodeExtHostTunnelService extends ExtHostTunnelService { const disposeEmitter = new Emitter(); return { - localAddress: t.localAddress, + localAddress: parseAddress(t.localAddress) ?? t.localAddress, remoteAddress: { port: t.tunnelRemotePort, host: t.tunnelRemoteHost }, onDidDispose: disposeEmitter.event, dispose: () => {