development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix webview special paths for resources and re-enable test

Browse source 
Fixes #103419
This commit is contained in:
Matt Bierner 2020-07-27 16:37:42 -07:00
parent 9d72fcb0ae
commit 7493065766
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts
View file

@ -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() });

BIN
extensions/vscode-api-tests/testWorkspace/image%.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

2
src/vs/workbench/contrib/webview/browser/webviewElement.ts
View file

@ -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, '%')
})
});
}