fix: typescript plugin not working

close #1173
vuejs · Apr 12, 2022 · 9db4518 · 9db4518
1 parent 5d05dd6
commit 9db4518
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -3,13 +3,29 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "Launch Client",
+			"name": "Launch Vue Language Features",
 			"type": "extensionHost",
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--disable-extensions",
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-vue-language-features",
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-vue-language-features"
+			],
+			"outFiles": [
+				"${workspaceRoot}/extensions/*/out/**/*.js",
+				"${workspaceRoot}/packages/*/out/**/*.js"
+			],
+			"preLaunchTask": {
+				"type": "npm",
+				"script": "watch"
+			}
+		},
+		{
+			"type": "extensionHost",
+			"request": "launch",
+			"name": "Launch TypeScript Vue Plugin",
+			"runtimeExecutable": "${execPath}",
+			"args": [
 				"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-typescript-vue-plugin"
 			],
 			"outFiles": [
@@ -71,15 +87,4 @@
 			]
 		}
 	],
-	"compounds": [
-		{
-			"name": "Client + Server",
-			"configurations": [
-				"Launch Client",
-				"Attach to Langauge Features Server",
-				"Attach to Second Language Features Server",
-				"Attach to Document Features Server"
-			]
-		}
-	]
 }
diff --git a/packages/typescript-vue-plugin/src/index.ts b/packages/typescript-vue-plugin/src/index.ts
@@ -9,10 +9,9 @@ const init: ts.server.PluginModuleFactory = (modules) => {
 	const pluginModule: ts.server.PluginModule = {
 		create(info) {
 
-			const files = info.project.getScriptFileNames();
-			const hasVueFile = files.some(file => file.endsWith('.vue'));
+			const proxyHost = createProxyHost(ts, info);
 
-			if (!hasVueFile) {
+			if (proxyHost.getVueFiles().length === 0) {
 				return info.languageService;
 			}
 
@@ -29,7 +28,6 @@ const init: ts.server.PluginModuleFactory = (modules) => {
 				}
 			};
 
-			const proxyHost = createProxyHost(ts, info);
 			const vueCompilerOptions = proxyHost.host.getVueCompilationSettings?.() ?? {};
 			const tsRuntime = vue.createTypeScriptRuntime({
 				typescript: ts,