Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 00:59:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use extension location instead of remote for asWebviewUri

Browse Source
This commit is contained in:
Matt Bierner
2021-05-20 10:32:36 -07:00
parent 0b355ffc89
commit 2270c36cff
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/common/extHostWebview.ts
View File

@@ -5,6 +5,7 @@
import { VSBuffer } from 'vs/base/common/buffer';
import { Emitter, Event } from 'vs/base/common/event';
import { Schemas } from 'vs/base/common/network';
import { URI } from 'vs/base/common/uri';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { normalizeVersion, parseVersion } from 'vs/platform/extensions/common/extensionValidator';
@@ -69,7 +70,10 @@ export class ExtHostWebview implements vscode.Webview {
public asWebviewUri(resource: vscode.Uri): vscode.Uri {
this.#hasCalledAsWebviewUri = true;
return asWebviewUri(this.#handle, resource, this.#initData.remote.authority);
const remoteAuthority = this.#extension.extensionLocation.scheme === Schemas.vscodeRemote
? this.#initData.remote.authority
: undefined;
return asWebviewUri(this.#handle, resource, remoteAuthority);
}
public get cspSource(): string {