From 2894338f38841f58179df7ec1c9d7bf38851cce1 Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Fri, 9 Apr 2021 16:54:31 +0200 Subject: [PATCH] Add all valid hosts to simple browser (#120929) and pass sourceUri not targetUri --- extensions/simple-browser/src/extension.ts | 11 ++++++++++- .../common/externalUriOpenerService.ts | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/extensions/simple-browser/src/extension.ts b/extensions/simple-browser/src/extension.ts index cf2b7863c3a..1831c7c638c 100644 --- a/extensions/simple-browser/src/extension.ts +++ b/extensions/simple-browser/src/extension.ts @@ -16,7 +16,16 @@ const showCommand = 'simpleBrowser.show'; const enabledHosts = new Set([ 'localhost', - '127.0.0.1' + // localhost IPv4 + '127.0.0.1', + // localhost IPv6 + '0:0:0:0:0:0:0:1', + '::1', + // all interfaces IPv4 + '0.0.0.0', + // all interfaces IPv6 + '0:0:0:0:0:0:0:0', + '::' ]); const openerId = 'simpleBrowser.open'; diff --git a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts index ad371f4fb0b..6ba9cfa61d3 100644 --- a/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts +++ b/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.ts @@ -108,7 +108,7 @@ export class ExternalUriOpenerService extends Disposable implements IExternalUri await Promise.all(Array.from(allOpeners.values()).map(async opener => { let priority: modes.ExternalUriOpenerPriority; try { - priority = await opener.canOpen(targetUri, token); + priority = await opener.canOpen(ctx.sourceUri, token); } catch (e) { this.logService.error(e); return;