Merge pull request #79061 from mjbvz/fix-webview-port-forward-encoding

Skip using vscode's encoding for port forwarded uris
microsoft · Aug 13, 2019 · 57007c2 · 57007c2
2 parents f3d50de + 272cf3f
commit 57007c2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/vs/workbench/contrib/webview/common/portMapping.ts b/src/vs/workbench/contrib/webview/common/portMapping.ts
@@ -47,16 +47,16 @@ export class WebviewPortMappingManager extends Disposable {
 				if (this.extensionLocation && this.extensionLocation.scheme === REMOTE_HOST_SCHEME) {
 					const tunnel = await this.getOrCreateTunnel(mapping.extensionHostPort);
 					if (tunnel) {
-						return uri.with({
+						return encodeURI(uri.with({
 							authority: `127.0.0.1:${tunnel.tunnelLocalPort}`,
-						}).toString();
+						}).toString(true));
 					}
 				}
 
 				if (mapping.webviewPort !== mapping.extensionHostPort) {
-					return uri.with({
+					return encodeURI(uri.with({
 						authority: `${requestLocalHostInfo.address}:${mapping.extensionHostPort}`
-					}).toString();
+					}).toString(true));
 				}
 			}
 		}
@@ -84,4 +84,4 @@ export class WebviewPortMappingManager extends Disposable {
 		}
 		return tunnel;
 	}
-}
+}