fix: force use VSCode display language in language server

close #1959
vuejs · Oct 11, 2022 · 5f1e740 · 5f1e740
1 parent 7fa4c5f
commit 5f1e740
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/extensions/vscode-vue-language-features/src/common.ts b/extensions/vscode-vue-language-features/src/common.ts
@@ -260,6 +260,7 @@ function getInitializationOptions(
 		vitePress: {
 			processMdFile: processMd(),
 		},
+		__language: vscode.env.language,
 	};
 	return initializationOptions;
 }
diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
@@ -123,7 +123,7 @@ export function createCommonLanguageServer(
 		const ts = runtimeEnv.loadTypescript(options.typescript.tsdk);
 		fsHost = runtimeEnv.createFileSystemHost(ts, params.capabilities);
 
-		const tsLocalized = params.locale ? runtimeEnv.loadTypescriptLocalized(options.typescript.tsdk, params.locale) : undefined;
+		const tsLocalized = params.locale ? runtimeEnv.loadTypescriptLocalized(options.typescript.tsdk, options.__language ?? params.locale) : undefined;
 		const cancelTokenHost = createCancellactionTokenHost(options.cancellationPipeName);
 		const _projects = createWorkspaces(
 			runtimeEnv,

diff --git a/packages/language-server/src/types.ts b/packages/language-server/src/types.ts
@@ -113,4 +113,6 @@ export interface LanguageServerInitializationOptions {
 	 * https://github.com/Microsoft/TypeScript/wiki/Standalone-Server-%28tsserver%29#cancellation
 	 */
 	cancellationPipeName?: string;
+	// temporary workaround to fix https://github.com/johnsoncodehk/volar/issues/1959
+	__language?: string;
 }