@vue/language-service 3.0.0-alpha.6 → 3.0.0-alpha.8

package/lib/plugins/css.js

@@ -23,55 +23,67 @@ function create() {
                     return diagnostics;
                 },
                 /**
-                 * If the editing position is within the virtual code and navigation is enabled,
-                 * skip the CSS renaming feature.
+                 * If the position is within the virtual code and navigation is enabled,
+                 * skip the CSS navigation feature.
                  */
+                provideReferences(document, position) {
+                    if (isWithinNavigationVirtualCode(document, position)) {
+                        return;
+                    }
+                    return worker(document, (stylesheet, cssLs) => {
+                        return cssLs.findReferences(document, position, stylesheet);
+                    });
+                },
                 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);
+                    if (isWithinNavigationVirtualCode(document, position)) {
+                        return;
+                    }
                     return worker(document, (stylesheet, cssLs) => {
                         return cssLs.prepareRename(document, position, stylesheet);
                     });
                 }
             };
+            function isWithinNavigationVirtualCode(document, position) {
+                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_')) {
+                    return false;
+                }
+                const root = sourceScript.generated.root;
+                if (!(root instanceof language_core_1.VueVirtualCode)) {
+                    return false;
+                }
+                const block = root.sfc.styles.find(style => style.name === decoded[1]);
+                if (!block) {
+                    return false;
+                }
+                let script;
+                for (const [key, value] of sourceScript.generated.embeddedCodes) {
+                    if (key.startsWith('script_')) {
+                        script = value;
+                        break;
+                    }
+                }
+                if (!script) {
+                    return false;
+                }
+                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 true;
+                    }
+                }
+                return false;
+            }
             function worker(document, callback) {
                 const cssLs = getCssLs(document);
                 if (!cssLs) {

package/lib/plugins/vue-missing-props-hints.js

@@ -23,7 +23,6 @@ function create(getTsPluginClient) {
                     if (!context.project.vue) {
                         return;
                     }
-                    const vueCompilerOptions = context.project.vue.compilerOptions;
                     const enabled = await context.env.getConfiguration?.('vue.inlayHints.missingProps') ?? false;
                     if (!enabled) {
                         return;
@@ -101,7 +100,7 @@ function create(getTsPluginClient) {
                                         attrText = attrText.slice('v-model:'.length);
                                     }
                                     else if (attrText === 'v-model') {
-                                        attrText = vueCompilerOptions.target >= 3 ? 'modelValue' : 'value'; // TODO: support for experimentalModelPropName?
+                                        attrText = 'modelValue'; // TODO: support for experimentalModelPropName?
                                     }
                                     else if (attrText.startsWith('v-on:')) {
                                         attrText = 'on-' + (0, language_core_1.hyphenateAttr)(attrText.slice('v-on:'.length));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "3.0.0-alpha.6",
+	"version": "3.0.0-alpha.8",
 	"license": "MIT",
 	"files": [
 		"data",
@@ -21,10 +21,10 @@
 		"@volar/language-service": "~2.4.13",
 		"@volar/typescript": "~2.4.13",
 		"@vue/compiler-dom": "^3.5.0",
-		"@vue/language-core": "3.0.0-alpha.6",
+		"@vue/language-core": "3.0.0-alpha.8",
 		"@vue/shared": "^3.5.0",
-		"@vue/typescript-plugin": "3.0.0-alpha.6",
-		"alien-signals": "^1.0.3",
+		"@vue/typescript-plugin": "3.0.0-alpha.8",
+		"alien-signals": "^2.0.5",
 		"path-browserify": "^1.0.1",
 		"volar-service-css": "0.0.64",
 		"volar-service-emmet": "0.0.64",
@@ -45,5 +45,5 @@
 		"@volar/kit": "~2.4.13",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "a7b5649ab4957cd2228f4bbc9205b2008bff58a2"
+	"gitHead": "d38cb93558fe8015c7ffe9ceacfdd3296e3692f6"
 }

package/lib/ideFeatures/nameCasing.d.ts

@@ -1,14 +0,0 @@
-import type { LanguageServiceContext } from '@volar/language-service';
-import type * as vscode from 'vscode-languageserver-protocol';
-import type { URI } from 'vscode-uri';
-import { AttrNameCasing, TagNameCasing } from '../types';
-export declare function convertTagName(context: LanguageServiceContext, uri: URI, casing: TagNameCasing, tsPluginClient: typeof import('@vue/typescript-plugin/lib/client') | undefined): Promise<vscode.TextEdit[] | undefined>;
-export declare function convertAttrName(context: LanguageServiceContext, uri: URI, casing: AttrNameCasing, tsPluginClient?: typeof import('@vue/typescript-plugin/lib/client')): Promise<vscode.TextEdit[] | undefined>;
-export declare function getNameCasing(context: LanguageServiceContext, uri: URI): Promise<{
-    tag: TagNameCasing;
-    attr: AttrNameCasing;
-}>;
-export declare function detect(context: LanguageServiceContext, uri: URI): Promise<{
-    tag: TagNameCasing[];
-    attr: AttrNameCasing[];
-}>;

package/lib/ideFeatures/nameCasing.js

@@ -1,202 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTagName = convertTagName;
-exports.convertAttrName = convertAttrName;
-exports.getNameCasing = getNameCasing;
-exports.detect = detect;
-const vue = require("@vue/language-core");
-const language_core_1 = require("@vue/language-core");
-const alien_signals_1 = require("alien-signals");
-const types_1 = require("../types");
-async function convertTagName(context, uri, casing, tsPluginClient) {
-    const sourceFile = context.language.scripts.get(uri);
-    if (!sourceFile) {
-        return;
-    }
-    const root = sourceFile?.generated?.root;
-    if (!(root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
-    const { template } = root.sfc;
-    if (!template) {
-        return;
-    }
-    const document = context.documents.get(sourceFile.id, sourceFile.languageId, sourceFile.snapshot);
-    const edits = [];
-    const components = await tsPluginClient?.getComponentNames(root.fileName) ?? [];
-    const tags = getTemplateTagsAndAttrs(root);
-    for (const [tagName, { offsets }] of tags) {
-        const componentName = components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
-        if (componentName) {
-            for (const offset of offsets) {
-                const start = document.positionAt(template.startTagEnd + offset);
-                const end = document.positionAt(template.startTagEnd + offset + tagName.length);
-                const range = { start, end };
-                if (casing === types_1.TagNameCasing.Kebab && tagName !== (0, language_core_1.hyphenateTag)(componentName)) {
-                    edits.push({ range, newText: (0, language_core_1.hyphenateTag)(componentName) });
-                }
-                if (casing === types_1.TagNameCasing.Pascal && tagName !== componentName) {
-                    edits.push({ range, newText: componentName });
-                }
-            }
-        }
-    }
-    return edits;
-}
-async function convertAttrName(context, uri, casing, tsPluginClient) {
-    const sourceFile = context.language.scripts.get(uri);
-    if (!sourceFile) {
-        return;
-    }
-    const root = sourceFile?.generated?.root;
-    if (!(root instanceof language_core_1.VueVirtualCode)) {
-        return;
-    }
-    const { template } = root.sfc;
-    if (!template) {
-        return;
-    }
-    const document = context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
-    const edits = [];
-    const components = await tsPluginClient?.getComponentNames(root.fileName) ?? [];
-    const tags = getTemplateTagsAndAttrs(root);
-    for (const [tagName, { attrs }] of tags) {
-        const componentName = components.find(component => component === tagName || (0, language_core_1.hyphenateTag)(component) === tagName);
-        if (componentName) {
-            const props = (await tsPluginClient?.getComponentProps(root.fileName, componentName) ?? []).map(prop => prop.name);
-            for (const [attrName, { offsets }] of attrs) {
-                const propName = props.find(prop => prop === attrName || (0, language_core_1.hyphenateAttr)(prop) === attrName);
-                if (propName) {
-                    for (const offset of offsets) {
-                        const start = document.positionAt(template.startTagEnd + offset);
-                        const end = document.positionAt(template.startTagEnd + offset + attrName.length);
-                        const range = { start, end };
-                        if (casing === types_1.AttrNameCasing.Kebab && attrName !== (0, language_core_1.hyphenateAttr)(propName)) {
-                            edits.push({ range, newText: (0, language_core_1.hyphenateAttr)(propName) });
-                        }
-                        if (casing === types_1.AttrNameCasing.Camel && attrName !== propName) {
-                            edits.push({ range, newText: propName });
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return edits;
-}
-async function getNameCasing(context, uri) {
-    const detected = await detect(context, uri);
-    const [attr, tag] = await Promise.all([
-        context.env.getConfiguration?.('vue.complete.casing.props', uri.toString()),
-        context.env.getConfiguration?.('vue.complete.casing.tags', uri.toString()),
-    ]);
-    const tagNameCasing = detected.tag.length === 1 && (tag === 'autoPascal' || tag === 'autoKebab') ? detected.tag[0] : (tag === 'autoKebab' || tag === 'kebab') ? types_1.TagNameCasing.Kebab : types_1.TagNameCasing.Pascal;
-    const attrNameCasing = detected.attr.length === 1 && (attr === 'autoCamel' || attr === 'autoKebab') ? detected.attr[0] : (attr === 'autoCamel' || attr === 'camel') ? types_1.AttrNameCasing.Camel : types_1.AttrNameCasing.Kebab;
-    return {
-        tag: tagNameCasing,
-        attr: attrNameCasing,
-    };
-}
-async function detect(context, uri) {
-    const rootFile = context.language.scripts.get(uri)?.generated?.root;
-    if (!(rootFile instanceof language_core_1.VueVirtualCode)) {
-        return {
-            tag: [],
-            attr: [],
-        };
-    }
-    return {
-        tag: await getTagNameCase(rootFile),
-        attr: getAttrNameCase(rootFile),
-    };
-    function getAttrNameCase(file) {
-        const tags = getTemplateTagsAndAttrs(file);
-        const result = [];
-        for (const [_, { attrs }] of tags) {
-            for (const [tagName] of attrs) {
-                // attrName
-                if (tagName !== (0, language_core_1.hyphenateTag)(tagName)) {
-                    result.push(types_1.AttrNameCasing.Camel);
-                    break;
-                }
-            }
-            for (const [tagName] of attrs) {
-                // attr-name
-                if (tagName.includes('-')) {
-                    result.push(types_1.AttrNameCasing.Kebab);
-                    break;
-                }
-            }
-        }
-        return result;
-    }
-    function getTagNameCase(file) {
-        const result = new Set();
-        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
-                        result.add(types_1.TagNameCasing.Pascal);
-                    }
-                    else {
-                        // Tagname -> tagname
-                        // TagName -> tag-name
-                        result.add(types_1.TagNameCasing.Kebab);
-                    }
-                }
-            }
-        }
-        return [...result];
-    }
-}
-const map = new WeakMap();
-function getTemplateTagsAndAttrs(sourceFile) {
-    if (!map.has(sourceFile)) {
-        const getter = (0, alien_signals_1.computed)(() => {
-            if (!(sourceFile instanceof vue.VueVirtualCode)) {
-                return;
-            }
-            const ast = sourceFile.sfc.template?.ast;
-            const tags = new Map();
-            if (ast) {
-                for (const node of vue.forEachElementNode(ast)) {
-                    if (!tags.has(node.tag)) {
-                        tags.set(node.tag, { offsets: [], attrs: new Map() });
-                    }
-                    const tag = tags.get(node.tag);
-                    const startTagHtmlOffset = node.loc.start.offset + node.loc.source.indexOf(node.tag);
-                    const endTagHtmlOffset = node.loc.start.offset + node.loc.source.lastIndexOf(node.tag);
-                    tag.offsets.push(startTagHtmlOffset);
-                    if (!node.isSelfClosing) {
-                        tag.offsets.push(endTagHtmlOffset);
-                    }
-                    for (const prop of node.props) {
-                        let name;
-                        let offset;
-                        if (prop.type === 7
-                            && prop.arg?.type === 4
-                            && prop.arg.isStatic) {
-                            name = prop.arg.content;
-                            offset = prop.arg.loc.start.offset;
-                        }
-                        else if (prop.type === 6) {
-                            name = prop.name;
-                            offset = prop.loc.start.offset;
-                        }
-                        if (name !== undefined && offset !== undefined) {
-                            if (!tag.attrs.has(name)) {
-                                tag.attrs.set(name, { offsets: [] });
-                            }
-                            tag.attrs.get(name).offsets.push(offset);
-                        }
-                    }
-                }
-            }
-            return tags;
-        });
-        map.set(sourceFile, getter);
-    }
-    return map.get(sourceFile)() ?? new Map();
-}
-//# sourceMappingURL=nameCasing.js.map