development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ports: fix protocol switcher not working locally (#213951)

Browse source 
Fixes #213944

It previously always targeted the USER_REMOTE settings when changing the
protocol, but these did not exist locally.
This commit is contained in:
Connor Peet 2024-05-31 08:05:29 -07:00 committed by GitHub
parent 3a1ad5f077
commit 11533e5b1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/remote/browser/tunnelView.ts
View file

@ -1562,24 +1562,25 @@ namespace SetTunnelProtocolAction {
export const LABEL_HTTP = nls.localize('remote.tunnel.protocolHttp', "HTTP");
export const LABEL_HTTPS = nls.localize('remote.tunnel.protocolHttps', "HTTPS");
async function handler(arg: any, protocol: TunnelProtocol, remoteExplorerService: IRemoteExplorerService) {
async function handler(arg: any, protocol: TunnelProtocol, remoteExplorerService: IRemoteExplorerService, environmentService: IWorkbenchEnvironmentService) {
if (isITunnelItem(arg)) {
const attributes: Partial<Attributes> = {
protocol
};
return remoteExplorerService.tunnelModel.configPortsAttributes.addAttributes(arg.remotePort, attributes, ConfigurationTarget.USER_REMOTE);
const target = environmentService.remoteAuthority ? ConfigurationTarget.USER_REMOTE : ConfigurationTarget.USER_LOCAL;
return remoteExplorerService.tunnelModel.configPortsAttributes.addAttributes(arg.remotePort, attributes, target);
}
}
export function handlerHttp(): ICommandHandler {
return async (accessor, arg) => {
return handler(arg, TunnelProtocol.Http, accessor.get(IRemoteExplorerService));
return handler(arg, TunnelProtocol.Http, accessor.get(IRemoteExplorerService), accessor.get(IWorkbenchEnvironmentService));
};
}
export function handlerHttps(): ICommandHandler {
return async (accessor, arg) => {
return handler(arg, TunnelProtocol.Https, accessor.get(IRemoteExplorerService));
return handler(arg, TunnelProtocol.Https, accessor.get(IRemoteExplorerService), accessor.get(IWorkbenchEnvironmentService));
};
}
}