fix: don't show outline for json document

close #2573
vuejs · Apr 15, 2023 · 9b5c6dc · 9b5c6dc
1 parent 92b392b
commit 9b5c6dc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/vscode-vue/src/common.ts b/packages/vscode-vue/src/common.ts
@@ -66,14 +66,14 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 		createLc(
 			'vue-semantic-server',
 			'Vue Semantic Server',
-			getDocumentSelector(context),
+			getDocumentSelector(context, ServerMode.PartialSemantic),
 			await getInitializationOptions(ServerMode.PartialSemantic, context),
 			6009,
 		),
 		createLc(
 			'vue-syntactic-server',
 			'Vue Syntactic Server',
-			getDocumentSelector(context),
+			getDocumentSelector(context, ServerMode.Syntactic),
 			await getInitializationOptions(ServerMode.Syntactic, context),
 			6011,
 		)
@@ -183,19 +183,27 @@ export function deactivate(): Thenable<any> | undefined {
 	]);
 }
 
-export function getDocumentSelector(context: vscode.ExtensionContext) {
+export function getDocumentSelector(context: vscode.ExtensionContext, serverMode: ServerMode) {
 	const takeOverMode = takeOverModeActive(context);
 	const langs = takeOverMode ? [
 		'vue',
 		'javascript',
 		'typescript',
 		'javascriptreact',
 		'typescriptreact',
-		'json',
-		// 'jsonc',
 	] : [
 		'vue',
 	];
+	if (
+		takeOverMode
+		&& (
+			serverMode === ServerMode.Semantic
+			|| serverMode === ServerMode.PartialSemantic
+		)
+	) { // #2573
+		langs.push('json');
+		// langs.push('jsonc');
+	}
 	if (processHtml()) {
 		langs.push('html');
 	}

diff --git a/packages/vscode-vue/src/nodeClientMain.ts b/packages/vscode-vue/src/nodeClientMain.ts
@@ -5,11 +5,12 @@ import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageclient/node';
 import { activate as commonActivate, deactivate as commonDeactivate, getDocumentSelector } from './common';
 import { middleware } from './middleware';
+import { ServerMode } from '@volar/vue-language-server';
 
 export function activate(context: vscode.ExtensionContext) {
 
 	const cancellationPipeName = path.join(os.tmpdir(), `vscode-${context.extension.id}-cancellation-pipe.tmp`);
-	const langs = getDocumentSelector(context);
+	const langs = getDocumentSelector(context, ServerMode.Semantic);
 	let cancellationPipeUpdateKey: string | undefined;
 
 	vscode.workspace.onDidChangeTextDocument((e) => {