@vue/language-service 3.0.0-alpha.6 → 3.0.0-beta.1

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/utils.d.ts

@@ -1,3 +1,3 @@
-import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { TextDocument } from '@volar/language-service';
 export declare function sleep(ms: number): Promise<unknown>;
 export declare function isTsDocument(document: TextDocument): boolean;

package/lib/plugins/vue-compiler-dom-errors.d.ts

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

package/lib/plugins/vue-document-drop.d.ts

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

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

@@ -6,8 +6,8 @@ const shared_1 = require("@vue/shared");
 const path_browserify_1 = require("path-browserify");
 const getUserPreferences_1 = require("volar-service-typescript/lib/configs/getUserPreferences");
 const vscode_uri_1 = require("vscode-uri");
+const nameCasing_1 = require("../nameCasing");
 const vue_extract_file_1 = require("../plugins/vue-extract-file");
-const types_1 = require("../types");
 function create(ts, getTsPluginClient) {
     return {
         name: 'vue-document-drop',
@@ -18,7 +18,7 @@ function create(ts, getTsPluginClient) {
             if (!context.project.vue) {
                 return {};
             }
-            let casing = types_1.TagNameCasing.Pascal; // TODO
+            let casing = nameCasing_1.TagNameCasing.Pascal; // TODO
             const tsPluginClient = getTsPluginClient?.(context);
             const vueCompilerOptions = context.project.vue.compilerOptions;
             return {
@@ -103,7 +103,7 @@ function create(ts, getTsPluginClient) {
                         }
                     }
                     return {
-                        insertText: `<${casing === types_1.TagNameCasing.Kebab ? (0, shared_1.hyphenate)(newName) : newName}$0 />`,
+                        insertText: `<${casing === nameCasing_1.TagNameCasing.Kebab ? (0, shared_1.hyphenate)(newName) : newName}$0 />`,
                         insertTextFormat: 2,
                         additionalEdit,
                     };

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

@@ -16,52 +16,84 @@ function create() {
                     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 !== 'template') {
+                    if (!sourceScript?.generated || (virtualCode?.id !== 'template' && virtualCode?.id !== "scriptsetup_raw")) {
                         return;
                     }
                     const root = sourceScript.generated.root;
                     if (!(root instanceof language_core_1.VueVirtualCode)) {
                         return;
                     }
-                    const result = [];
                     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 < 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))) {
-                                    styleClasses.set(className.text.slice(1), []);
+                    const result = [];
+                    if (virtualCode.id === 'template') {
+                        const scopedClasses = codegen?.getGeneratedTemplate()?.scopedClasses ?? [];
+                        const styleClasses = new Map();
+                        const option = root.vueCompilerOptions.resolveStyleClassNames;
+                        for (let i = 0; i < sfc.styles.length; i++) {
+                            const style = sfc.styles[i];
+                            if (option === true || (option === 'scoped' && style.scoped)) {
+                                for (const className of style.classNames) {
+                                    if (!styleClasses.has(className.text.slice(1))) {
+                                        styleClasses.set(className.text.slice(1), []);
+                                    }
+                                    styleClasses.get(className.text.slice(1)).push({
+                                        index: i,
+                                        style,
+                                        classOffset: className.offset,
+                                    });
                                 }
-                                styleClasses.get(className.text.slice(1)).push({
-                                    index: i,
-                                    style,
-                                    classOffset: className.offset,
-                                });
                             }
                         }
-                    }
-                    for (const { className, offset } of scopedClasses) {
-                        const styles = styleClasses.get(className);
-                        if (styles) {
-                            for (const style of styles) {
-                                const styleDocumentUri = context.encodeEmbeddedDocumentUri(decoded[0], 'style_' + style.index);
-                                const styleVirtualCode = sourceScript.generated.embeddedCodes.get('style_' + style.index);
-                                if (!styleVirtualCode) {
-                                    continue;
+                        for (const { className, offset } of scopedClasses) {
+                            const styles = styleClasses.get(className);
+                            if (styles) {
+                                for (const style of styles) {
+                                    const styleDocumentUri = context.encodeEmbeddedDocumentUri(decoded[0], 'style_' + style.index);
+                                    const styleVirtualCode = sourceScript.generated.embeddedCodes.get('style_' + style.index);
+                                    if (!styleVirtualCode) {
+                                        continue;
+                                    }
+                                    const styleDocument = context.documents.get(styleDocumentUri, styleVirtualCode.languageId, styleVirtualCode.snapshot);
+                                    const start = styleDocument.positionAt(style.classOffset);
+                                    const end = styleDocument.positionAt(style.classOffset + className.length + 1);
+                                    result.push({
+                                        range: {
+                                            start: document.positionAt(offset),
+                                            end: document.positionAt(offset + className.length),
+                                        },
+                                        target: context.encodeEmbeddedDocumentUri(decoded[0], 'style_' + style.index) + `#L${start.line + 1},${start.character + 1}-L${end.line + 1},${end.character + 1}`,
+                                    });
                                 }
-                                const styleDocument = context.documents.get(styleDocumentUri, styleVirtualCode.languageId, styleVirtualCode.snapshot);
-                                const start = styleDocument.positionAt(style.classOffset);
-                                const end = styleDocument.positionAt(style.classOffset + className.length + 1);
+                            }
+                        }
+                    }
+                    else if (virtualCode.id === 'scriptsetup_raw') {
+                        if (!sfc.scriptSetup) {
+                            return;
+                        }
+                        const templateVirtualCode = sourceScript.generated.embeddedCodes.get('template');
+                        if (!templateVirtualCode) {
+                            return;
+                        }
+                        const templateDocumentUri = context.encodeEmbeddedDocumentUri(decoded[0], 'template');
+                        const templateDocument = context.documents.get(templateDocumentUri, templateVirtualCode.languageId, templateVirtualCode.snapshot);
+                        const templateRefs = codegen?.getGeneratedTemplate()?.templateRefs;
+                        const useTemplateRefs = codegen?.getScriptSetupRanges()?.useTemplateRef ?? [];
+                        for (const { arg } of useTemplateRefs) {
+                            if (!arg) {
+                                continue;
+                            }
+                            const name = sfc.scriptSetup.content.slice(arg.start + 1, arg.end - 1);
+                            for (const { offset } of templateRefs?.get(name) ?? []) {
+                                const start = templateDocument.positionAt(offset);
+                                const end = templateDocument.positionAt(offset + name.length);
                                 result.push({
                                     range: {
-                                        start: document.positionAt(offset),
-                                        end: document.positionAt(offset + className.length),
+                                        start: document.positionAt(arg.start + 1),
+                                        end: document.positionAt(arg.end - 1),
                                     },
-                                    target: context.encodeEmbeddedDocumentUri(decoded[0], 'style_' + style.index) + `#L${start.line + 1},${start.character + 1}-L${end.line + 1},${end.character + 1}`,
+                                    target: templateDocumentUri + `#L${start.line + 1},${start.character + 1}-L${end.line + 1},${end.character + 1}`,
                                 });
                             }
                         }

package/lib/plugins/vue-inlayhints.d.ts

@@ -1,5 +1,5 @@
+import type { LanguageServicePlugin } from '@volar/language-service';
 import type * as ts from 'typescript';
-import type { LanguageServicePlugin } from '../types';
 export declare function create(ts: typeof import('typescript')): LanguageServicePlugin;
 /**
  * Refactored from https://github.com/vuejs/core/blob/main/packages/compiler-sfc/src/script/definePropsDestructure.ts

package/lib/plugins/vue-inlayhints.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
 exports.findDestructuredProps = findDestructuredProps;
 const language_core_1 = require("@vue/language-core");
-const index_1 = require("@vue/language-core/lib/codegen/utils/index");
 const vscode_uri_1 = require("vscode-uri");
 function create(ts) {
     return {
@@ -148,7 +147,7 @@ function findDestructuredProps(ts, ast, props) {
             && initializer
             && ts.isCallExpression(initializer)
             && initializer.expression.getText(ast) === 'defineProps';
-        for (const { id } of (0, index_1.collectIdentifiers)(ts, name)) {
+        for (const { id } of (0, language_core_1.collectIdentifiers)(ts, name)) {
             if (isDefineProps) {
                 excludedIds.add(id);
             }
@@ -163,7 +162,7 @@ function findDestructuredProps(ts, ast, props) {
             registerLocalBinding(name);
         }
         for (const p of parameters) {
-            for (const { id } of (0, index_1.collectIdentifiers)(ts, p)) {
+            for (const { id } of (0, language_core_1.collectIdentifiers)(ts, p)) {
                 registerLocalBinding(id);
             }
         }

package/lib/plugins/vue-missing-props-hints.d.ts

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

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

@@ -5,7 +5,6 @@ const language_core_1 = require("@vue/language-core");
 const html = require("vscode-html-languageservice");
 const vscode_uri_1 = require("vscode-uri");
 const nameCasing_1 = require("../nameCasing");
-const types_1 = require("../types");
 function create(getTsPluginClient) {
     return {
         name: 'vue-missing-props-hints',
@@ -23,7 +22,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;
@@ -44,7 +42,7 @@ function create(getTsPluginClient) {
                         return;
                     }
                     const result = [];
-                    const casing = await (0, nameCasing_1.getNameCasing)(context, decoded[0]);
+                    const casing = await (0, nameCasing_1.checkCasing)(context, decoded[0]);
                     const components = await tsPluginClient?.getComponentNames(root.fileName) ?? [];
                     const componentProps = {};
                     intrinsicElementNames ??= new Set(await tsPluginClient?.getElementNames(root.fileName) ?? []);
@@ -101,7 +99,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));
@@ -129,7 +127,7 @@ function create(getTsPluginClient) {
                                                     start: document.positionAt(current.labelOffset),
                                                     end: document.positionAt(current.labelOffset),
                                                 },
-                                                newText: ` :${casing.attr === types_1.AttrNameCasing.Kebab ? (0, language_core_1.hyphenateAttr)(requiredProp) : requiredProp}=`,
+                                                newText: ` :${casing.attr === nameCasing_1.AttrNameCasing.Kebab ? (0, language_core_1.hyphenateAttr)(requiredProp) : requiredProp}=`,
                                             }],
                                     });
                                 }

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

@@ -1,3 +1,2 @@
-import type { LanguageServiceContext } from '@volar/language-service';
-import { type LanguageServicePlugin } from '../types';
+import type { LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 export declare function create(mode: 'html' | 'pug', getTsPluginClient?: (context: LanguageServiceContext) => import('@vue/typescript-plugin/lib/requests').Requests | undefined): LanguageServicePlugin;