Make sure we dispose of webviews in correct order

Fixes #85621

We must fire the the dispose event before  disposing of the event
This commit is contained in:
Matt Bierner
2019-11-26 11:48:52 -08:00
parent 776c33ac41
commit a8158aee89
2 changed files with 6 additions and 6 deletions

View File

@@ -334,16 +334,16 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma
disposables.add(input.webview.onDidClickLink((uri: URI) => this.onDidClickLink(handle, uri)));
disposables.add(input.webview.onMessage((message: any) => { this._proxy.$onMessage(handle, message); }));
disposables.add(input.onDisposeWebview(() => {
this._proxy.$onDidDisposeWebviewPanel(handle).finally(() => {
this._webviewInputs.delete(handle);
});
}));
disposables.add(input.webview.onMissingCsp((extension: ExtensionIdentifier) => this._proxy.$onMissingCsp(handle, extension.value)));
input.onDispose(() => {
disposables.dispose();
});
input.onDisposeWebview(() => {
this._proxy.$onDidDisposeWebviewPanel(handle).finally(() => {
this._webviewInputs.delete(handle);
});
});
}
private updateWebviewViewStates() {