@vue/language-service 2.0.18 → 2.0.20

package/lib/plugins/vue-template.js

@@ -48,13 +48,27 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
         });
     return {
         name: `vue-template (${mode})`,
-        triggerCharacters: [
-            ...baseService.triggerCharacters ?? [],
-            '@', // vue event shorthand
-        ],
-        create(context) {
+        capabilities: {
+            ...baseService.capabilities,
+            completionProvider: {
+                triggerCharacters: [
+                    ...baseService.capabilities.completionProvider?.triggerCharacters ?? [],
+                    '@', // vue event shorthand
+                ],
+            },
+            inlayHintProvider: {},
+            hoverProvider: true,
+            diagnosticProvider: true,
+            semanticTokensProvider: {
+                legend: {
+                    tokenTypes: ['class'],
+                    tokenModifiers: [],
+                },
+            }
+        },
+        create(context, api) {
             const tsPluginClient = getTsPluginClient?.(context);
-            const baseServiceInstance = baseService.create(context);
+            const baseServiceInstance = baseService.create(context, api);
             const vueCompilerOptions = getVueOptions(context.env);
             builtInData ??= (0, data_1.loadTemplateData)(context.env.locale ?? 'en');
             modelData ??= (0, data_1.loadModelModifiersData)(context.env.locale ?? 'en');
@@ -100,7 +114,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     }
                     let sync;
                     let currentVersion;
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     if (sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) {
                         // #4298: Precompute HTMLDocument before provideHtmlData to avoid parseHTMLDocument requesting component names from tsserver
@@ -129,95 +143,94 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                         return;
                     }
                     const result = [];
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     if (!virtualCode) {
                         return;
                     }
-                    for (const map of context.documents.getMaps(virtualCode)) {
-                        const code = context.language.scripts.get(map.sourceDocument.uri)?.generated?.root;
-                        const scanner = getScanner(baseServiceInstance, document);
-                        if (code instanceof language_core_1.VueVirtualCode && scanner) {
-                            // visualize missing required props
-                            const casing = await (0, nameCasing_1.getNameCasing)(context, map.sourceDocument.uri);
-                            const components = await tsPluginClient?.getComponentNames(code.fileName) ?? [];
-                            const componentProps = {};
-                            let token;
-                            let current;
-                            while ((token = scanner.scan()) !== html.TokenType.EOS) {
-                                if (token === html.TokenType.StartTag) {
-                                    const tagName = scanner.getTokenText();
-                                    const checkTag = tagName.indexOf('.') >= 0
-                                        ? tagName
-                                        : components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
-                                    if (checkTag) {
-                                        componentProps[checkTag] ??= await tsPluginClient?.getComponentProps(code.fileName, checkTag, true) ?? [];
-                                        current = {
-                                            unburnedRequiredProps: [...componentProps[checkTag]],
-                                            labelOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
-                                            insertOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
-                                        };
-                                    }
+                    const code = context.language.scripts.get(decoded[0])?.generated?.root;
+                    const scanner = getScanner(baseServiceInstance, document);
+                    if (code instanceof language_core_1.VueVirtualCode && scanner) {
+                        // visualize missing required props
+                        const casing = await (0, nameCasing_1.getNameCasing)(context, decoded[0]);
+                        const components = await tsPluginClient?.getComponentNames(code.fileName) ?? [];
+                        const componentProps = {};
+                        let token;
+                        let current;
+                        while ((token = scanner.scan()) !== html.TokenType.EOS) {
+                            if (token === html.TokenType.StartTag) {
+                                const tagName = scanner.getTokenText();
+                                const checkTag = tagName.indexOf('.') >= 0
+                                    ? tagName
+                                    : components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
+                                if (checkTag) {
+                                    componentProps[checkTag] ??= await tsPluginClient?.getComponentProps(code.fileName, checkTag, true) ?? [];
+                                    current = {
+                                        unburnedRequiredProps: [...componentProps[checkTag]],
+                                        labelOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
+                                        insertOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
+                                    };
                                 }
-                                else if (token === html.TokenType.AttributeName) {
-                                    if (current) {
-                                        let attrText = scanner.getTokenText();
-                                        if (attrText === 'v-bind') {
-                                            current.unburnedRequiredProps = [];
+                            }
+                            else if (token === html.TokenType.AttributeName) {
+                                if (current) {
+                                    let attrText = scanner.getTokenText();
+                                    if (attrText === 'v-bind') {
+                                        current.unburnedRequiredProps = [];
+                                    }
+                                    else {
+                                        // remove modifiers
+                                        if (attrText.indexOf('.') >= 0) {
+                                            attrText = attrText.split('.')[0];
                                         }
-                                        else {
-                                            // remove modifiers
-                                            if (attrText.indexOf('.') >= 0) {
-                                                attrText = attrText.split('.')[0];
-                                            }
-                                            // normalize
-                                            if (attrText.startsWith('v-bind:')) {
-                                                attrText = attrText.substring('v-bind:'.length);
-                                            }
-                                            else if (attrText.startsWith(':')) {
-                                                attrText = attrText.substring(':'.length);
-                                            }
-                                            else if (attrText.startsWith('v-model:')) {
-                                                attrText = attrText.substring('v-model:'.length);
-                                            }
-                                            else if (attrText === 'v-model') {
-                                                attrText = vueCompilerOptions.target >= 3 ? 'modelValue' : 'value'; // TODO: support for experimentalModelPropName?
-                                            }
-                                            else if (attrText.startsWith('@')) {
-                                                attrText = 'on-' + (0, language_core_1.hyphenateAttr)(attrText.substring('@'.length));
-                                            }
-                                            current.unburnedRequiredProps = current.unburnedRequiredProps.filter(propName => {
-                                                return attrText !== propName
-                                                    && attrText !== (0, language_core_1.hyphenateAttr)(propName);
-                                            });
+                                        // normalize
+                                        if (attrText.startsWith('v-bind:')) {
+                                            attrText = attrText.substring('v-bind:'.length);
                                         }
-                                    }
-                                }
-                                else if (token === html.TokenType.StartTagSelfClose || token === html.TokenType.StartTagClose) {
-                                    if (current) {
-                                        for (const requiredProp of current.unburnedRequiredProps) {
-                                            result.push({
-                                                label: `${requiredProp}!`,
-                                                paddingLeft: true,
-                                                position: document.positionAt(current.labelOffset),
-                                                kind: 2,
-                                                textEdits: [{
-                                                        range: {
-                                                            start: document.positionAt(current.insertOffset),
-                                                            end: document.positionAt(current.insertOffset),
-                                                        },
-                                                        newText: ` :${casing.attr === types_1.AttrNameCasing.Kebab ? (0, language_core_1.hyphenateAttr)(requiredProp) : requiredProp}=`,
-                                                    }],
-                                            });
+                                        else if (attrText.startsWith(':')) {
+                                            attrText = attrText.substring(':'.length);
+                                        }
+                                        else if (attrText.startsWith('v-model:')) {
+                                            attrText = attrText.substring('v-model:'.length);
+                                        }
+                                        else if (attrText === 'v-model') {
+                                            attrText = vueCompilerOptions.target >= 3 ? 'modelValue' : 'value'; // TODO: support for experimentalModelPropName?
+                                        }
+                                        else if (attrText.startsWith('@')) {
+                                            attrText = 'on-' + (0, language_core_1.hyphenateAttr)(attrText.substring('@'.length));
                                         }
-                                        current = undefined;
+                                        current.unburnedRequiredProps = current.unburnedRequiredProps.filter(propName => {
+                                            return attrText !== propName
+                                                && attrText !== (0, language_core_1.hyphenateAttr)(propName);
+                                        });
                                     }
                                 }
-                                if (token === html.TokenType.AttributeName || token === html.TokenType.AttributeValue) {
-                                    if (current) {
-                                        current.insertOffset = scanner.getTokenOffset() + scanner.getTokenLength();
+                            }
+                            else if (token === html.TokenType.StartTagSelfClose || token === html.TokenType.StartTagClose) {
+                                if (current) {
+                                    for (const requiredProp of current.unburnedRequiredProps) {
+                                        result.push({
+                                            label: `${requiredProp}!`,
+                                            paddingLeft: true,
+                                            position: document.positionAt(current.labelOffset),
+                                            kind: 2,
+                                            textEdits: [{
+                                                    range: {
+                                                        start: document.positionAt(current.insertOffset),
+                                                        end: document.positionAt(current.insertOffset),
+                                                    },
+                                                    newText: ` :${casing.attr === types_1.AttrNameCasing.Kebab ? (0, language_core_1.hyphenateAttr)(requiredProp) : requiredProp}=`,
+                                                }],
+                                        });
                                     }
+                                    current = undefined;
+                                }
+                            }
+                            if (token === html.TokenType.AttributeName || token === html.TokenType.AttributeValue) {
+                                if (current) {
+                                    current.insertOffset = scanner.getTokenOffset() + scanner.getTokenLength();
                                 }
                             }
                         }
@@ -228,7 +241,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (!isSupportedDocument(document)) {
                         return;
                     }
-                    if (context.decodeEmbeddedDocumentUri(document.uri)) {
+                    if (context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri))) {
                         updateExtraCustomData([]);
                     }
                     return baseServiceInstance.provideHover?.(document, position, token);
@@ -238,49 +251,48 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                         return;
                     }
                     const originalResult = await baseServiceInstance.provideDiagnostics?.(document, token);
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(uri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     if (!virtualCode) {
                         return;
                     }
-                    for (const map of context.documents.getMaps(virtualCode)) {
-                        const code = context.language.scripts.get(map.sourceDocument.uri)?.generated?.root;
-                        if (!(code instanceof language_core_1.VueVirtualCode)) {
-                            continue;
+                    const code = context.language.scripts.get(decoded[0])?.generated?.root;
+                    if (!(code instanceof language_core_1.VueVirtualCode)) {
+                        return;
+                    }
+                    const templateErrors = [];
+                    const { template } = code.sfc;
+                    if (template) {
+                        for (const error of template.errors) {
+                            onCompilerError(error, 1);
                         }
-                        const templateErrors = [];
-                        const { template } = code.sfc;
-                        if (template) {
-                            for (const error of template.errors) {
-                                onCompilerError(error, 1);
-                            }
-                            for (const warning of template.warnings) {
-                                onCompilerError(warning, 2);
-                            }
-                            function onCompilerError(error, severity) {
-                                const templateHtmlRange = {
-                                    start: error.loc?.start.offset ?? 0,
-                                    end: error.loc?.end.offset ?? 0,
-                                };
-                                let errorMessage = error.message;
-                                templateErrors.push({
-                                    range: {
-                                        start: document.positionAt(templateHtmlRange.start),
-                                        end: document.positionAt(templateHtmlRange.end),
-                                    },
-                                    severity,
-                                    code: error.code,
-                                    source: 'vue',
-                                    message: errorMessage,
-                                });
-                            }
+                        for (const warning of template.warnings) {
+                            onCompilerError(warning, 2);
+                        }
+                        function onCompilerError(error, severity) {
+                            const templateHtmlRange = {
+                                start: error.loc?.start.offset ?? 0,
+                                end: error.loc?.end.offset ?? 0,
+                            };
+                            let errorMessage = error.message;
+                            templateErrors.push({
+                                range: {
+                                    start: document.positionAt(templateHtmlRange.start),
+                                    end: document.positionAt(templateHtmlRange.end),
+                                },
+                                severity,
+                                code: error.code,
+                                source: 'vue',
+                                message: errorMessage,
+                            });
                         }
-                        return [
-                            ...originalResult ?? [],
-                            ...templateErrors,
-                        ];
                     }
+                    return [
+                        ...originalResult ?? [],
+                        ...templateErrors,
+                    ];
                 },
                 provideDocumentSemanticTokens(document, range, legend) {
                     if (!isSupportedDocument(document)) {
@@ -290,7 +302,7 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     if (!languageService) {
                         return;
                     }
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     if (!sourceScript
                         || !(sourceScript.generated?.root instanceof language_core_1.VueVirtualCode)
@@ -403,7 +415,8 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                                     const events = await tsPluginClient?.getComponentEvents(vueCode.fileName, tag) ?? [];
                                     tagInfos.set(tag, {
                                         attrs,
-                                        props,
+                                        props: props.filter(prop => !prop.startsWith('ref_')
+                                            && !(0, shared_1.hyphenate)(prop).startsWith('on-vnode-')),
                                         events,
                                     });
                                     version++;
@@ -588,7 +601,15 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                     else if (itemId && (itemId.type === 'componentProp' || itemId.type === 'componentEvent')) {
                         const [componentName] = itemId.args;
                         if (componentName !== '*') {
-                            item.sortText = '\u0000' + (item.sortText ?? item.label);
+                            if (item.label === 'class'
+                                || item.label === 'ref'
+                                || item.label.endsWith(':class')
+                                || item.label.endsWith(':ref')) {
+                                item.sortText = '\u0000' + (item.sortText ?? item.label);
+                            }
+                            else {
+                                item.sortText = '\u0000\u0000' + (item.sortText ?? item.label);
+                            }
                         }
                         if (itemId.type === 'componentProp') {
                             if (componentName !== '*') {
@@ -623,15 +644,17 @@ function create(mode, ts, getVueOptions, getTsPluginClient) {
                 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);
+                    for (const workspaceFolder of context.env.workspaceFolders) {
+                        const uri = vscode_uri_1.Utils.resolvePath(workspaceFolder, customDataPath);
+                        const json = await context.env.fs?.readFile?.(uri);
+                        if (json) {
+                            try {
+                                const data = JSON.parse(json);
+                                newData.push(html.newHTMLDataProvider(customDataPath, data));
+                            }
+                            catch (error) {
+                                console.error(error);
+                            }
                         }
                     }
                 }

package/lib/plugins/vue-toggle-v-bind-codeaction.js

@@ -2,15 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const language_core_1 = require("@vue/language-core");
+const vscode_uri_1 = require("vscode-uri");
 function create(ts) {
     return {
         name: 'vue-toggle-v-bind-codeaction',
+        capabilities: {
+            codeActionProvider: {
+                codeActionKinds: ['refactor'],
+            },
+        },
         create(context) {
             return {
                 provideCodeActions(document, range, _context) {
                     const startOffset = document.offsetAt(range.start);
                     const endOffset = document.offsetAt(range.end);
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     if (!(virtualCode instanceof language_core_1.VueVirtualCode)) {

package/lib/plugins/vue-twoslash-queries.d.ts

@@ -1,2 +1,2 @@
-import type { ServiceContext, LanguageServicePlugin } from '@volar/language-service';
-export declare function create(ts: typeof import('typescript'), getTsPluginClient?: (context: ServiceContext) => typeof import('@vue/typescript-plugin/lib/client') | undefined): LanguageServicePlugin;
+import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
+export declare function create(ts: typeof import('typescript'), getTsPluginClient?: (context: LanguageServiceContext) => typeof import('@vue/typescript-plugin/lib/client') | undefined): LanguageServicePlugin;

package/lib/plugins/vue-twoslash-queries.js

@@ -2,15 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const vue = require("@vue/language-core");
+const vscode_uri_1 = require("vscode-uri");
 const twoslashReg = /<!--\s*\^\?\s*-->/g;
 function create(ts, getTsPluginClient) {
     return {
         name: 'vue-twoslash-queries',
+        capabilities: {
+            inlayHintProvider: {},
+        },
         create(context) {
             const tsPluginClient = getTsPluginClient?.(context);
             return {
                 async provideInlayHints(document, range) {
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     if (!(sourceScript?.generated?.root instanceof vue.VueVirtualCode) || virtualCode?.id !== 'template') {
@@ -27,7 +31,7 @@ function create(ts, getTsPluginClient) {
                             })]);
                     }
                     for (const [pointerPosition, hoverOffset] of hoverOffsets) {
-                        for (const [_1, [_2, map]] of context.language.maps.forEach(virtualCode)) {
+                        for (const [_1, _2, map] of context.language.maps.forEach(virtualCode)) {
                             for (const [sourceOffset] of map.getSourceOffsets(hoverOffset)) {
                                 const quickInfo = await tsPluginClient?.getQuickInfoAtPosition(sourceScript.generated.root.fileName, sourceOffset);
                                 if (quickInfo) {

package/lib/plugins/vue-visualize-hidden-callback-param.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
+const vscode_uri_1 = require("vscode-uri");
 function create() {
     return {
         name: 'vue-inlay-hints-hidden-callback-param',
+        capabilities: {
+            inlayHintProvider: {},
+        },
         create(context) {
             return {
                 async provideInlayHints(document, range) {
                     const settings = {};
                     const result = [];
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const vitualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                     if (vitualCode) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.0.18",
+	"version": "2.0.20",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -16,23 +16,23 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.2.4",
-		"@volar/language-service": "~2.2.4",
-		"@volar/typescript": "~2.2.4",
+		"@volar/language-core": "~2.3.0-alpha.14",
+		"@volar/language-service": "~2.3.0-alpha.14",
+		"@volar/typescript": "~2.3.0-alpha.14",
 		"@vue/compiler-dom": "^3.4.0",
-		"@vue/language-core": "2.0.18",
+		"@vue/language-core": "2.0.20",
 		"@vue/shared": "^3.4.0",
-		"@vue/typescript-plugin": "2.0.18",
+		"@vue/typescript-plugin": "2.0.20",
 		"computeds": "^0.0.1",
 		"path-browserify": "^1.0.1",
-		"volar-service-css": "0.0.45",
-		"volar-service-emmet": "0.0.45",
-		"volar-service-html": "0.0.45",
-		"volar-service-json": "0.0.45",
-		"volar-service-pug": "0.0.45",
-		"volar-service-pug-beautify": "0.0.45",
-		"volar-service-typescript": "0.0.45",
-		"volar-service-typescript-twoslash-queries": "0.0.45",
+		"volar-service-css": "0.0.50",
+		"volar-service-emmet": "0.0.50",
+		"volar-service-html": "0.0.50",
+		"volar-service-json": "0.0.50",
+		"volar-service-pug": "0.0.50",
+		"volar-service-pug-beautify": "0.0.50",
+		"volar-service-typescript": "0.0.50",
+		"volar-service-typescript-twoslash-queries": "0.0.50",
 		"vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
@@ -40,8 +40,8 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/kit": "~2.2.4",
+		"@volar/kit": "~2.3.0-alpha.14",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "7aac2805f03b17e4c624335f509d502002bb75a8"
+	"gitHead": "e1a5d2f136bf60a772c9655f9f5474c7f71a2ff9"
 }

package/scripts/update-html-data.js

@@ -14,6 +14,12 @@ const langs = [
 		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-zh-cn/',
 		supported: true,
 	},
+	{
+		name: 'zh-hk',
+		url: 'https://zh-hk.vuejs.org/',
+		repoUrl: 'https://raw.githubusercontent.com/vuejs-translations/docs-zh-hk/',
+		supported: true,
+	},
 	{
 		name: 'ja',
 		url: 'https://ja.vuejs.org/',