diff --git a/packages/typescript-vue-plugin/src/index.ts b/packages/typescript-vue-plugin/src/index.ts index ee74a1447..bf7652122 100644 --- a/packages/typescript-vue-plugin/src/index.ts +++ b/packages/typescript-vue-plugin/src/index.ts @@ -25,8 +25,8 @@ const init: ts.server.PluginModuleFactory = (modules) => { const proxyHost = createProxyHost(ts, info); const services = createBasicRuntime(); - const compilerOptions = proxyHost.host.getVueCompilationSettings?.() ?? {}; - const tsRuntime = vue.createTypeScriptRuntime({ typescript: ts, ...services, compilerOptions }, proxyHost.host, true); + const vueCompilerOptions = proxyHost.host.getVueCompilationSettings?.() ?? {}; + const tsRuntime = vue.createTypeScriptRuntime({ typescript: ts, ...services, vueCompilerOptions }, proxyHost.host, true); const _tsPluginApis = apis.register(tsRuntime.context); const tsPluginProxy: Partial = { getSemanticDiagnostics: tsRuntime.apiHook(tsRuntime.context.scriptTsLsRaw.getSemanticDiagnostics, false), diff --git a/packages/vue-language-service/src/documentService.ts b/packages/vue-language-service/src/documentService.ts index d41e8b829..039cee036 100644 --- a/packages/vue-language-service/src/documentService.ts +++ b/packages/vue-language-service/src/documentService.ts @@ -93,7 +93,7 @@ export function getDocumentService( ].map(patchHtmlFormat); const context: DocumentServiceRuntimeContext = { - compilerOptions: {}, + vueCompilerOptions: {}, typescript: ts, ...services, getVueDocument, @@ -153,7 +153,7 @@ export function getDocumentService( document.version.toString(), context.htmlLs, context.compileTemplate, - context.compilerOptions, + context.vueCompilerOptions, context.typescript, context.getCssVBindRanges, context.getCssClasses, diff --git a/packages/vue-language-service/src/languageService.ts b/packages/vue-language-service/src/languageService.ts index 4fe1c101c..ef20259de 100644 --- a/packages/vue-language-service/src/languageService.ts +++ b/packages/vue-language-service/src/languageService.ts @@ -106,12 +106,12 @@ export function createLanguageService( }>, ) { - const compilerOptions = vueHost.getVueCompilationSettings?.() ?? {}; + const vueCompilerOptions = vueHost.getVueCompilationSettings?.() ?? {}; const services = createBasicRuntime(); const tsRuntime = createTypeScriptRuntime({ typescript: ts, ...services, - compilerOptions, + vueCompilerOptions, }, vueHost, false); const blockingRequests = new Set>(); const tsTriggerCharacters = getTsTriggerCharacters(ts.version); @@ -274,7 +274,7 @@ export function createLanguageService( ...services, ...tsRuntime.context, typescript: ts, - compilerOptions, + vueCompilerOptions, getTextDocument: tsRuntime.getHostDocument, getPlugins: lsType => { let plugins = [ diff --git a/packages/vue-tsc/src/proxy.ts b/packages/vue-tsc/src/proxy.ts index 2b5117440..fd6028705 100644 --- a/packages/vue-tsc/src/proxy.ts +++ b/packages/vue-tsc/src/proxy.ts @@ -38,7 +38,7 @@ export function createProgramProxy( getProjectReferences: () => options.projectReferences, }; const services = createBasicRuntime(); - const tsRuntime = createTypeScriptRuntime({ typescript: ts, ...services, compilerOptions: vueCompilerOptions }, vueLsHost, false); + const tsRuntime = createTypeScriptRuntime({ typescript: ts, ...services, vueCompilerOptions }, vueLsHost, false); const tsProgram = tsRuntime.context.scriptTsLsRaw.getProgram(); // TODO: handle template ls? if (!tsProgram) throw '!tsProgram'; diff --git a/packages/vue-typescript/src/types.ts b/packages/vue-typescript/src/types.ts index 856152bb9..6b74243e8 100644 --- a/packages/vue-typescript/src/types.ts +++ b/packages/vue-typescript/src/types.ts @@ -31,7 +31,7 @@ export interface VueCompilerOptions { export type BasicRuntimeContext = { typescript: typeof import('typescript/lib/tsserverlibrary'), - compilerOptions: VueCompilerOptions, + vueCompilerOptions: VueCompilerOptions, compileTemplate(templateTextDocument: TextDocument): { htmlTextDocument: TextDocument; htmlToTemplate: (start: number, end: number) => { start: number, end: number } | undefined; diff --git a/packages/vue-typescript/src/typescriptRuntime.ts b/packages/vue-typescript/src/typescriptRuntime.ts index cef2bfbd2..09f64e0b4 100644 --- a/packages/vue-typescript/src/typescriptRuntime.ts +++ b/packages/vue-typescript/src/typescriptRuntime.ts @@ -15,7 +15,7 @@ export function createTypeScriptRuntime( typescript: typeof import('typescript/lib/tsserverlibrary'), htmlLs: html.LanguageService, compileTemplate: BasicRuntimeContext['compileTemplate'], - compilerOptions: BasicRuntimeContext['compilerOptions'], + vueCompilerOptions: BasicRuntimeContext['vueCompilerOptions'], getCssVBindRanges: BasicRuntimeContext['getCssVBindRanges'], getCssClasses: BasicRuntimeContext['getCssClasses'], }, @@ -38,7 +38,7 @@ export function createTypeScriptRuntime( const templateScriptUpdateUris = new Set(); const initProgressCallback: ((p: number) => void)[] = []; - const templateTsHost = options.compilerOptions.experimentalDisableTemplateSupport ? undefined : createTsLsHost('template'); + const templateTsHost = options.vueCompilerOptions.experimentalDisableTemplateSupport ? undefined : createTsLsHost('template'); const scriptTsHost = createTsLsHost('script'); const templateTsLsRaw = templateTsHost ? ts.createLanguageService(templateTsHost) : undefined; const scriptTsLsRaw = ts.createLanguageService(scriptTsHost); @@ -391,7 +391,7 @@ export function createTypeScriptRuntime( doc.version.toString(), options.htmlLs, options.compileTemplate, - options.compilerOptions, + options.vueCompilerOptions, options.typescript, options.getCssVBindRanges, options.getCssClasses,