From b31befa9825414efd18885764f288311d6bff645 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 3 Mar 2020 22:03:58 -0800 Subject: [PATCH] Fix merge conflicts --- src/vs/workbench/api/browser/mainThreadWebview.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/browser/mainThreadWebview.ts b/src/vs/workbench/api/browser/mainThreadWebview.ts index 6a123b32915..030049a1ec5 100644 --- a/src/vs/workbench/api/browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/browser/mainThreadWebview.ts @@ -125,15 +125,19 @@ export class MainThreadWebviews extends Disposable implements extHostProtocol.Ma super(); this._proxy = context.getProxy(extHostProtocol.ExtHostContext.ExtHostWebviews); + this._register(_editorService.onDidActiveEditorChange(() => { - let activeInput = this._editorService.activeControl?.input; + const activeInput = this._editorService.activeEditor; if (activeInput instanceof DiffEditorInput && activeInput.master instanceof WebviewInput && activeInput.details instanceof WebviewInput) { this.registerWebviewFromDiffEditorListeners(activeInput); } this.updateWebviewViewStates(activeInput); })); - this._register(_editorService.onDidVisibleEditorsChange(() => this.updateWebviewViewStates(this._editorService.activeControl?.input))); + + this._register(_editorService.onDidVisibleEditorsChange(() => { + this.updateWebviewViewStates(this._editorService.activeEditor); + })); // This reviver's only job is to activate webview panel extensions // This should trigger the real reviver to be registered from the extension host side. -- GitLab