@vue/language-server 2.0.7 → 2.0.10

package/node.js

@@ -17,8 +17,8 @@ exports.connection.listen();
 exports.connection.onInitialize(async (params) => {
     const options = params.initializationOptions;
     const hybridMode = options.vue?.hybridMode ?? true;
-    tsdk = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
     const vueFileExtensions = ['vue'];
+    tsdk = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
     if (options.vue?.additionalExtensions) {
         for (const additionalExtension of options.vue.additionalExtensions) {
             vueFileExtensions.push(additionalExtension);
@@ -34,6 +34,20 @@ exports.connection.onInitialize(async (params) => {
         ? (0, node_1.createSimpleProjectProviderFactory)()
         : (0, node_1.createTypeScriptProjectProviderFactory)(tsdk.typescript, tsdk.diagnosticMessages), {
         watchFileExtensions: ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json', ...vueFileExtensions],
+        getLanguageId(uri) {
+            if (vueFileExtensions.some(ext => uri.endsWith(`.${ext}`))) {
+                if (uri.endsWith('.html')) {
+                    return 'html';
+                }
+                else if (uri.endsWith('.md')) {
+                    return 'markdown';
+                }
+                else {
+                    return 'vue';
+                }
+            }
+            return (0, language_core_1.resolveCommonLanguageId)(uri);
+        },
         getServicePlugins() {
             return (0, language_service_1.createVueServicePlugins)(tsdk.typescript, env => envToVueOptions.get(env), getTsPluginClient, hybridMode);
         },
@@ -41,24 +55,11 @@ exports.connection.onInitialize(async (params) => {
             const commandLine = await parseCommandLine();
             const vueOptions = commandLine?.vueOptions ?? (0, language_core_1.resolveVueCompilerOptions)({});
             for (const ext of vueFileExtensions) {
-                if (vueOptions.extensions.includes(`.${ext}`)) {
+                if (!vueOptions.extensions.includes(`.${ext}`)) {
                     vueOptions.extensions.push(`.${ext}`);
                 }
             }
-            const vueLanguagePlugin = (0, language_core_1.createVueLanguagePlugin)(tsdk.typescript, serviceEnv.typescript.uriToFileName, fileName => {
-                if (projectContext.typescript?.sys.useCaseSensitiveFileNames ?? false) {
-                    return projectContext.typescript?.host.getScriptFileNames().includes(fileName) ?? false;
-                }
-                else {
-                    const lowerFileName = fileName.toLowerCase();
-                    for (const rootFile of projectContext.typescript?.host.getScriptFileNames() ?? []) {
-                        if (rootFile.toLowerCase() === lowerFileName) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            }, commandLine?.options ?? {}, vueOptions, options.codegenStack);
+            const vueLanguagePlugin = (0, language_core_1.createVueLanguagePlugin)(tsdk.typescript, serviceEnv.typescript.uriToFileName, projectContext.typescript?.sys.useCaseSensitiveFileNames ?? false, () => projectContext.typescript?.host.getProjectVersion?.() ?? '', () => projectContext.typescript?.host.getScriptFileNames() ?? [], commandLine?.options ?? {}, vueOptions, options.codegenStack);
             envToVueOptions.set(serviceEnv, vueOptions);
             return [vueLanguagePlugin];
             async function parseCommandLine() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.0.7",
+	"version": "2.0.10",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,12 +15,12 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.1.3",
-		"@volar/language-server": "~2.1.3",
-		"@vue/language-core": "2.0.7",
-		"@vue/language-service": "2.0.7",
-		"@vue/typescript-plugin": "2.0.7",
+		"@volar/language-core": "~2.2.0-alpha.5",
+		"@volar/language-server": "~2.2.0-alpha.5",
+		"@vue/language-core": "2.0.10",
+		"@vue/language-service": "2.0.10",
+		"@vue/typescript-plugin": "2.0.10",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "4a37e8f3ebcf31ecfd2ea627f7611d5990ec5df6"
+	"gitHead": "a20a2ee950b63a949660b7e8faf0faed0e5bad33"
 }