Revert change that breaks integration tests

alexdima · alexdima · commit f485d7560550 · 2020-07-28T12:04:57.000+02:00
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts
@@ -272,18 +272,18 @@ suite('vscode API - webview', () => {
 			const response = await sendRecieveMessage(webview, { src: imagePath.toString() });
 			assert.strictEqual(response.value, true);
 		}
-		{
-			// #102188. Resource filename containing special characters like '%', '#', '?'.
-			const imagePath = webview.webview.asWebviewUri(workspaceFile('image%02.png'));
-			const response = await sendRecieveMessage(webview, { src: imagePath.toString() });
-			assert.strictEqual(response.value, true);
-		}
-		{
-			// #102188. Resource filename containing special characters like '%', '#', '?'.
-			const imagePath = webview.webview.asWebviewUri(workspaceFile('image%.png'));
-			const response = await sendRecieveMessage(webview, { src: imagePath.toString() });
-			assert.strictEqual(response.value, true);
-		}
+		// {
+		// 	// #102188. Resource filename containing special characters like '%', '#', '?'.
+		// 	const imagePath = webview.webview.asWebviewUri(workspaceFile('image%02.png'));
+		// 	const response = await sendRecieveMessage(webview, { src: imagePath.toString() });
+		// 	assert.strictEqual(response.value, true);
+		// }
+		// {
+		// 	// #102188. Resource filename containing special characters like '%', '#', '?'.
+		// 	const imagePath = webview.webview.asWebviewUri(workspaceFile('image%.png'));
+		// 	const response = await sendRecieveMessage(webview, { src: imagePath.toString() });
+		// 	assert.strictEqual(response.value, true);
+		// }
 		{
 			const imagePath = webview.webview.asWebviewUri(workspaceFile('no-such-image.png'));
 			const response = await sendRecieveMessage(webview, { src: imagePath.toString() });
diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts
@@ -154,7 +154,7 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web
 							authority: extensionLocation.authority,
 							path: '/vscode-resource',
 							query: JSON.stringify({
-								requestResourcePath: encodeURIComponent(uri.path).replace(/%2F/g, '/').replace(/%25/g, '%')
+								requestResourcePath: uri.path
 							})
 						});
 					}

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ export class IFrameWebview extends BaseWebview<HTMLIFrameElement> implements Web`
`154`	`154`	`authority: extensionLocation.authority,`
`155`	`155`	`path: '/vscode-resource',`
`156`	`156`	`query: JSON.stringify({`
`157`		`- requestResourcePath: encodeURIComponent(uri.path).replace(/%2F/g, '/').replace(/%25/g, '%')`
	`157`	`+ requestResourcePath: uri.path`
`158`	`158`	`})`
`159`	`159`	`});`
`160`	`160`	`}`