fix: unfold all when join editors

close #1887
vuejs · Nov 29, 2022 · 5d4c3ff · 5d4c3ff
1 parent e2f343b
commit 5d4c3ff
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/extensions/vscode-vue-language-features/src/features/splitEditors.ts b/extensions/vscode-vue-language-features/src/features/splitEditors.ts
@@ -59,9 +59,16 @@ export function register(context: vscode.ExtensionContext, client: BaseLanguageC
 			rightBlocks = rightBlocks.concat(descriptor.customBlocks);
 		}
 
-		await foldingBlocks(leftBlocks);
-		await vscode.commands.executeCommand('workbench.action.toggleSplitEditorInGroup');
-		await foldingBlocks(rightBlocks);
+		await vscode.commands.executeCommand('workbench.action.joinEditorInGroup');
+
+		if (vscode.window.activeTextEditor === editor) {
+			await foldingBlocks(leftBlocks);
+			await vscode.commands.executeCommand('workbench.action.toggleSplitEditorInGroup');
+			await foldingBlocks(rightBlocks);
+		}
+		else {
+			await vscode.commands.executeCommand('editor.unfoldAll');
+		}
 
 		async function foldingBlocks(blocks: SFCBlock[]) {