@vue/language-service 2.2.2 → 2.2.6

package/lib/ideFeatures/nameCasing.js

@@ -17,7 +17,7 @@ async function convertTagName(context, uri, casing, tsPluginClient) {
     if (!(root instanceof language_core_1.VueVirtualCode)) {
         return;
     }
-    const { template } = root._sfc;
+    const { template } = root.sfc;
     if (!template) {
         return;
     }
@@ -52,7 +52,7 @@ async function convertAttrName(context, uri, casing, tsPluginClient) {
     if (!(root instanceof language_core_1.VueVirtualCode)) {
         return;
     }
-    const { template } = root._sfc;
+    const { template } = root.sfc;
     if (!template) {
         return;
     }
@@ -132,8 +132,8 @@ async function detect(context, uri) {
     }
     function getTagNameCase(file) {
         const result = new Set();
-        if (file._sfc.template?.ast) {
-            for (const element of vue.forEachElementNode(file._sfc.template.ast)) {
+        if (file.sfc.template?.ast) {
+            for (const element of vue.forEachElementNode(file.sfc.template.ast)) {
                 if (element.tagType === 1) {
                     if (element.tag !== (0, language_core_1.hyphenateTag)(element.tag)) {
                         // TagName
@@ -157,7 +157,7 @@ function getTemplateTagsAndAttrs(sourceFile) {
             if (!(sourceFile instanceof vue.VueVirtualCode)) {
                 return;
             }
-            const ast = sourceFile._sfc.template?.ast;
+            const ast = sourceFile.sfc.template?.ast;
             const tags = new Map();
             if (ast) {
                 for (const node of vue.forEachElementNode(ast)) {

package/lib/plugins/css.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
+const language_core_1 = require("@vue/language-core");
 const volar_service_css_1 = require("volar-service-css");
+const vscode_uri_1 = require("vscode-uri");
 function create() {
     const base = (0, volar_service_css_1.create)({ scssDocumentSelector: ['scss', 'postcss'] });
     return {
         ...base,
         create(context) {
             const baseInstance = base.create(context);
+            const { 'css/languageService': getCssLs, 'css/stylesheet': getStylesheet, } = baseInstance.provide;
             return {
                 ...baseInstance,
                 async provideDiagnostics(document, token) {
@@ -19,7 +22,63 @@ function create() {
                     }
                     return diagnostics;
                 },
+                /**
+                 * If the editing position is within the virtual code and navigation is enabled,
+                 * skip the CSS renaming feature.
+                 */
+                provideRenameRange(document, position) {
+                    do {
+                        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 (!sourceScript?.generated || !virtualCode?.id.startsWith('style_')) {
+                            break;
+                        }
+                        const root = sourceScript.generated.root;
+                        if (!(root instanceof language_core_1.VueVirtualCode)) {
+                            break;
+                        }
+                        const block = root.sfc.styles.find(style => style.name === decoded[1]);
+                        if (!block) {
+                            break;
+                        }
+                        let script;
+                        for (const [key, value] of sourceScript.generated.embeddedCodes) {
+                            if (key.startsWith('script_')) {
+                                script = value;
+                                break;
+                            }
+                        }
+                        if (!script) {
+                            break;
+                        }
+                        const offset = document.offsetAt(position) + block.startTagEnd;
+                        for (const { sourceOffsets, lengths, data } of script.mappings) {
+                            if (!sourceOffsets.length
+                                || !data.navigation
+                                || typeof data.navigation === 'object' && !data.navigation.shouldRename) {
+                                continue;
+                            }
+                            const start = sourceOffsets[0];
+                            const end = sourceOffsets.at(-1) + lengths.at(-1);
+                            if (offset >= start && offset <= end) {
+                                return;
+                            }
+                        }
+                    } while (0);
+                    return worker(document, (stylesheet, cssLs) => {
+                        return cssLs.prepareRename(document, position, stylesheet);
+                    });
+                }
             };
+            function worker(document, callback) {
+                const cssLs = getCssLs(document);
+                if (!cssLs) {
+                    return;
+                }
+                return callback(getStylesheet(document, cssLs), cssLs);
+            }
         },
     };
 }

package/lib/plugins/vue-autoinsert-dotvalue.js

@@ -49,10 +49,8 @@ function create(ts, getTsPluginClient) {
                     if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
-                    const blocks = [
-                        root._sfc.script,
-                        root._sfc.scriptSetup,
-                    ].filter(block => !!block);
+                    const { sfc } = root;
+                    const blocks = [sfc.script, sfc.scriptSetup].filter(block => !!block);
                     if (!blocks.length) {
                         return;
                     }

package/lib/plugins/vue-autoinsert-self-closing.d.ts

@@ -0,0 +1,2 @@
+import type { LanguageServicePlugin } from '@volar/language-service';
+export declare function create(): LanguageServicePlugin;

package/lib/plugins/vue-autoinsert-self-closing.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.create = create;
+function create() {
+    return {
+        name: 'vue-autoinsert-selfClosing',
+        capabilities: {
+            autoInsertionProvider: {
+                triggerCharacters: ['/'],
+                configurationSections: ['vue.autoInsert.selfClosing'],
+            },
+        },
+        create(context) {
+            return {
+                async provideAutoInsertSnippet(document, selection, change) {
+                    if (document.languageId !== 'html') {
+                        return;
+                    }
+                    const enabled = await context.env.getConfiguration?.('vue.autoInsert.selfClosing') ?? true;
+                    if (!enabled) {
+                        return;
+                    }
+                    if (change.text === '{}'
+                        && document.getText().slice(change.rangeOffset - 1, change.rangeOffset + 3) === '{{}}'
+                        && document.offsetAt(selection) === change.rangeOffset + 1) {
+                        return ` $0 `;
+                    }
+                },
+            };
+        },
+    };
+}
+//# sourceMappingURL=vue-autoinsert-self-closing.js.map

package/lib/plugins/vue-complete-define-assignment.js

@@ -32,8 +32,9 @@ function create() {
                     if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
-                    const codegen = language_core_1.tsCodegen.get(root._sfc);
-                    const scriptSetup = root._sfc.scriptSetup;
+                    const { sfc } = root;
+                    const codegen = language_core_1.tsCodegen.get(sfc);
+                    const scriptSetup = sfc.scriptSetup;
                     const scriptSetupRanges = codegen?.getScriptSetupRanges();
                     if (!scriptSetup || !scriptSetupRanges) {
                         return;

package/lib/plugins/vue-directive-comments.d.ts

@@ -1,2 +1,6 @@
 import type { LanguageServicePlugin } from '@volar/language-service';
+/**
+ * A language service plugin that provides completion for Vue directive comments,
+ * e.g. if user is writing `<!-- |` in they'll be provided completions for `@vue-expect-error`, `@vue-generic`, etc.
+ */
 export declare function create(): LanguageServicePlugin;

package/lib/plugins/vue-directive-comments.js

@@ -8,6 +8,10 @@ const cmds = [
     ['vue-generic', 'vue-generic {$1}'],
 ];
 const directiveCommentReg = /<!--\s*@/;
+/**
+ * A language service plugin that provides completion for Vue directive comments,
+ * e.g. if user is writing `<!-- |` in they'll be provided completions for `@vue-expect-error`, `@vue-generic`, etc.
+ */
 function create() {
     return {
         name: 'vue-directive-comments',

package/lib/plugins/vue-document-drop.js

@@ -45,14 +45,14 @@ function create(ts, getTsPluginClient) {
                     if (!importUri || !vueCompilerOptions.extensions.some(ext => importUri.endsWith(ext))) {
                         return;
                     }
-                    let baseName = importUri.slice(importUri.lastIndexOf('/') + 1);
-                    baseName = baseName.slice(0, baseName.lastIndexOf('.'));
-                    const newName = (0, shared_1.capitalize)((0, shared_1.camelize)(baseName));
-                    const sfc = root._sfc;
+                    const { sfc } = root;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!script) {
                         return;
                     }
+                    let baseName = importUri.slice(importUri.lastIndexOf('/') + 1);
+                    baseName = baseName.slice(0, baseName.lastIndexOf('.'));
+                    const newName = (0, shared_1.capitalize)((0, shared_1.camelize)(baseName));
                     const additionalEdit = {};
                     const code = [...(0, language_core_1.forEachEmbeddedCode)(root)].find(code => code.id === (sfc.scriptSetup ? 'scriptsetup_raw' : 'script_raw'));
                     const lastImportNode = (0, vue_extract_file_1.getLastImportNode)(ts, script.ast);

package/lib/plugins/vue-document-links.js

@@ -24,12 +24,13 @@ function create() {
                         return;
                     }
                     const result = [];
-                    const codegen = language_core_1.tsCodegen.get(root._sfc);
+                    const { sfc } = root;
+                    const codegen = language_core_1.tsCodegen.get(sfc);
                     const scopedClasses = codegen?.getGeneratedTemplate()?.scopedClasses ?? [];
                     const styleClasses = new Map();
                     const option = root.vueCompilerOptions.experimentalResolveStyleCssClasses;
-                    for (let i = 0; i < root._sfc.styles.length; i++) {
-                        const style = root._sfc.styles[i];
+                    for (let i = 0; i < sfc.styles.length; i++) {
+                        const style = sfc.styles[i];
                         if (option === 'always' || (option === 'scoped' && style.scoped)) {
                             for (const className of style.classNames) {
                                 if (!styleClasses.has(className.text.slice(1))) {

package/lib/plugins/vue-extract-file.js

@@ -38,7 +38,7 @@ function create(ts, getTsPluginClient) {
                     if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
-                    const sfc = root._sfc;
+                    const { sfc } = root;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!sfc.template || !script) {
                         return;
@@ -73,7 +73,7 @@ function create(ts, getTsPluginClient) {
                     if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return codeAction;
                     }
-                    const sfc = root._sfc;
+                    const { sfc } = root;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!sfc.template || !script) {
                         return codeAction;

package/lib/plugins/vue-inlayhints.js

@@ -26,17 +26,17 @@ function create(ts) {
                         return settings[key] ??= await context.env.getConfiguration?.(key) ?? false;
                     }
                     const result = [];
-                    const codegen = language_core_1.tsCodegen.get(virtualCode._sfc);
+                    const codegen = language_core_1.tsCodegen.get(virtualCode.sfc);
                     const inlayHints = [
                         ...codegen?.getGeneratedTemplate()?.inlayHints ?? [],
                         ...codegen?.getGeneratedScript()?.inlayHints ?? [],
                     ];
                     const scriptSetupRanges = codegen?.getScriptSetupRanges();
-                    if (scriptSetupRanges?.defineProps?.destructured && virtualCode._sfc.scriptSetup?.ast) {
+                    if (scriptSetupRanges?.defineProps?.destructured && virtualCode.sfc.scriptSetup?.ast) {
                         const setting = 'vue.inlayHints.destructuredProps';
                         const enabled = await getSettingEnabled(setting);
                         if (enabled) {
-                            for (const [prop, isShorthand] of findDestructuredProps(ts, virtualCode._sfc.scriptSetup.ast, scriptSetupRanges.defineProps.destructured.keys())) {
+                            for (const [prop, isShorthand] of findDestructuredProps(ts, virtualCode.sfc.scriptSetup.ast, scriptSetupRanges.defineProps.destructured.keys())) {
                                 const name = prop.text;
                                 const end = prop.getEnd();
                                 const pos = isShorthand ? end : end - name.length;
@@ -51,9 +51,9 @@ function create(ts) {
                         }
                     }
                     const blocks = [
-                        virtualCode._sfc.template,
-                        virtualCode._sfc.script,
-                        virtualCode._sfc.scriptSetup,
+                        virtualCode.sfc.template,
+                        virtualCode.sfc.script,
+                        virtualCode.sfc.scriptSetup,
                     ];
                     const start = document.offsetAt(range.start);
                     const end = document.offsetAt(range.end);

package/lib/plugins/vue-sfc.js

@@ -8,7 +8,7 @@ const vscode_uri_1 = require("vscode-uri");
 const data_1 = require("./data");
 let sfcDataProvider;
 function create() {
-    const htmlPlugin = (0, volar_service_html_1.create)({
+    const htmlService = (0, volar_service_html_1.create)({
         documentSelector: ['vue-root-tags'],
         useDefaultDataProvider: false,
         getCustomData(context) {
@@ -19,7 +19,7 @@ function create() {
             return await worker(document, context, async (root) => {
                 const formatSettings = await context.env.getConfiguration?.('html.format') ?? {};
                 const blockTypes = ['template', 'script', 'style'];
-                for (const customBlock of root._sfc.customBlocks) {
+                for (const customBlock of root.sfc.customBlocks) {
                     blockTypes.push(customBlock.type);
                 }
                 return {
@@ -36,12 +36,19 @@ function create() {
         },
     });
     return {
-        ...htmlPlugin,
+        ...htmlService,
         name: 'vue-sfc',
+        capabilities: {
+            ...htmlService.capabilities,
+            diagnosticProvider: {
+                interFileDependencies: false,
+                workspaceDiagnostics: false,
+            }
+        },
         create(context) {
-            const htmlPluginInstance = htmlPlugin.create(context);
+            const htmlServiceInstance = htmlService.create(context);
             return {
-                ...htmlPluginInstance,
+                ...htmlServiceInstance,
                 provideDocumentLinks: undefined,
                 async resolveEmbeddedCodeFormattingOptions(sourceScript, virtualCode, options) {
                     if (sourceScript.generated?.root instanceof language_core_1.VueVirtualCode) {
@@ -63,10 +70,44 @@ function create() {
                     }
                     return options;
                 },
+                provideDiagnostics(document, token) {
+                    return worker(document, context, async (root) => {
+                        const { vueSfc, sfc } = root;
+                        if (!vueSfc) {
+                            return;
+                        }
+                        const originalResult = await htmlServiceInstance.provideDiagnostics?.(document, token);
+                        const sfcErrors = [];
+                        const { template } = sfc;
+                        const { startTagEnd = Infinity, endTagStart = -Infinity } = template ?? {};
+                        for (const error of vueSfc.errors) {
+                            if ('code' in error) {
+                                const start = error.loc?.start.offset ?? 0;
+                                const end = error.loc?.end.offset ?? 0;
+                                if (end < startTagEnd || start >= endTagStart) {
+                                    sfcErrors.push({
+                                        range: {
+                                            start: document.positionAt(start),
+                                            end: document.positionAt(end),
+                                        },
+                                        severity: 1,
+                                        code: error.code,
+                                        source: 'vue',
+                                        message: error.message,
+                                    });
+                                }
+                            }
+                        }
+                        return [
+                            ...originalResult ?? [],
+                            ...sfcErrors
+                        ];
+                    });
+                },
                 provideDocumentSymbols(document) {
                     return worker(document, context, root => {
                         const result = [];
-                        const sfc = root._sfc;
+                        const { sfc } = root;
                         if (sfc.template) {
                             result.push({
                                 name: 'template',
@@ -148,7 +189,7 @@ function create() {
                     });
                 },
                 async provideCompletionItems(document, position, context, token) {
-                    const result = await htmlPluginInstance.provideCompletionItems?.(document, position, context, token);
+                    const result = await htmlServiceInstance.provideCompletionItems?.(document, position, context, token);
                     if (!result) {
                         return;
                     }

package/lib/plugins/vue-template/autoinsert-self-closing-tags.d.ts

@@ -0,0 +1,6 @@
+import type { LanguageServiceContext, LanguageServicePluginInstance } from '@volar/language-service';
+import * as html from 'vscode-html-languageservice';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+export declare function provideAutoInsertSelfClosingTags(context: LanguageServiceContext, service: LanguageServicePluginInstance, document: TextDocument, position: html.Position, change: {
+    text: string;
+}): Promise<">" | undefined>;

package/lib/plugins/vue-template/autoinsert-self-closing-tags.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.provideAutoInsertSelfClosingTags = provideAutoInsertSelfClosingTags;
+const html = require("vscode-html-languageservice");
+const vue_template_1 = require("../vue-template");
+async function provideAutoInsertSelfClosingTags(context, service, document, position, change) {
+    if (document.languageId !== 'html') {
+        return;
+    }
+    const enabled = await context.env.getConfiguration?.('vue.autoInsert.selfClosing') ?? true;
+    if (!enabled) {
+        return;
+    }
+    if (change.text !== '/') {
+        return;
+    }
+    const scanner = (0, vue_template_1.getScanner)(service, document, 'html');
+    if (!scanner) {
+        return;
+    }
+    const offset = document.offsetAt(position);
+    let token;
+    let inStartTag = false;
+    while ((token = scanner.scan()) !== html.TokenType.EOS) {
+        if (token === html.TokenType.StartTagOpen) {
+            inStartTag = true;
+        }
+        else if (token === html.TokenType.StartTagClose || token === html.TokenType.StartTagSelfClose) {
+            inStartTag = false;
+        }
+        else if (scanner.getTokenOffset() + 1 === offset) {
+            if (token === html.TokenType.Unknown) {
+                return '>';
+            }
+            return;
+        }
+    }
+}
+//# sourceMappingURL=autoinsert-self-closing-tags.js.map

package/lib/plugins/vue-template/autoinsert-selfClosingTags.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/plugins/vue-template/autoinsert-selfClosingTags.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=autoinsert-selfClosingTags.js.map

package/lib/plugins/vue-template/autoinsert-selfclosing-tags.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/plugins/vue-template/autoinsert-selfclosing-tags.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=autoinsert-selfclosing-tags.js.map

package/lib/plugins/vue-template.js

@@ -301,7 +301,7 @@ function create(mode, ts, getTsPluginClient) {
                     }
                     const originalResult = await baseServiceInstance.provideDiagnostics?.(document, token);
                     const templateErrors = [];
-                    const { template } = root._sfc;
+                    const { template } = root.sfc;
                     if (template) {
                         for (const error of template.errors) {
                             onCompilerError(error, 1);
@@ -351,7 +351,7 @@ function create(mode, ts, getTsPluginClient) {
                     if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
-                    const { template } = root._sfc;
+                    const { template } = root.sfc;
                     if (!template) {
                         return;
                     }
@@ -420,7 +420,7 @@ function create(mode, ts, getTsPluginClient) {
                                 })());
                                 return [];
                             }
-                            const scriptSetupRanges = language_core_1.tsCodegen.get(vueCode._sfc)?.getScriptSetupRanges();
+                            const scriptSetupRanges = language_core_1.tsCodegen.get(vueCode.sfc)?.getScriptSetupRanges();
                             const names = new Set();
                             const tags = [];
                             for (const tag of components) {
@@ -432,7 +432,7 @@ function create(mode, ts, getTsPluginClient) {
                                 }
                             }
                             for (const binding of scriptSetupRanges?.bindings ?? []) {
-                                const name = vueCode._sfc.scriptSetup.content.slice(binding.range.start, binding.range.end);
+                                const name = vueCode.sfc.scriptSetup.content.slice(binding.range.start, binding.range.end);
                                 if (casing.tag === types_1.TagNameCasing.Kebab) {
                                     names.add((0, language_core_1.hyphenateTag)(name));
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "2.2.2",
+	"version": "2.2.6",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -21,9 +21,9 @@
 		"@volar/language-service": "~2.4.11",
 		"@volar/typescript": "~2.4.11",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/language-core": "2.2.2",
+		"@vue/language-core": "2.2.6",
 		"@vue/shared": "^3.5.0",
-		"@vue/typescript-plugin": "2.2.2",
+		"@vue/typescript-plugin": "2.2.6",
 		"alien-signals": "^1.0.3",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.62",
@@ -34,6 +34,7 @@
 		"volar-service-pug-beautify": "0.0.62",
 		"volar-service-typescript": "0.0.62",
 		"volar-service-typescript-twoslash-queries": "0.0.62",
+		"vscode-css-languageservice": "^6.3.1",
 		"vscode-html-languageservice": "^5.2.0",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
@@ -44,5 +45,5 @@
 		"@volar/kit": "~2.4.11",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "30757908b67f40f779c36795665163634fb81868"
+	"gitHead": "f2088e256dc0220db9549d28d9f865a5711dcfbe"
 }