Delete webview input on dispose

src/vs/workbench/api/electron-browser/mainThreadWebview.ts

@@ -328,6 +328,7 @@ class WebviewEditor extends BaseWebviewEditor {
 				this.webviewContent.style.visibility = 'hidden';
 			}
 		}
+
 		super.setEditorVisible(visible, position);
 	}
 
@@ -448,7 +449,11 @@ export class MainThreadWebviews implements MainThreadWebviewsShape {
 		const webviewInput = WebviewInput.create(URI.revive(uri), title, column, options, '', {
 			onMessage: message => this._proxy.$onMessage(handle, message),
 			onDidChangePosition: position => this._proxy.$onDidChangePosition(handle, position),
-			onDispose: () => this._proxy.$onDidDisposeWeview(handle),
+			onDispose: () => {
+				this._proxy.$onDidDisposeWeview(handle).then(() => {
+					this._webviews.delete(handle);
+				});
+			},
 			onDidClickLink: (link, options) => this.onDidClickLink(link, options)
 		}, this._partService);
 

src/vs/workbench/api/node/extHost.protocol.ts

@@ -355,7 +355,7 @@ export interface MainThreadWebviewsShape extends IDisposable {
 export interface ExtHostWebviewsShape {
 	$onMessage(handle: WebviewHandle, message: any): void;
 	$onDidChangeActiveWeview(handle: WebviewHandle | undefined): void;
-	$onDidDisposeWeview(handle: WebviewHandle): void;
+	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void>;
 	$onDidChangePosition(handle: WebviewHandle, newPosition: EditorPosition): void;
 }
 

src/vs/workbench/api/node/extHostWebview.ts

@@ -150,11 +150,12 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		this._onDidChangeActiveWebview.fire(webview);
 	}
 
-	$onDidDisposeWeview(handle: WebviewHandle): void {
+	$onDidDisposeWeview(handle: WebviewHandle): Thenable<void> {
 		const webview = this._webviews.get(handle);
 		if (webview) {
 			webview.onDisposeEmitter.fire();
 		}
+		return Promise.resolve(void 0);
 	}
 
 	$onDidChangePosition(handle: WebviewHandle, newPosition: Position): void {