maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Restore old style vscode-resouce rewriting

Browse source 
For https://github.com/mhutchie/vscode-git-graph/issues/305

This was removed when switching over to the `vscode-webview-resource` since it handles the rewritting on the html input instead of for each request
This commit is contained in:
Matt Bierner 2020-06-02 14:45:53 -07:00
parent 1ef3656f76
commit 8e45a2f4b5
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/platform/webview/common/resourceLoader.ts
View file

@ -124,12 +124,18 @@ function normalizeRequestPath(requestUri: URI) {
fragment: requestUri.fragment
});
} else if (requestUri.scheme === Schemas.oldVscodeWebviewResource) {
// The `vscode-resource` puts the scheme as the authority
const resourceUri = URI.parse(`${requestUri.authority}:${encodeURIComponent(requestUri.path).replace(/%2F/g, '/')}`);
return resourceUri.with({
query: requestUri.query,
fragment: requestUri.fragment
});
// Modern `vscode-resource` uris puts the scheme as the authority
if (requestUri.authority) {
const resourceUri = URI.parse(`${requestUri.authority}:${encodeURIComponent(requestUri.path).replace(/%2F/g, '/')}`);
return resourceUri.with({
query: requestUri.query,
fragment: requestUri.fragment
});
}
// Old style vscode-resource uris lose the scheme of the resource which means they are unable to
// load a mix of local and remote content properly.
return requestUri.with({ scheme: 'file' });
} else {
return requestUri;
}