@vue/language-core 2.0.5 → 2.0.6

package/lib/generators/template.js

@@ -942,7 +942,10 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
                     else {
                         const propVariableName = (0, shared_1.camelize)(prop.exp.loc.source);
                         if (validTsVarReg.test(propVariableName)) {
-                            yield _ts('__VLS_ctx.');
+                            if (!localVars.has(propVariableName)) {
+                                accessedGlobalVariables.add(propVariableName);
+                                yield _ts('__VLS_ctx.');
+                            }
                             yield* generateCamelized(prop.exp.loc.source, prop.exp.loc.start.offset, caps_all);
                             if (mode === 'normal') {
                                 yield _ts([
@@ -951,18 +954,17 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
                                     prop.exp.loc.end.offset,
                                     (0, utils_1.disableAllFeatures)({
                                         __hint: {
-                                            setting: 'vue.inlayHints.vbindShorthand',
+                                            setting: 'vue.inlayHints.vBindShorthand',
                                             label: `="${propVariableName}"`,
                                             tooltip: [
                                                 `This is a shorthand for \`${prop.exp.loc.source}="${propVariableName}"\`.`,
-                                                'To hide this hint, set `vue.inlayHints.vbindShorthand` to `false` in IDE settings.',
+                                                'To hide this hint, set `vue.inlayHints.vBindShorthand` to `false` in IDE settings.',
                                                 '[More info](https://github.com/vuejs/core/pull/9451)',
                                             ].join('\n\n'),
                                         },
                                     })
                                 ]);
                             }
-                            accessedGlobalVariables.add(propVariableName);
                         }
                     }
                 }

package/lib/virtualFile/computedMappings.d.ts

@@ -1,4 +1,4 @@
-import { Mapping } from '@volar/language-core';
+import { CodeMapping } from '@volar/language-core';
 import type * as ts from 'typescript';
-import type { Sfc, VueCodeInformation } from '../types';
-export declare function computedMappings(snapshot: () => ts.IScriptSnapshot, sfc: Sfc): () => Mapping<VueCodeInformation>[];
+import type { Sfc } from '../types';
+export declare function computedMappings(snapshot: () => ts.IScriptSnapshot, sfc: Sfc): () => CodeMapping[];

package/lib/virtualFile/computedMappings.js

@@ -18,7 +18,7 @@ function computedMappings(snapshot, sfc) {
                 (0, language_core_1.replaceSourceRange)(str, undefined, block.startTagEnd, block.endTagStart, '\n\n');
             }
         }
-        return str
+        const mappings = str
             .filter(s => typeof s !== 'string')
             .map((m) => {
             const text = m[0];
@@ -30,6 +30,36 @@ function computedMappings(snapshot, sfc) {
                 data: m[3],
             };
         });
+        // fix folding range end position failed to mapping
+        for (const block of [
+            sfc.script,
+            sfc.scriptSetup,
+            sfc.template,
+            ...sfc.styles,
+            ...sfc.customBlocks,
+        ]) {
+            const offsets = [];
+            if (block) {
+                let content = block.content;
+                if (content.endsWith('\r\n')) {
+                    content = content.slice(0, -2);
+                }
+                else if (content.endsWith('\n')) {
+                    content = content.slice(0, -1);
+                }
+                const offset = content.lastIndexOf('\n') + 1;
+                offsets.push(block.startTagEnd + offset);
+            }
+            if (offsets.length) {
+                mappings.push({
+                    sourceOffsets: offsets,
+                    generatedOffsets: offsets,
+                    lengths: offsets.map(() => 0),
+                    data: (0, utils_1.disableAllFeatures)({ structure: true }),
+                });
+            }
+        }
+        return mappings;
     });
 }
 exports.computedMappings = computedMappings;

package/lib/virtualFile/vueFile.d.ts

@@ -14,12 +14,12 @@ export declare class VueGeneratedCode implements VirtualCode {
     _snapshot: Signal<ts.IScriptSnapshot>;
     getVueSfc: () => import("@vue/compiler-sfc").SFCParseResult | undefined;
     sfc: import("../types").Sfc;
-    getMappings: () => import("@volar/language-core").Mapping<import("../types").VueCodeInformation>[];
+    getMappings: () => import("@volar/language-core").CodeMapping[];
     getEmbeddedCodes: () => VirtualCode[];
     codegenStacks: Stack[];
     get embeddedCodes(): VirtualCode[];
     get snapshot(): ts.IScriptSnapshot;
-    get mappings(): import("@volar/language-core").Mapping<import("../types").VueCodeInformation>[];
+    get mappings(): import("@volar/language-core").CodeMapping[];
     constructor(fileName: string, languageId: string, initSnapshot: ts.IScriptSnapshot, vueCompilerOptions: VueCompilerOptions, plugins: ReturnType<VueLanguagePlugin>[], ts: typeof import('typescript'), codegenStack: boolean);
     update(newSnapshot: ts.IScriptSnapshot): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.5",
+	"version": "2.0.6",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.1.1",
+		"@volar/language-core": "~2.1.2",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "62b4fcb0d3f7153b5b2f5571af32f519117d8466"
+	"gitHead": "feb990ccec85f6330bba37c8b1d1287f0980274c"
 }