Fix local resources in webview views

mjbvz · mjbvz · commit c50b5acd3771 · 2020-08-21T16:42:31.000-07:00
Ensure we use the correct id for identifying the webview internally
diff --git a/src/vs/workbench/api/browser/mainThreadWebviewViews.ts b/src/vs/workbench/api/browser/mainThreadWebviewViews.ts
@@ -45,7 +45,7 @@ export class MainThreadWebviewsViews extends Disposable {
 			resolve: async (webviewView: WebviewView, cancellation: CancellationToken) => {
 				this._webviewViews.set(viewType, webviewView);
 
-				const handle = viewType;
+				const handle = webviewView.webview.id;
 				this.mainThreadWebviews.addWebview(handle, webviewView.webview);
 
 				let state = undefined;
diff --git a/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts b/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts
@@ -81,8 +81,7 @@ export abstract class BaseWebview<T extends HTMLElement> extends Disposable {
 	protected content: WebviewContent;
 
 	constructor(
-		// TODO: matb, this should not be protected. The only reason it needs to be is that the base class ends up using it in the call to createElement
-		protected readonly id: string,
+		public readonly id: string,
 		options: WebviewOptions,
 		contentOptions: WebviewContentOptions,
 		public readonly extension: WebviewExtensionDescription | undefined,
diff --git a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts
@@ -39,7 +39,7 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewOv
 	private _findWidgetVisible: IContextKey<boolean>;
 
 	public constructor(
-		private readonly id: string,
+		public readonly id: string,
 		initialOptions: WebviewOptions,
 		initialContentOptions: WebviewContentOptions,
 		public readonly extension: WebviewExtensionDescription | undefined,
diff --git a/src/vs/workbench/contrib/webview/browser/webview.ts b/src/vs/workbench/contrib/webview/browser/webview.ts
@@ -86,6 +86,9 @@ export interface IDataLinkClickEvent {
 }
 
 export interface Webview extends IDisposable {
+
+	readonly id: string;
+
 	html: string;
 	contentOptions: WebviewContentOptions;
 	localResourcesRoot: URI[];

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ export interface IDataLinkClickEvent {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`export interface Webview extends IDisposable {`
	`89`	`+`
	`90`	`+ readonly id: string;`
	`91`	`+`
`89`	`92`	`html: string;`
`90`	`93`	`contentOptions: WebviewContentOptions;`
`91`	`94`	`localResourcesRoot: URI[];`