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

Make sure asWebviewUri also handles replacing commit

Browse Source
This commit is contained in:
Matt Bierner
2019-09-12 16:07:02 -07:00
parent f22a2b8143
commit 54ac29790e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,9 @@ export class ExtHostWebview implements vscode.Webview {
}
public get cspSource(): string {
return this._initData.webviewCspSource.replace('{{uuid}}', this._handle);
return this._initData.webviewCspSource
.replace('{{uuid}}', this._handle)
.replace('{{commit}}', this._initData.commit || '211fa02efe8c041fd7baa8ec3dce199d5185aa44');
}
public get html(): string {

5
src/vs/workbench/api/common/shared/webview.ts
View File

@@ -7,6 +7,7 @@ import { URI } from 'vs/base/common/uri';
import * as vscode from 'vscode';
export interface WebviewInitData {
readonly commit?: string;
readonly webviewResourceRoot: string;
readonly webviewCspSource: string;
}
@@ -14,11 +15,11 @@ export interface WebviewInitData {
export function asWebviewUri(
initData: WebviewInitData,
uuid: string,
resource: vscode.Uri
resource: vscode.Uri,
): vscode.Uri {
const uri = initData.webviewResourceRoot
.replace('{{commit}}', initData.commit || '211fa02efe8c041fd7baa8ec3dce199d5185aa44')
.replace('{{resource}}', resource.toString().replace(/^\S+?:/, ''))
.replace('{{uuid}}', uuid);
return URI.parse(uri);
}