diff --git a/extensions/vscode-vue-language-features/src/common.ts b/extensions/vscode-vue-language-features/src/common.ts index 066cd5105..f7001a9fb 100644 --- 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 index f266e025c..f0311d87e 100644 --- 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 index ae92a87c0..ff9b1dea7 100644 --- 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; }