@vue/language-service 2.0.4 → 2.0.6

package/lib/plugins/vue-sfc.js

@@ -142,7 +142,6 @@ function create() {
                             ...formatSettings,
                             unformatted: '',
                             contentUnformatted: blockTypes.join(','),
-                            extraLiners: blockTypes.join(','),
                             endWithNewline: options.insertFinalNewline ? true
                                 : options.trimFinalNewlines ? false
                                     : document.getText().endsWith('\n'),

package/lib/plugins/vue-template.js

@@ -9,10 +9,12 @@ const html = require("vscode-html-languageservice");
 const nameCasing_1 = require("../ideFeatures/nameCasing");
 const types_1 = require("../types");
 const data_1 = require("./data");
+const vscode_uri_1 = require("vscode-uri");
 let builtInData;
 let modelData;
 function create(mode, ts, getVueOptions, tsPluginClient) {
     let customData = [];
+    let extraCustomData = [];
     const onDidChangeCustomDataListeners = new Set();
     const onDidChangeCustomData = (listener) => {
         onDidChangeCustomDataListeners.add(listener);
@@ -25,7 +27,10 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
     const baseServicePlugin = mode === 'pug' ? volar_service_pug_1.create : volar_service_html_1.create;
     const baseService = baseServicePlugin({
         getCustomData() {
-            return customData;
+            return [
+                ...customData,
+                ...extraCustomData,
+            ];
         },
         onDidChangeCustomData,
     });
@@ -68,8 +73,14 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
                     propModifiers[name] = disc;
                 }
             }
+            const disposable = context.env.onDidChangeConfiguration?.(() => initializing = undefined);
+            let initializing;
             return {
                 ...baseServiceInstance,
+                dispose() {
+                    baseServiceInstance.dispose?.();
+                    disposable?.dispose();
+                },
                 async provideCompletionItems(document, position, completionContext, token) {
                     if (!isSupportedDocument(document))
                         return;
@@ -195,7 +206,7 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
                     if (!isSupportedDocument(document))
                         return;
                     if (context.documents.getVirtualCodeByUri(document.uri)[0])
-                        updateCustomData([]);
+                        updateExtraCustomData([]);
                     return baseServiceInstance.provideHover?.(document, position, token);
                 },
                 async provideDiagnostics(document, token) {
@@ -244,6 +255,7 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
                 },
             };
             async function provideHtmlData(sourceDocumentUri, vueCode) {
+                await (initializing ??= initialize());
                 const casing = await (0, nameCasing_1.getNameCasing)(context, sourceDocumentUri, tsPluginClient);
                 if (builtInData.tags) {
                     for (const tag of builtInData.tags) {
@@ -266,7 +278,7 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
                 let version = 0;
                 let components;
                 let templateContextProps;
-                updateCustomData([
+                updateExtraCustomData([
                     html.newHTMLDataProvider('vue-template-built-in', builtInData),
                     {
                         getId: () => 'vue-template',
@@ -537,7 +549,28 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
                         item.sortText = '\u0001' + (item.sortText ?? item.label);
                     }
                 }
-                updateCustomData([]);
+                updateExtraCustomData([]);
+            }
+            async function initialize() {
+                customData = await getHtmlCustomData();
+            }
+            async function getHtmlCustomData() {
+                const customData = await context.env.getConfiguration?.('html.customData') ?? [];
+                const newData = [];
+                for (const customDataPath of customData) {
+                    const uri = vscode_uri_1.Utils.resolvePath(vscode_uri_1.URI.parse(context.env.workspaceFolder), customDataPath);
+                    const json = await context.env.fs?.readFile?.(uri.toString());
+                    if (json) {
+                        try {
+                            const data = JSON.parse(json);
+                            newData.push(html.newHTMLDataProvider(customDataPath, data));
+                        }
+                        catch (error) {
+                            console.error(error);
+                        }
+                    }
+                }
+                return newData;
             }
         },
     };
@@ -552,8 +585,8 @@ function create(mode, ts, getVueOptions, tsPluginClient) {
             }
         }
     }
-    function updateCustomData(extraData) {
-        customData = extraData;
+    function updateExtraCustomData(extraData) {
+        extraCustomData = extraData;
         onDidChangeCustomDataListeners.forEach(l => l());
     }
     function isSupportedDocument(document) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.0.4",
+	"version": "2.0.6",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -16,11 +16,11 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.1.0",
-		"@volar/language-service": "~2.1.0",
-		"@volar/typescript": "~2.1.0",
+		"@volar/language-core": "~2.1.2",
+		"@volar/language-service": "~2.1.2",
+		"@volar/typescript": "~2.1.2",
 		"@vue/compiler-dom": "^3.4.0",
-		"@vue/language-core": "2.0.4",
+		"@vue/language-core": "2.0.6",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
@@ -30,7 +30,7 @@
 		"volar-service-json": "0.0.31",
 		"volar-service-pug": "0.0.31",
 		"volar-service-pug-beautify": "0.0.31",
-		"volar-service-typescript": "0.0.31",
+		"volar-service-typescript": "0.0.31-patch.1",
 		"volar-service-typescript-twoslash-queries": "0.0.31",
 		"vscode-html-languageservice": "^5.1.0",
 		"vscode-languageserver-textdocument": "^1.0.11"
@@ -38,10 +38,10 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.1.0",
-		"@vue/typescript-plugin": "2.0.4",
+		"@volar/kit": "~2.1.2",
+		"@vue/typescript-plugin": "2.0.6",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "241300968fd3084c7c09139d05691a51a7800fdc"
+	"gitHead": "feb990ccec85f6330bba37c8b1d1287f0980274c"
 }