Fix webview special paths for resources and re-enable test

Fixes #103419
microsoft · Jul 28, 2020 · 7493065 · 7493065
1 parent 9d72fcb
commit 7493065
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
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,12 +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%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/extensions/vscode-api-tests/testWorkspace/image%.png b/extensions/vscode-api-tests/testWorkspace/image%.png
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: uri.path
+								requestResourcePath: encodeURIComponent(uri.path).replace(/%2F/g, '/').replace(/%25/g, '%')
 							})
 						});
 					}