From 59ccce16da6bb5583e0fdf5658993a2714589ad6 Mon Sep 17 00:00:00 2001 From: Logan Ramos Date: Mon, 14 Jun 2021 10:19:05 -0400 Subject: [PATCH] Better active editor check logic --- .../services/editor/browser/editorOverrideService.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/services/editor/browser/editorOverrideService.ts b/src/vs/workbench/services/editor/browser/editorOverrideService.ts index 35d8235f48e..53f2f567911 100644 --- a/src/vs/workbench/services/editor/browser/editorOverrideService.ts +++ b/src/vs/workbench/services/editor/browser/editorOverrideService.ts @@ -124,12 +124,9 @@ export class EditorOverrideService extends Disposable implements IEditorOverride } // If it's the currently active editor we shouldn't do anything - const currentEditor = firstOrDefault(group.findEditors(resource)); - let currentViewType = undefined; - if (currentEditor) { - currentViewType = (currentEditor as IRegisteredEditorInput).viewType; - } - if (currentViewType && selectedEditor.editorInfo.id === currentViewType) { + const currentEditors = group.findEditors(resource); + const isActive = currentEditors.find(editor => (editor as IRegisteredEditorInput).viewType === selectedEditor.editorInfo.id); + if (isActive) { return OverrideStatus.ABORT; } const input = await this.doOverrideEditorInput(resource, editor, options, group, selectedEditor);