From 2db6938f52e25a804a36fa80102ca6cfbc9bdc9d Mon Sep 17 00:00:00 2001 From: Logan Ramos Date: Fri, 17 Sep 2021 10:40:35 -0400 Subject: [PATCH] Fix #133306 --- src/vs/workbench/api/browser/mainThreadEditorTabs.ts | 1 + src/vs/workbench/services/editor/browser/editorService.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts index 80648f1be1e..f4a5e3e59ec 100644 --- a/src/vs/workbench/api/browser/mainThreadEditorTabs.ts +++ b/src/vs/workbench/api/browser/mainThreadEditorTabs.ts @@ -173,6 +173,7 @@ export class MainThreadEditorTabs { case GroupChangeKind.EDITOR_CLOSE: this._onDidTabClose(event); break; + case GroupChangeKind.EDITOR_ACTIVE: case GroupChangeKind.GROUP_ACTIVE: if (this._editorGroupsService.activeGroup.id !== event.groupId) { return; diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index e93b722793b..86312225108 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -142,7 +142,6 @@ export class EditorService extends Disposable implements EditorServiceImpl { // Fire event to outside parties this._onDidActiveEditorChange.fire(); - this._onDidEditorsChange.fire([{ groupId: activeGroup.id, editor: this.lastActiveEditor, kind: GroupChangeKind.EDITOR_ACTIVE }]); } private registerGroupListeners(group: IEditorGroupView): void { @@ -151,6 +150,9 @@ export class EditorService extends Disposable implements EditorServiceImpl { groupDisposables.add(group.onDidGroupChange(e => { switch (e.kind) { case GroupChangeKind.EDITOR_ACTIVE: + if (group.activeEditor) { + this._onDidEditorsChange.fire([{ groupId: group.id, editor: group.activeEditor, kind: GroupChangeKind.EDITOR_ACTIVE }]); + } this.handleActiveEditorChange(group); this._onDidVisibleEditorsChange.fire(); break;