@vue/language-service 2.1.8 → 2.2.0

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

@@ -23,13 +23,18 @@ function create(ts, getTsPluginClient) {
                     if (startOffset === endOffset) {
                         return;
                     }
-                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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 (!(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) || virtualCode?.id !== 'template') {
+                    if (!sourceScript?.generated || virtualCode?.id !== 'template') {
                         return;
                     }
-                    const { _sfc: sfc } = sourceScript.generated.root;
+                    const root = sourceScript.generated.root;
+                    if (!(root instanceof language_core_1.VueVirtualCode)) {
+                        return;
+                    }
+                    const sfc = root._sfc;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!sfc.template || !script) {
                         return;
@@ -57,12 +62,14 @@ function create(ts, getTsPluginClient) {
                     const decoded = context.decodeEmbeddedDocumentUri(parsedUri);
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
-                    if (!(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode) || virtualCode?.id !== 'template') {
+                    if (!sourceScript?.generated || virtualCode?.id !== 'template') {
                         return codeAction;
                     }
-                    const document = context.documents.get(parsedUri, virtualCode.languageId, virtualCode.snapshot);
-                    const sfcDocument = context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot);
-                    const { _sfc: sfc } = sourceScript.generated.root;
+                    const root = sourceScript.generated.root;
+                    if (!(root instanceof language_core_1.VueVirtualCode)) {
+                        return codeAction;
+                    }
+                    const sfc = root._sfc;
                     const script = sfc.scriptSetup ?? sfc.script;
                     if (!sfc.template || !script) {
                         return codeAction;
@@ -71,16 +78,18 @@ function create(ts, getTsPluginClient) {
                     if (!templateCodeRange) {
                         return codeAction;
                     }
-                    const toExtract = await tsPluginClient?.collectExtractProps(sourceScript.generated.root.fileName, templateCodeRange) ?? [];
+                    const toExtract = await tsPluginClient?.collectExtractProps(root.fileName, templateCodeRange) ?? [];
                     if (!toExtract) {
                         return codeAction;
                     }
                     const templateInitialIndent = await context.env.getConfiguration('vue.format.template.initialIndent') ?? true;
                     const scriptInitialIndent = await context.env.getConfiguration('vue.format.script.initialIndent') ?? false;
-                    const newUri = sfcDocument.uri.substring(0, sfcDocument.uri.lastIndexOf('/') + 1) + `${newName}.vue`;
+                    const document = context.documents.get(parsedUri, virtualCode.languageId, virtualCode.snapshot);
+                    const sfcDocument = context.documents.get(sourceScript.id, sourceScript.languageId, sourceScript.snapshot);
+                    const newUri = sfcDocument.uri.slice(0, sfcDocument.uri.lastIndexOf('/') + 1) + `${newName}.vue`;
                     const lastImportNode = getLastImportNode(ts, script.ast);
                     let newFileTags = [];
-                    newFileTags.push(constructTag('template', [], templateInitialIndent, sfc.template.content.substring(templateCodeRange[0], templateCodeRange[1])));
+                    newFileTags.push(constructTag('template', [], templateInitialIndent, sfc.template.content.slice(templateCodeRange[0], templateCodeRange[1])));
                     if (toExtract.length) {
                         newFileTags.push(constructTag('script', ['setup', 'lang="ts"'], scriptInitialIndent, generateNewScriptContents()));
                     }

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

@@ -1,5 +1,5 @@
-import type { LanguageServicePlugin } from '../types';
 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,8 +3,8 @@ 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");
-const common_1 = require("@vue/language-core/lib/codegen/common");
 function create(ts) {
     return {
         name: 'vue-inlay-hints',
@@ -14,65 +14,74 @@ function create(ts) {
         create(context) {
             return {
                 async provideInlayHints(document, range) {
-                    const settings = {};
-                    const result = [];
-                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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 instanceof language_core_1.VueVirtualCode) {
-                        const codegen = language_core_1.tsCodegen.get(virtualCode._sfc);
-                        const inlayHints = [
-                            ...codegen?.generatedTemplate.get()?.inlayHints ?? [],
-                            ...codegen?.generatedScript.get()?.inlayHints ?? [],
-                        ];
-                        const scriptSetupRanges = codegen?.scriptSetupRanges.get();
-                        if (scriptSetupRanges?.props.destructured && virtualCode._sfc.scriptSetup?.ast) {
-                            const setting = 'vue.inlayHints.destructuredProps';
-                            settings[setting] ??= await context.env.getConfiguration?.(setting) ?? false;
-                            if (settings[setting]) {
-                                for (const [prop, isShorthand] of findDestructuredProps(ts, virtualCode._sfc.scriptSetup.ast, scriptSetupRanges.props.destructured)) {
-                                    const name = prop.text;
-                                    const end = prop.getEnd();
-                                    const pos = isShorthand ? end : end - name.length;
-                                    const label = isShorthand ? `: props.${name}` : 'props.';
-                                    inlayHints.push({
-                                        blockName: 'scriptSetup',
-                                        offset: pos,
-                                        setting,
-                                        label,
-                                    });
-                                }
-                            }
-                        }
-                        const blocks = [
-                            virtualCode._sfc.template,
-                            virtualCode._sfc.script,
-                            virtualCode._sfc.scriptSetup,
-                        ];
-                        const start = document.offsetAt(range.start);
-                        const end = document.offsetAt(range.end);
-                        for (const hint of inlayHints) {
-                            const block = blocks.find(block => block?.name === hint.blockName);
-                            const hintOffset = (block?.startTagEnd ?? 0) + hint.offset;
-                            if (hintOffset >= start && hintOffset <= end) {
-                                settings[hint.setting] ??= await context.env.getConfiguration?.(hint.setting) ?? false;
-                                if (!settings[hint.setting]) {
-                                    continue;
-                                }
-                                result.push({
-                                    label: hint.label,
-                                    paddingRight: hint.paddingRight,
-                                    paddingLeft: hint.paddingLeft,
-                                    position: document.positionAt(hintOffset),
-                                    kind: 2,
-                                    tooltip: hint.tooltip ? {
-                                        kind: 'markdown',
-                                        value: hint.tooltip,
-                                    } : undefined,
+                    if (!(virtualCode instanceof language_core_1.VueVirtualCode)) {
+                        return;
+                    }
+                    const settings = {};
+                    async function getSettingEnabled(key) {
+                        return settings[key] ??= await context.env.getConfiguration?.(key) ?? false;
+                    }
+                    const result = [];
+                    const codegen = language_core_1.tsCodegen.get(virtualCode._sfc);
+                    const inlayHints = [
+                        ...codegen?.generatedTemplate.get()?.inlayHints ?? [],
+                        ...codegen?.generatedScript.get()?.inlayHints ?? [],
+                    ];
+                    const scriptSetupRanges = codegen?.scriptSetupRanges.get();
+                    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)) {
+                                const name = prop.text;
+                                const end = prop.getEnd();
+                                const pos = isShorthand ? end : end - name.length;
+                                const label = isShorthand ? `: props.${name}` : 'props.';
+                                inlayHints.push({
+                                    blockName: 'scriptSetup',
+                                    offset: pos,
+                                    setting,
+                                    label,
                                 });
                             }
                         }
                     }
+                    const blocks = [
+                        virtualCode._sfc.template,
+                        virtualCode._sfc.script,
+                        virtualCode._sfc.scriptSetup,
+                    ];
+                    const start = document.offsetAt(range.start);
+                    const end = document.offsetAt(range.end);
+                    for (const hint of inlayHints) {
+                        const block = blocks.find(block => block?.name === hint.blockName);
+                        if (!block) {
+                            continue;
+                        }
+                        const hintOffset = block.startTagEnd + hint.offset;
+                        if (hintOffset < start || hintOffset >= end) {
+                            continue;
+                        }
+                        const enabled = await getSettingEnabled(hint.setting);
+                        if (!enabled) {
+                            continue;
+                        }
+                        result.push({
+                            label: hint.label,
+                            paddingRight: hint.paddingRight,
+                            paddingLeft: hint.paddingLeft,
+                            position: document.positionAt(hintOffset),
+                            kind: 2,
+                            tooltip: hint.tooltip ? {
+                                kind: 'markdown',
+                                value: hint.tooltip,
+                            } : undefined,
+                        });
+                    }
                     return result;
                 },
             };
@@ -139,7 +148,7 @@ function findDestructuredProps(ts, ast, props) {
             && initializer
             && ts.isCallExpression(initializer)
             && initializer.expression.getText(ast) === 'defineProps';
-        for (const [id] of (0, common_1.collectIdentifiers)(ts, name)) {
+        for (const [id] of (0, index_1.collectIdentifiers)(ts, name)) {
             if (isDefineProps) {
                 excludedIds.add(id);
             }
@@ -154,7 +163,7 @@ function findDestructuredProps(ts, ast, props) {
             registerLocalBinding(name);
         }
         for (const p of parameters) {
-            for (const [id] of (0, common_1.collectIdentifiers)(ts, p)) {
+            for (const [id] of (0, index_1.collectIdentifiers)(ts, p)) {
                 registerLocalBinding(id);
             }
         }

package/lib/plugins/vue-sfc.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
-const vue = require("@vue/language-core");
+const language_core_1 = require("@vue/language-core");
 const volar_service_html_1 = require("volar-service-html");
 const html = require("vscode-html-languageservice");
-const data_1 = require("./data");
 const vscode_uri_1 = require("vscode-uri");
+const data_1 = require("./data");
 let sfcDataProvider;
 function create() {
     const htmlPlugin = (0, volar_service_html_1.create)({
@@ -16,10 +16,10 @@ function create() {
             return [sfcDataProvider];
         },
         async getFormattingOptions(document, options, context) {
-            return await worker(document, context, async (vueCode) => {
+            return await worker(document, context, async (root) => {
                 const formatSettings = await context.env.getConfiguration?.('html.format') ?? {};
                 const blockTypes = ['template', 'script', 'style'];
-                for (const customBlock of vueCode._sfc.customBlocks) {
+                for (const customBlock of root._sfc.customBlocks) {
                     blockTypes.push(customBlock.type);
                 }
                 return {
@@ -44,7 +44,7 @@ function create() {
                 ...htmlPluginInstance,
                 provideDocumentLinks: undefined,
                 async resolveEmbeddedCodeFormattingOptions(sourceScript, virtualCode, options) {
-                    if (sourceScript.generated?.root instanceof vue.VueVirtualCode) {
+                    if (sourceScript.generated?.root instanceof language_core_1.VueVirtualCode) {
                         if (virtualCode.id === 'script_raw' || virtualCode.id === 'scriptsetup_raw') {
                             if (await context.env.getConfiguration?.('vue.format.script.initialIndent') ?? false) {
                                 options.initialIndentLevel++;
@@ -64,52 +64,52 @@ function create() {
                     return options;
                 },
                 provideDocumentSymbols(document) {
-                    return worker(document, context, vueSourceFile => {
+                    return worker(document, context, root => {
                         const result = [];
-                        const descriptor = vueSourceFile._sfc;
-                        if (descriptor.template) {
+                        const sfc = root._sfc;
+                        if (sfc.template) {
                             result.push({
                                 name: 'template',
                                 kind: 2,
                                 range: {
-                                    start: document.positionAt(descriptor.template.start),
-                                    end: document.positionAt(descriptor.template.end),
+                                    start: document.positionAt(sfc.template.start),
+                                    end: document.positionAt(sfc.template.end),
                                 },
                                 selectionRange: {
-                                    start: document.positionAt(descriptor.template.start),
-                                    end: document.positionAt(descriptor.template.startTagEnd),
+                                    start: document.positionAt(sfc.template.start),
+                                    end: document.positionAt(sfc.template.startTagEnd),
                                 },
                             });
                         }
-                        if (descriptor.script) {
+                        if (sfc.script) {
                             result.push({
                                 name: 'script',
                                 kind: 2,
                                 range: {
-                                    start: document.positionAt(descriptor.script.start),
-                                    end: document.positionAt(descriptor.script.end),
+                                    start: document.positionAt(sfc.script.start),
+                                    end: document.positionAt(sfc.script.end),
                                 },
                                 selectionRange: {
-                                    start: document.positionAt(descriptor.script.start),
-                                    end: document.positionAt(descriptor.script.startTagEnd),
+                                    start: document.positionAt(sfc.script.start),
+                                    end: document.positionAt(sfc.script.startTagEnd),
                                 },
                             });
                         }
-                        if (descriptor.scriptSetup) {
+                        if (sfc.scriptSetup) {
                             result.push({
                                 name: 'script setup',
                                 kind: 2,
                                 range: {
-                                    start: document.positionAt(descriptor.scriptSetup.start),
-                                    end: document.positionAt(descriptor.scriptSetup.end),
+                                    start: document.positionAt(sfc.scriptSetup.start),
+                                    end: document.positionAt(sfc.scriptSetup.end),
                                 },
                                 selectionRange: {
-                                    start: document.positionAt(descriptor.scriptSetup.start),
-                                    end: document.positionAt(descriptor.scriptSetup.startTagEnd),
+                                    start: document.positionAt(sfc.scriptSetup.start),
+                                    end: document.positionAt(sfc.scriptSetup.startTagEnd),
                                 },
                             });
                         }
-                        for (const style of descriptor.styles) {
+                        for (const style of sfc.styles) {
                             let name = 'style';
                             if (style.scoped) {
                                 name += ' scoped';
@@ -130,7 +130,7 @@ function create() {
                                 },
                             });
                         }
-                        for (const customBlock of descriptor.customBlocks) {
+                        for (const customBlock of sfc.customBlocks) {
                             result.push({
                                 name: `${customBlock.type}`,
                                 kind: 2,
@@ -217,10 +217,12 @@ function create() {
         if (document.languageId !== 'vue-root-tags') {
             return;
         }
-        const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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]);
-        if (sourceScript?.generated?.root instanceof vue.VueVirtualCode) {
-            return callback(sourceScript.generated.root);
+        const root = sourceScript?.generated?.root;
+        if (root instanceof language_core_1.VueVirtualCode) {
+            return callback(root);
         }
     }
 }