@vue/typescript-plugin 3.2.1 → 3.2.3

package/lib/common.js

@@ -10,27 +10,29 @@ const language_core_1 = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 const windowsPathReg = /\\/g;
 function preprocessLanguageService(languageService, getLanguage) {
-    const { getQuickInfoAtPosition, getSuggestionDiagnostics, getCompletionsAtPosition, getCodeFixesAtPosition, } = languageService;
+    const { getQuickInfoAtPosition, getSuggestionDiagnostics, getCompletionsAtPosition, getCodeFixesAtPosition, findRenameLocations, } = languageService;
     languageService.getQuickInfoAtPosition = (fileName, position, ...rests) => {
         const result = getQuickInfoAtPosition(fileName, position, ...rests);
-        if (!result) {
+        if (!result || result.tags?.length) {
             return result;
         }
         const language = getLanguage();
         if (!language) {
             return result;
         }
-        const [serviceScript, _targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, , sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (!serviceScript || !(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode)) {
             return result;
         }
-        for (const sourceOffset of (0, transform_1.toSourceOffsets)(sourceScript, language, serviceScript, position, () => true)) {
-            const generatedOffset2 = (0, transform_1.toGeneratedOffset)(language, serviceScript, sourceScript, sourceOffset[1], (data) => !!data.__importCompletion);
-            if (generatedOffset2 !== undefined) {
-                const extraInfo = getQuickInfoAtPosition(fileName, generatedOffset2, ...rests);
-                if (extraInfo) {
-                    result.tags ??= [];
-                    result.tags.push(...extraInfo.tags ?? []);
+        const codegen = language_core_1.tsCodegen.get(sourceScript.generated.root.sfc);
+        const leadingOffset = sourceScript.snapshot.getLength();
+        for (const sourceRange of (0, transform_1.toSourceRanges)(sourceScript, language, serviceScript, result.textSpan.start, result.textSpan.start + result.textSpan.length, true, () => true)) {
+            const generateRange2 = (0, transform_1.toGeneratedRange)(language, serviceScript, sourceScript, sourceRange[1], sourceRange[2], (data) => !!data.__importCompletion);
+            if (generateRange2 !== undefined) {
+                const variableName = serviceScript.code.snapshot.getText(generateRange2[0] - leadingOffset, generateRange2[1] - leadingOffset);
+                if (codegen?.getSetupExposed().has(variableName)) {
+                    const extraInfo = getQuickInfoAtPosition(fileName, generateRange2[0], ...rests);
+                    result.tags = extraInfo?.tags;
                 }
             }
         }
@@ -42,17 +44,22 @@ function preprocessLanguageService(languageService, getLanguage) {
         if (!language) {
             return result;
         }
-        const [serviceScript, _targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        const [serviceScript, , sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (!serviceScript || !(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode)) {
             return result;
         }
+        const codegen = language_core_1.tsCodegen.get(sourceScript.generated.root.sfc);
+        const leadingOffset = sourceScript.snapshot.getLength();
         for (const diagnostic of result) {
             for (const sourceRange of (0, transform_1.toSourceRanges)(sourceScript, language, serviceScript, diagnostic.start, diagnostic.start + diagnostic.length, true, (data) => !!data.__importCompletion)) {
                 const generateRange2 = (0, transform_1.toGeneratedRange)(language, serviceScript, sourceScript, sourceRange[1], sourceRange[2], (data) => !data.__importCompletion);
                 if (generateRange2 !== undefined) {
-                    diagnostic.start = generateRange2[0];
-                    diagnostic.length = generateRange2[1] - generateRange2[0];
-                    break;
+                    const variableName = serviceScript.code.snapshot.getText(generateRange2[0] - leadingOffset, generateRange2[1] - leadingOffset);
+                    if (codegen?.getSetupExposed().has(variableName)) {
+                        diagnostic.start = generateRange2[0];
+                        diagnostic.length = generateRange2[1] - generateRange2[0];
+                        break;
+                    }
                 }
             }
         }
@@ -122,6 +129,95 @@ function preprocessLanguageService(languageService, getLanguage) {
         }
         return result;
     };
+    languageService.findRenameLocations = (fileName, position, ...rests) => {
+        // @ts-expect-error
+        const result = findRenameLocations(fileName, position, ...rests);
+        if (!result?.length) {
+            return result;
+        }
+        const language = getLanguage();
+        if (!language) {
+            return result;
+        }
+        const [serviceScript, _targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+        if (!serviceScript || !(sourceScript?.generated?.root instanceof language_core_1.VueVirtualCode)) {
+            return result;
+        }
+        const map = language.maps.get(serviceScript.code, sourceScript);
+        const leadingOffset = sourceScript.snapshot.getLength();
+        const isShorthand = (data) => !!data.__shorthandExpression;
+        // { foo: __VLS_ctx.foo }
+        //   ^^^            ^^^
+        // if the rename is triggered directly on the shorthand,
+        // skip the entire request on the generated property name
+        if ([...map.toSourceLocation(position - leadingOffset, isShorthand)].length === 0) {
+            for (const [offset] of map.toSourceLocation(position - leadingOffset, () => true)) {
+                for (const _ of map.toGeneratedLocation(offset, isShorthand)) {
+                    return;
+                }
+            }
+        }
+        const preferAlias = typeof rests[2] === 'boolean'
+            ? rests[2]
+            : rests[2]?.providePrefixAndSuffixTextForRename ?? true;
+        if (!preferAlias) {
+            return result;
+        }
+        const locations = [...result];
+        outer: for (let i = 0; i < locations.length; i++) {
+            const { textSpan } = locations[i];
+            const generatedLeft = textSpan.start - leadingOffset;
+            const generatedRight = textSpan.start + textSpan.length - leadingOffset;
+            // { foo: __VLS_ctx.foo }
+            //                  ^^^
+            for (const [start, end, { data }] of map.toSourceRange(generatedLeft, generatedRight, true, isShorthand)) {
+                locations.splice(i, 1, {
+                    ...locations[i],
+                    ...getPrefixAndSuffixForShorthandRename(data.__shorthandExpression, 'right', sourceScript.snapshot.getText(start, end)),
+                });
+                continue outer;
+            }
+            // { foo: __VLS_ctx.foo }
+            //   ^^^
+            for (const [start, end] of map.toSourceRange(generatedLeft, generatedRight, true, () => true)) {
+                for (const [, , { data }] of map.toGeneratedRange(start, end, true, isShorthand)) {
+                    locations.splice(i, 1, {
+                        ...locations[i],
+                        ...getPrefixAndSuffixForShorthandRename(data.__shorthandExpression, 'left', sourceScript.snapshot.getText(start, end)),
+                    });
+                    continue outer;
+                }
+            }
+        }
+        return locations;
+    };
+}
+function getPrefixAndSuffixForShorthandRename(type, target, originalText) {
+    if (type === 'html') {
+        if (target === 'left') {
+            return {
+                suffixText: `="${(0, shared_1.camelize)(originalText)}"`,
+            };
+        }
+        else {
+            return {
+                prefixText: `${originalText}="`,
+                suffixText: `"`,
+            };
+        }
+    }
+    else {
+        if (target === 'left') {
+            return {
+                suffixText: `: ${originalText}`,
+            };
+        }
+        else {
+            return {
+                prefixText: `${originalText}: `,
+            };
+        }
+    }
 }
 function postprocessLanguageService(ts, language, languageService, vueOptions, asScriptId) {
     const proxyCache = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "3.2.1",
+	"version": "3.2.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -14,14 +14,14 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "2.4.27",
-		"@vue/language-core": "3.2.1",
+		"@vue/language-core": "3.2.3",
 		"@vue/shared": "^3.5.0",
 		"path-browserify": "^1.0.1",
-		"vue-component-meta": "3.2.1"
+		"vue-component-meta": "3.2.3"
 	},
 	"devDependencies": {
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1"
 	},
-	"gitHead": "fad5a89205579e6a0902d7ee5bae3db7b510e2f4"
+	"gitHead": "efc6882ab62a518b41ab5c8dc1d762c41c862ebc"
 }