chore(language-server): use in-place parsed command line options

vuejs · Dec 20, 2023 · cb09244 · cb09244
1 parent 8371314
commit cb09244
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 101 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -643,7 +643,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "2.0.0-alpha.9",
+		"@volar/vscode": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.25",
 		"@vue/language-server": "1.8.25",
 		"esbuild": "latest",

diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
 	"devDependencies": {
 		"@lerna-lite/cli": "latest",
 		"@lerna-lite/publish": "latest",
-		"@volar/language-service": "2.0.0-alpha.9",
+		"@volar/language-service": "2.0.0-alpha.10",
 		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"

diff --git a/packages/component-meta/package.json b/packages/component-meta/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.9",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.25",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "1.8.25"

diff --git a/packages/language-core/package.json b/packages/language-core/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.9",
+		"@volar/language-core": "2.0.0-alpha.10",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/shared": "^3.3.0",
 		"computeds": "^0.0.1",

diff --git a/packages/language-plugin-pug/package.json b/packages/language-plugin-pug/package.json
@@ -17,7 +17,7 @@
 		"@vue/language-core": "1.8.25"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.0.0-alpha.9",
+		"@volar/source-map": "2.0.0-alpha.10",
 		"volar-service-pug": "0.0.24"
 	}
 }
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
@@ -16,9 +16,9 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.9",
-		"@volar/language-server": "2.0.0-alpha.9",
-		"@volar/typescript": "2.0.0-alpha.9",
+		"@volar/language-core": "2.0.0-alpha.10",
+		"@volar/language-server": "2.0.0-alpha.10",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.25",
 		"@vue/language-service": "1.8.25",
 		"vscode-languageserver-protocol": "^3.17.5",

diff --git a/packages/language-server/src/nodeServer.ts b/packages/language-server/src/nodeServer.ts
@@ -41,17 +41,19 @@ connection.onInitialize(params => {
 			},
 			async getProjectSetup(serviceEnv, projectContext) {
 				const ts = getTsLib();
-				const vueOptions = await getVueCompilerOptions();
+				const [commandLine, vueOptions] = await parseCommandLine();
 				envToVueOptions.set(serviceEnv, vue.resolveVueCompilerOptions(vueOptions));
 				const services = vue.resolveServices(ts, {}, vueOptions);
-				const languages = vue.resolveLanguages(ts, {}, projectContext.typescript?.parsedCommandLine.options ?? {}, vueOptions, options.codegenStack);
+				const languages = vue.resolveLanguages(ts, {}, commandLine?.options ?? {}, vueOptions, options.codegenStack);
+
 				return {
 					languagePlugins: Object.values(languages),
 					servicePlugins: Object.values(services),
 				};
 
-				async function getVueCompilerOptions() {
+				async function parseCommandLine() {
 
+					let commandLine: vue2.ParsedCommandLine | undefined;
 					let vueOptions: Partial<vue.VueCompilerOptions> = {};
 
 					if (projectContext.typescript) {
@@ -62,22 +64,22 @@ connection.onInitialize(params => {
 						while (sysVersion !== newSysVersion) {
 							sysVersion = newSysVersion;
 							if (projectContext.typescript.configFileName) {
-								vueOptions = vue2.createParsedCommandLine(ts, sys, projectContext.typescript.configFileName).vueOptions;
-							}
-							else {
-								vueOptions = vue2.createParsedCommandLineByJson(ts, sys, serviceEnv.uriToFileName(serviceEnv.workspaceFolder.uri.toString()), projectContext.typescript.parsedCommandLine.options).vueOptions;
+								commandLine = vue2.createParsedCommandLine(ts, sys, projectContext.typescript.configFileName);
 							}
 							newSysVersion = await sys.sync();
 						}
 					}
 
+					if (commandLine) {
+						vueOptions = commandLine.vueOptions;
+					}
 					vueOptions.extensions = [
 						...vueOptions.extensions ?? ['.vue'],
 						...vueFileExtensions.map(ext => '.' + ext),
 					];
 					vueOptions.extensions = [...new Set(vueOptions.extensions)];
 
-					return vueOptions;
+					return [commandLine, vueOptions] as const;
 				}
 			},
 		},

diff --git a/packages/language-service/package.json b/packages/language-service/package.json
@@ -17,9 +17,9 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.9",
-		"@volar/language-service": "2.0.0-alpha.9",
-		"@volar/typescript": "2.0.0-alpha.9",
+		"@volar/language-core": "2.0.0-alpha.10",
+		"@volar/language-service": "2.0.0-alpha.10",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/language-core": "1.8.25",
 		"@vue/shared": "^3.3.0",
@@ -39,7 +39,7 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "2.0.0-alpha.9",
+		"@volar/kit": "2.0.0-alpha.10",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	}

diff --git a/packages/tsc/package.json b/packages/tsc/package.json
@@ -17,7 +17,7 @@
 		"vue-tsc": "./bin/vue-tsc.js"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.9",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.25"
 	},
 	"peerDependencies": {

diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
@@ -13,7 +13,7 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "2.0.0-alpha.9",
+		"@volar/typescript": "2.0.0-alpha.10",
 		"@vue/language-core": "1.8.25"
 	}
 }