aux window - do not merge empty groups on window close

bpasero · bpasero · commit 877c92fa3406 · 2023-11-30T09:18:50.000+01:00
diff --git a/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts b/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.ts
@@ -220,7 +220,7 @@ class AuxiliaryEditorPartImpl extends EditorPart implements IAuxiliaryEditorPart
 	}
 
 	private doClose(mergeGroupsToMainPart: boolean): void {
-		if (mergeGroupsToMainPart) {
+		if (mergeGroupsToMainPart && this.groups.some(group => group.count > 0)) {
 			this.mergeAllGroups(this.editorPartsView.mainPart.activeGroup);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ class AuxiliaryEditorPartImpl extends EditorPart implements IAuxiliaryEditorPart`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`private doClose(mergeGroupsToMainPart: boolean): void {`
`223`		`- if (mergeGroupsToMainPart) {`
	`223`	`+ if (mergeGroupsToMainPart && this.groups.some(group => group.count > 0)) {`
`224`	`224`	`this.mergeAllGroups(this.editorPartsView.mainPart.activeGroup);`
`225`	`225`	`}`
`226`	`226`