From 92292f4fe4d2681ef980c3995e720af61f54ce37 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 24 Oct 2019 11:51:56 +0200 Subject: [PATCH] remove encodeURI(uri.toString(true)) workarounds --- src/vs/editor/browser/services/openerService.ts | 2 +- src/vs/workbench/contrib/webview/common/portMapping.ts | 8 ++++---- src/vs/workbench/electron-browser/window.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/editor/browser/services/openerService.ts b/src/vs/editor/browser/services/openerService.ts index 77b12e03583..2ea275f4515 100644 --- a/src/vs/editor/browser/services/openerService.ts +++ b/src/vs/editor/browser/services/openerService.ts @@ -149,7 +149,7 @@ export class OpenerService extends Disposable implements IOpenerService { private async _doOpenExternal(resource: URI, options: OpenOptions | undefined): Promise { const { resolved } = await this.resolveExternalUri(resource, options); - dom.windowOpenNoOpener(encodeURI(resolved.toString(true))); + dom.windowOpenNoOpener(resolved.toString()); return true; } diff --git a/src/vs/workbench/contrib/webview/common/portMapping.ts b/src/vs/workbench/contrib/webview/common/portMapping.ts index 69c216631ba..79904ad749c 100644 --- a/src/vs/workbench/contrib/webview/common/portMapping.ts +++ b/src/vs/workbench/contrib/webview/common/portMapping.ts @@ -37,16 +37,16 @@ export class WebviewPortMappingManager extends Disposable { if (tunnel.tunnelLocalPort === mapping.webviewPort) { return undefined; } - return encodeURI(uri.with({ + return uri.with({ authority: `127.0.0.1:${tunnel.tunnelLocalPort}`, - }).toString(true)); + }).toString(); } } if (mapping.webviewPort !== mapping.extensionHostPort) { - return encodeURI(uri.with({ + return uri.with({ authority: `${requestLocalHostInfo.address}:${mapping.extensionHostPort}` - }).toString(true)); + }).toString(); } } } diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index 23ea962fdf8..06ef5bbbc45 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -408,7 +408,7 @@ export class ElectronWindow extends Disposable { // the main process to prevent window focus issues. if (this.shouldOpenExternal(resource, options)) { const { resolved } = await this.openerService.resolveExternalUri(resource, options); - const success = await this.electronService.openExternal(encodeURI(resolved.toString(true))); + const success = await this.electronService.openExternal(resolved.toString()); if (!success && resolved.scheme === Schemas.file) { // if opening failed, and this is a file, we can still try to reveal it await this.electronService.showItemInFolder(resolved.fsPath); -- GitLab