Don't encode image resource URI twice (microsoft#85355)

jeanp413 · mjbvz · commit 56a544b36cfa · 2019-11-22T14:33:33.000-08:00
diff --git a/extensions/image-preview/src/preview.ts b/extensions/image-preview/src/preview.ts
@@ -240,9 +240,9 @@ class Preview extends Disposable implements vscode.WebviewEditorEditingCapabilit
 			default:
 				// Avoid adding cache busting if there is already a query string
 				if (resource.query) {
-					return encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true));
+					return webviewEditor.webview.asWebviewUri(resource).toString(true);
 				}
-				return encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true) + `?version=${version}`);
+				return webviewEditor.webview.asWebviewUri(resource).with({ query: `version=${version}` }).toString(true);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -240,9 +240,9 @@ class Preview extends Disposable implements vscode.WebviewEditorEditingCapabilit`
`240`	`240`	`default:`
`241`	`241`	`// Avoid adding cache busting if there is already a query string`
`242`	`242`	`if (resource.query) {`
`243`		`- return encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true));`
	`243`	`+ return webviewEditor.webview.asWebviewUri(resource).toString(true);`
`244`	`244`	`}`
`245`		- return encodeURI(webviewEditor.webview.asWebviewUri(resource).toString(true) + `?version=${version}`);
	`245`	+ return webviewEditor.webview.asWebviewUri(resource).with({ query: `version=${version}` }).toString(true);
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`