editors - only close disposed editors (microsoft#186736) (microsoft#186886)

Author: bpasero

src/vs/workbench/browser/parts/editor/editorGroupView.ts

@@ -665,15 +665,25 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
 		this.disposedEditorsWorker.work(editor);
 	}
 
-	private handleDisposedEditors(editors: EditorInput[]): void {
+	private handleDisposedEditors(disposedEditors: EditorInput[]): void {
 
 		// Split between visible and hidden editors
 		let activeEditor: EditorInput | undefined;
 		const inactiveEditors: EditorInput[] = [];
-		for (const editor of editors) {
+		for (const disposedEditor of disposedEditors) {
+			const editorFindResult = this.model.findEditor(disposedEditor);
+			if (!editorFindResult) {
+				continue; // not part of the model anymore
+			}
+
+			const editor = editorFindResult[0];
+			if (!editor.isDisposed()) {
+				continue; // editor got reopened meanwhile
+			}
+
 			if (this.model.isActive(editor)) {
 				activeEditor = editor;
-			} else if (this.model.contains(editor)) {
+			} else {
 				inactiveEditors.push(editor);
 			}
 		}

src/vs/workbench/common/editor/editorGroupModel.ts

@@ -869,7 +869,7 @@ export class EditorGroupModel extends Disposable {
 		}
 	}
 
-	indexOf(candidate: EditorInput | null, editors = this.editors, options?: IMatchEditorOptions): number {
+	indexOf(candidate: EditorInput | IUntypedEditorInput | null, editors = this.editors, options?: IMatchEditorOptions): number {
 		let index = -1;
 		if (!candidate) {
 			return index;
@@ -894,7 +894,7 @@ export class EditorGroupModel extends Disposable {
 		return index;
 	}
 
-	private findEditor(candidate: EditorInput | null, options?: IMatchEditorOptions): [EditorInput, number /* index */] | undefined {
+	findEditor(candidate: EditorInput | null, options?: IMatchEditorOptions): [EditorInput, number /* index */] | undefined {
 		const index = this.indexOf(candidate, this.editors, options);
 		if (index === -1) {
 			return undefined;
@@ -912,13 +912,7 @@ export class EditorGroupModel extends Disposable {
 	}
 
 	contains(candidate: EditorInput | IUntypedEditorInput, options?: IMatchEditorOptions): boolean {
-		for (const editor of this.editors) {
-			if (this.matches(editor, candidate, options)) {
-				return true;
-			}
-		}
-
-		return false;
+		return this.indexOf(candidate, this.editors, options) !== -1;
 	}
 
 	private matches(editor: EditorInput | null, candidate: EditorInput | IUntypedEditorInput | null, options?: IMatchEditorOptions): boolean {

src/vs/workbench/test/browser/parts/editor/editorGroupModel.test.ts

@@ -814,6 +814,7 @@ suite('EditorGroupModel', () => {
 
 		assert.strictEqual(group.count, 1);
 		assert.strictEqual(group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE).length, 1);
+		assert.strictEqual(group.findEditor(input1)![0], input1);
 		assert.strictEqual(group.activeEditor, input1);
 		assert.strictEqual(group.isActive(input1), true);
 		assert.strictEqual(group.isPinned(input1), true);
@@ -827,6 +828,7 @@ suite('EditorGroupModel', () => {
 		assert.strictEqual(events.activated[0].editorIndex, 0);
 
 		const index = group.indexOf(input1);
+		assert.strictEqual(group.findEditor(input1)![1], index);
 		let event = group.closeEditor(input1, EditorCloseContext.UNPIN);
 		assert.strictEqual(event?.editor, input1);
 		assert.strictEqual(event?.editorIndex, index);