@vue/language-core 2.0.13 → 2.0.14

package/lib/codegen/template/vIf.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateVIf = void 0;
+const language_core_1 = require("@volar/language-core");
+const CompilerDOM = require("@vue/compiler-dom");
+const common_1 = require("../common");
+const index_1 = require("./index");
+const interpolation_1 = require("./interpolation");
+const templateChild_1 = require("./templateChild");
+function* generateVIf(options, ctx, node, currentElement, componentCtxVar) {
+    let originalBlockConditionsLength = ctx.blockConditions.length;
+    for (let i = 0; i < node.branches.length; i++) {
+        const branch = node.branches[i];
+        if (i === 0) {
+            yield `if `;
+        }
+        else if (branch.condition) {
+            yield `else if `;
+        }
+        else {
+            yield `else `;
+        }
+        let addedBlockCondition = false;
+        if (branch.condition?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
+            const codes = [
+                ...(0, interpolation_1.generateInterpolation)(options, ctx, branch.condition.content, branch.condition.loc, branch.condition.loc.start.offset, ctx.codeFeatures.all, '(', ')'),
+            ];
+            for (const code of codes) {
+                yield code;
+            }
+            ctx.blockConditions.push((0, language_core_1.toString)(codes));
+            addedBlockCondition = true;
+            yield ` `;
+        }
+        yield `{${common_1.newLine}`;
+        if ((0, index_1.isFragment)(node)) {
+            yield* ctx.resetDirectiveComments('end of v-if start');
+        }
+        let prev;
+        for (const childNode of branch.children) {
+            yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, currentElement, prev, componentCtxVar);
+            prev = childNode;
+        }
+        yield* ctx.generateAutoImportCompletion();
+        yield `}${common_1.newLine}`;
+        if (addedBlockCondition) {
+            ctx.blockConditions[ctx.blockConditions.length - 1] = `!(${ctx.blockConditions[ctx.blockConditions.length - 1]})`;
+        }
+    }
+    ctx.blockConditions.length = originalBlockConditionsLength;
+}
+exports.generateVIf = generateVIf;
+//# sourceMappingURL=vIf.js.map

package/lib/languageModule.d.ts

@@ -1,10 +1,10 @@
 import { type LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { VueCompilerOptions, VueLanguagePlugin } from './types';
-import { VueGeneratedCode } from './virtualFile/vueFile';
-interface _Plugin extends LanguagePlugin<VueGeneratedCode> {
+import { VueVirtualCode } from './virtualFile/vueFile';
+interface _Plugin extends LanguagePlugin<VueVirtualCode> {
     getCanonicalFileName: (fileName: string) => string;
     pluginContext: Parameters<VueLanguagePlugin>[0];
 }
-export declare function createVueLanguagePlugin(ts: typeof import('typescript'), getFileName: (fileId: string) => string, useCaseSensitiveFileNames: boolean, getProjectVersion: () => string, getScriptFileNames: () => string[] | Set<string>, compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, codegenStack?: boolean): _Plugin;
+export declare function createVueLanguagePlugin(ts: typeof import('typescript'), getFileName: (fileId: string) => string, useCaseSensitiveFileNames: boolean, getProjectVersion: () => string, getScriptFileNames: () => string[] | Set<string>, compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions): _Plugin;
 export {};

package/lib/languageModule.js

@@ -35,7 +35,7 @@ function getFileRegistryKey(compilerOptions, vueCompilerOptions, plugins) {
     ];
     return JSON.stringify(values);
 }
-function createVueLanguagePlugin(ts, getFileName, useCaseSensitiveFileNames, getProjectVersion, getScriptFileNames, compilerOptions, vueCompilerOptions, codegenStack = false) {
+function createVueLanguagePlugin(ts, getFileName, useCaseSensitiveFileNames, getProjectVersion, getScriptFileNames, compilerOptions, vueCompilerOptions) {
     const allowLanguageIds = new Set(['vue']);
     const pluginContext = {
         modules: {
@@ -49,7 +49,6 @@ function createVueLanguagePlugin(ts, getFileName, useCaseSensitiveFileNames, get
         },
         compilerOptions,
         vueCompilerOptions,
-        codegenStack,
         globalTypesHolder: undefined,
     };
     const plugins = (0, plugins_1.getDefaultVueLanguagePlugins)(pluginContext);
@@ -85,7 +84,7 @@ function createVueLanguagePlugin(ts, getFileName, useCaseSensitiveFileNames, get
                     return code;
                 }
                 else {
-                    const code = new vueFile_1.VueGeneratedCode(fileName, languageId, snapshot, vueCompilerOptions, plugins, ts, codegenStack);
+                    const code = new vueFile_1.VueVirtualCode(fileName, languageId, snapshot, vueCompilerOptions, plugins, ts);
                     fileRegistry.set(fileId, code);
                     return code;
                 }

package/lib/plugins/shared.d.ts

@@ -0,0 +1,2 @@
+import type { CodeInformation } from '@volar/language-core';
+export declare const allCodeFeatures: CodeInformation;

package/lib/plugins/shared.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.allCodeFeatures = void 0;
+exports.allCodeFeatures = {
+    verification: true,
+    completion: true,
+    semantic: true,
+    navigation: true,
+    structure: true,
+    format: true,
+};
+//# sourceMappingURL=shared.js.map

package/lib/plugins/vue-sfc-customblocks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../generators/utils");
+const shared_1 = require("./shared");
 const plugin = () => {
     return {
         version: 2,
@@ -18,7 +18,7 @@ const plugin = () => {
                     customBlock.content,
                     customBlock.name,
                     0,
-                    (0, utils_1.enableAllFeatures)({}),
+                    shared_1.allCodeFeatures,
                 ]);
             }
         },

package/lib/plugins/vue-sfc-scripts.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../generators/utils");
 const plugin = () => {
     return {
         version: 2,
@@ -23,10 +22,10 @@ const plugin = () => {
                     script.content,
                     script.name,
                     0,
-                    (0, utils_1.disableAllFeatures)({
+                    {
                         structure: true,
                         format: true,
-                    }),
+                    },
                 ]);
             }
         },

package/lib/plugins/vue-sfc-styles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../generators/utils");
+const shared_1 = require("./shared");
 const plugin = () => {
     return {
         version: 2,
@@ -34,7 +34,7 @@ const plugin = () => {
                             cssVar.text,
                             style.name,
                             cssVar.offset,
-                            (0, utils_1.enableAllFeatures)({}),
+                            shared_1.allCodeFeatures,
                         ], ');\n');
                     }
                 }
@@ -43,7 +43,7 @@ const plugin = () => {
                         style.content,
                         style.name,
                         0,
-                        (0, utils_1.enableAllFeatures)({}),
+                        shared_1.allCodeFeatures,
                     ]);
                 }
             }

package/lib/plugins/vue-sfc-template.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../generators/utils");
+const shared_1 = require("./shared");
 const plugin = () => {
     return {
         version: 2,
@@ -19,7 +19,7 @@ const plugin = () => {
                     sfc.template.content,
                     sfc.template.name,
                     0,
-                    (0, utils_1.enableAllFeatures)({}),
+                    shared_1.allCodeFeatures,
                 ]);
             }
         },

package/lib/plugins/vue-template-inline-css.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const inlineCss_1 = require("../generators/inlineCss");
+const CompilerDOM = require("@vue/compiler-dom");
+const template_1 = require("../codegen/template");
+const shared_1 = require("./shared");
+const codeFeatures = {
+    ...shared_1.allCodeFeatures,
+    format: false,
+    structure: false,
+};
 const plugin = () => {
     return {
         version: 2,
@@ -15,9 +22,34 @@ const plugin = () => {
                 return;
             }
             embeddedFile.parentCodeId = 'template';
-            embeddedFile.content.push(...(0, inlineCss_1.generate)(sfc.template.ast));
+            embeddedFile.content.push(...generate(sfc.template.ast));
         },
     };
 };
 exports.default = plugin;
+function* generate(templateAst) {
+    for (const node of (0, template_1.forEachElementNode)(templateAst)) {
+        for (const prop of node.props) {
+            if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
+                && prop.name === 'bind'
+                && prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
+                && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
+                && prop.arg.content === 'style'
+                && prop.exp.constType === CompilerDOM.ConstantTypes.CAN_STRINGIFY) {
+                const endCrt = prop.arg.loc.source[prop.arg.loc.source.length - 1]; // " | '
+                const start = prop.arg.loc.source.indexOf(endCrt) + 1;
+                const end = prop.arg.loc.source.lastIndexOf(endCrt);
+                const content = prop.arg.loc.source.substring(start, end);
+                yield `x { `;
+                yield [
+                    content,
+                    'template',
+                    prop.arg.loc.start.offset + start,
+                    codeFeatures,
+                ];
+                yield ` }\n`;
+            }
+        }
+    }
+}
 //# sourceMappingURL=vue-template-inline-css.js.map

package/lib/plugins/vue-template-inline-ts.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const template_1 = require("../generators/template");
-const utils_1 = require("../generators/utils");
+const common_1 = require("../codegen/common");
+const elementEvents_1 = require("../codegen/template/elementEvents");
+const templateChild_1 = require("../codegen/template/templateChild");
+const vFor_1 = require("../codegen/template/vFor");
 const CompilerDOM = require("@vue/compiler-dom");
-const codeFeatures = (0, utils_1.disableAllFeatures)({
+const codeFeatures = {
     format: true,
     // autoInserts: true, // TODO: support vue-autoinsert-parentheses
-});
+};
 const formatBrackets = {
     normal: ['`${', '}`;'],
     if: ['if (', ') { }'],
@@ -73,8 +75,8 @@ const plugin = ctx => {
                         && prop.exp.constType !== CompilerDOM.ConstantTypes.CAN_STRINGIFY // style='z-index: 2' will compile to {'z-index':'2'}
                     ) {
                         if (prop.name === 'on') {
-                            const ast = (0, template_1.createTsAst)(ctx.modules.typescript, prop.exp, prop.exp.content);
-                            addFormatCodes(prop.exp.content, prop.exp.loc.start.offset, (0, template_1.isCompoundExpression)(ctx.modules.typescript, ast)
+                            const ast = (0, common_1.createTsAst)(ctx.modules.typescript, prop.exp, prop.exp.content);
+                            addFormatCodes(prop.exp.content, prop.exp.loc.start.offset, (0, elementEvents_1.isCompoundExpression)(ctx.modules.typescript, ast)
                                 ? formatBrackets.event
                                 : formatBrackets.normal);
                         }
@@ -99,7 +101,7 @@ const plugin = ctx => {
                 }
             }
             else if (node.type === CompilerDOM.NodeTypes.FOR) {
-                const { leftExpressionRange, leftExpressionText } = (0, template_1.parseVForNode)(node);
+                const { leftExpressionRange, leftExpressionText } = (0, vFor_1.parseVForNode)(node);
                 const { source } = node.parseResult;
                 if (leftExpressionRange && leftExpressionText && source.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
                     const start = leftExpressionRange.start;
@@ -124,7 +126,7 @@ const plugin = ctx => {
             }
             else if (node.type === CompilerDOM.NodeTypes.INTERPOLATION) {
                 // {{ ... }}
-                const [content, start] = (0, template_1.parseInterpolationNode)(node, templateContent);
+                const [content, start] = (0, templateChild_1.parseInterpolationNode)(node, templateContent);
                 const lines = content.split('\n');
                 addFormatCodes(content, start, lines.length <= 1 ? formatBrackets.curly : [
                     lines[0].trim() === '' ? '(' : formatBrackets.curly[0],

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

@@ -1,4 +1,4 @@
-import { Mapping, StackNode } from '@volar/language-core';
+import type { Mapping } from '@volar/language-core';
 import type { Code, Sfc, VueLanguagePlugin } from '../types';
 export declare const tsCodegen: WeakMap<Sfc, {
     scriptRanges: () => {
@@ -62,14 +62,51 @@ export declare const tsCodegen: WeakMap<Sfc, {
     lang: () => string;
     generatedScript: () => {
         codes: Code[];
-        codeStacks: StackNode[];
         linkedCodeMappings: Mapping<any>[];
     };
     generatedTemplate: () => {
         codes: Code[];
-        codeStacks: string[];
-        tagOffsetsMap: Map<string, number[]>;
-        accessedGlobalVariables: Set<string>;
+        ctx: {
+            slots: {
+                name: string;
+                loc?: number | undefined;
+                tagRange: [number, number];
+                varName: string;
+                nodeLoc: any;
+            }[];
+            dynamicSlots: {
+                expVar: string;
+                varName: string;
+            }[];
+            codeFeatures: {
+                all: import("../types").VueCodeInformation;
+                verification: import("../types").VueCodeInformation;
+                completion: import("../types").VueCodeInformation;
+                additionalCompletion: import("../types").VueCodeInformation;
+                navigation: import("../types").VueCodeInformation;
+                navigationAndCompletion: import("../types").VueCodeInformation;
+                withoutHighlight: import("../types").VueCodeInformation;
+                withoutHighlightAndCompletion: import("../types").VueCodeInformation;
+                withoutHighlightAndCompletionAndNavigation: import("../types").VueCodeInformation;
+            };
+            accessGlobalVariables: Map<string, Set<number>>;
+            hasSlotElements: Set<import("@vue/compiler-dom").ElementNode>;
+            blockConditions: string[];
+            usedComponentCtxVars: Set<string>;
+            scopedClasses: {
+                className: string;
+                offset: number;
+            }[];
+            accessGlobalVariable(name: string, offset?: number | undefined): void;
+            hasLocalVariable: (name: string) => boolean;
+            addLocalVariable: (name: string) => void;
+            removeLocalVariable: (name: string) => void;
+            getInternalVariable: () => string;
+            ignoreError: () => Generator<Code, any, unknown>;
+            expectError: (prevNode: import("@vue/compiler-dom").CommentNode) => Generator<Code, any, unknown>;
+            resetDirectiveComments: (endStr: string) => Generator<Code, any, unknown>;
+            generateAutoImportCompletion: () => Generator<Code, any, unknown>;
+        };
         hasSlot: boolean;
     } | undefined;
 }>;

package/lib/plugins/vue-tsx.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsCodegen = void 0;
-const language_core_1 = require("@volar/language-core");
 const computeds_1 = require("computeds");
-const script_1 = require("../generators/script");
-const template_1 = require("../generators/template");
+const path = require("path-browserify");
+const script_1 = require("../codegen/script");
+const template_1 = require("../codegen/template");
 const scriptRanges_1 = require("../parsers/scriptRanges");
 const scriptSetupRanges_1 = require("../parsers/scriptSetupRanges");
 exports.tsCodegen = new WeakMap();
@@ -28,9 +28,8 @@ const plugin = ctx => {
             if (embeddedFile.id.startsWith('script_')) {
                 const tsx = _tsx.generatedScript();
                 if (tsx) {
-                    const [content, contentStacks] = ctx.codegenStack ? (0, language_core_1.track)([...tsx.codes], [...tsx.codeStacks]) : [[...tsx.codes], [...tsx.codeStacks]];
+                    const content = [...tsx.codes];
                     embeddedFile.content = content;
-                    embeddedFile.contentStacks = contentStacks;
                     embeddedFile.linkedCodeMappings = [...tsx.linkedCodeMappings];
                 }
             }
@@ -83,44 +82,56 @@ function createTsx(fileName, _sfc, ctx) {
         if (!_sfc.template) {
             return;
         }
-        const tsCodes = [];
-        const tsCodegenStacks = [];
-        const codegen = (0, template_1.generate)(ts, ctx.compilerOptions, ctx.vueCompilerOptions, _sfc.template, shouldGenerateScopedClasses(), stylesScopedClasses(), hasScriptSetupSlots(), slotsAssignName(), propsAssignName(), ctx.codegenStack);
+        const codes = [];
+        const codegen = (0, template_1.generateTemplate)({
+            ts,
+            compilerOptions: ctx.compilerOptions,
+            vueCompilerOptions: ctx.vueCompilerOptions,
+            template: _sfc.template,
+            shouldGenerateScopedClasses: shouldGenerateScopedClasses(),
+            stylesScopedClasses: stylesScopedClasses(),
+            hasDefineSlots: hasDefineSlots(),
+            slotsAssignName: slotsAssignName(),
+            propsAssignName: propsAssignName(),
+        });
         let current = codegen.next();
         while (!current.done) {
-            const [code, stack] = current.value;
-            tsCodes.push(code);
-            if (ctx.codegenStack) {
-                tsCodegenStacks.push(stack);
-            }
+            const code = current.value;
+            codes.push(code);
             current = codegen.next();
         }
         return {
             ...current.value,
-            codes: tsCodes,
-            codeStacks: tsCodegenStacks,
+            codes: codes,
         };
     });
-    const hasScriptSetupSlots = (0, computeds_1.computed)(() => !!scriptSetupRanges()?.slots.define);
+    const hasDefineSlots = (0, computeds_1.computed)(() => !!scriptSetupRanges()?.slots.define);
     const slotsAssignName = (0, computeds_1.computed)(() => scriptSetupRanges()?.slots.name);
     const propsAssignName = (0, computeds_1.computed)(() => scriptSetupRanges()?.props.name);
     const generatedScript = (0, computeds_1.computed)(() => {
         const codes = [];
-        const codeStacks = [];
         const linkedCodeMappings = [];
         const _template = generatedTemplate();
         let generatedLength = 0;
-        for (const [code, stack] of (0, script_1.generate)(ts, fileName, _sfc.script, _sfc.scriptSetup, _sfc.styles, lang(), scriptRanges(), scriptSetupRanges(), _template ? {
-            tsCodes: _template.codes,
-            tsCodegenStacks: _template.codeStacks,
-            accessedGlobalVariables: _template.accessedGlobalVariables,
-            hasSlot: _template.hasSlot,
-            tagNames: new Set(_template.tagOffsetsMap.keys()),
-        } : undefined, ctx.compilerOptions, ctx.vueCompilerOptions, ctx.globalTypesHolder, () => generatedLength, linkedCodeMappings, ctx.codegenStack)) {
+        for (const code of (0, script_1.generateScript)({
+            ts,
+            fileBaseName: path.basename(fileName),
+            globalTypes: ctx.globalTypesHolder === fileName,
+            sfc: _sfc,
+            lang: lang(),
+            scriptRanges: scriptRanges(),
+            scriptSetupRanges: scriptSetupRanges(),
+            templateCodegen: _template ? {
+                tsCodes: _template.codes,
+                ctx: _template.ctx,
+                hasSlot: _template.hasSlot,
+            } : undefined,
+            compilerOptions: ctx.compilerOptions,
+            vueCompilerOptions: ctx.vueCompilerOptions,
+            getGeneratedLength: () => generatedLength,
+            linkedCodeMappings,
+        })) {
             codes.push(code);
-            if (ctx.codegenStack) {
-                codeStacks.push({ stack, length: 1 });
-            }
             generatedLength += typeof code === 'string'
                 ? code.length
                 : code[0].length;
@@ -128,7 +139,6 @@ function createTsx(fileName, _sfc, ctx) {
         ;
         return {
             codes,
-            codeStacks,
             linkedCodeMappings,
         };
     });

package/lib/types.d.ts

@@ -19,8 +19,8 @@ export interface VueCodeInformation extends CodeInformation {
         paddingLeft?: boolean;
     };
     __combineLastMapping?: boolean;
+    __combineOffsetMapping?: number;
 }
-export type CodeAndStack = [code: Code, stack: string];
 export type Code = Segment<VueCodeInformation>;
 export interface VueCompilerOptions {
     target: number;
@@ -29,7 +29,6 @@ export interface VueCompilerOptions {
     jsxSlots: boolean;
     strictTemplates: boolean;
     skipTemplateCodegen: boolean;
-    nativeTags: string[];
     dataAttributes: string[];
     htmlAttributes: string[];
     optionsWrapper: [string, string] | [];
@@ -56,7 +55,6 @@ export type VueLanguagePlugin = (ctx: {
     };
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;
-    codegenStack: boolean;
     globalTypesHolder: string | undefined;
 }) => {
     version: typeof pluginVersion;

package/lib/utils/ts.js

@@ -151,27 +151,6 @@ function getPartialVueCompilerOptions(ts, tsConfigSourceFile) {
         }
     }
 }
-// https://developer.mozilla.org/en-US/docs/Web/HTML/Element
-const HTML_TAGS = 'html,body,base,head,link,meta,style,title,address,article,aside,footer,' +
-    'header,hgroup,h1,h2,h3,h4,h5,h6,nav,section,div,dd,dl,dt,figcaption,' +
-    'figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,' +
-    'data,dfn,em,i,kbd,mark,q,rp,rt,ruby,s,samp,small,span,strong,sub,sup,' +
-    'time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,' +
-    'canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,' +
-    'th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,' +
-    'option,output,progress,select,textarea,details,dialog,menu,' +
-    'summary,template,blockquote,iframe,tfoot';
-// https://developer.mozilla.org/en-US/docs/Web/SVG/Element
-const SVG_TAGS = 'svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,' +
-    'defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,' +
-    'feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,' +
-    'feDistanceLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,' +
-    'feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,' +
-    'fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,' +
-    'foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,' +
-    'mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,' +
-    'polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,' +
-    'text,textPath,title,tspan,unknown,use,view';
 function resolveVueCompilerOptions(vueOptions) {
     const target = vueOptions.target ?? 3.3;
     const lib = vueOptions.lib || (target < 2.7 ? '@vue/runtime-dom' : 'vue');
@@ -183,14 +162,6 @@ function resolveVueCompilerOptions(vueOptions) {
         jsxSlots: vueOptions.jsxSlots ?? false,
         strictTemplates: vueOptions.strictTemplates ?? false,
         skipTemplateCodegen: vueOptions.skipTemplateCodegen ?? false,
-        nativeTags: vueOptions.nativeTags ?? [...new Set([
-                ...HTML_TAGS.split(','),
-                ...SVG_TAGS.split(','),
-                // fix https://github.com/johnsoncodehk/volar/issues/1340
-                'hgroup',
-                'slot',
-                'component',
-            ])],
         dataAttributes: vueOptions.dataAttributes ?? [],
         htmlAttributes: vueOptions.htmlAttributes ?? ['aria-*'],
         optionsWrapper: vueOptions.optionsWrapper ?? (target >= 2.7

package/lib/virtualFile/computedFiles.d.ts

@@ -1,3 +1,3 @@
 import { VirtualCode } from '@volar/language-core';
 import type { Sfc, VueLanguagePlugin } from '../types';
-export declare function computedFiles(plugins: ReturnType<VueLanguagePlugin>[], fileName: string, sfc: Sfc, codegenStack: boolean): () => VirtualCode[];
+export declare function computedFiles(plugins: ReturnType<VueLanguagePlugin>[], fileName: string, sfc: Sfc): () => VirtualCode[];

package/lib/virtualFile/computedFiles.js

@@ -4,7 +4,7 @@ exports.computedFiles = void 0;
 const language_core_1 = require("@volar/language-core");
 const computeds_1 = require("computeds");
 const embeddedFile_1 = require("./embeddedFile");
-function computedFiles(plugins, fileName, sfc, codegenStack) {
+function computedFiles(plugins, fileName, sfc) {
     const nameToBlock = (0, computeds_1.computed)(() => {
         const blocks = {};
         if (sfc.template) {
@@ -24,7 +24,7 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
         }
         return blocks;
     });
-    const pluginsResult = plugins.map(plugin => computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codegenStack));
+    const pluginsResult = plugins.map(plugin => computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock));
     const flatResult = (0, computeds_1.computed)(() => pluginsResult.map(r => r()).flat());
     const structuredResult = (0, computeds_1.computed)(() => {
         const embeddedCodes = [];
@@ -42,7 +42,7 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
         return embeddedCodes;
         function consumeRemain() {
             for (let i = remain.length - 1; i >= 0; i--) {
-                const { file, snapshot, mappings, codegenStacks } = remain[i];
+                const { file, snapshot, mappings } = remain[i];
                 if (!file.parentCodeId) {
                     embeddedCodes.push({
                         id: file.id,
@@ -50,7 +50,6 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
                         linkedCodeMappings: file.linkedCodeMappings,
                         snapshot,
                         mappings,
-                        codegenStacks,
                         embeddedCodes: [],
                     });
                     remain.splice(i, 1);
@@ -65,7 +64,6 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
                             linkedCodeMappings: file.linkedCodeMappings,
                             snapshot,
                             mappings,
-                            codegenStacks,
                             embeddedCodes: [],
                         });
                         remain.splice(i, 1);
@@ -88,7 +86,7 @@ function computedFiles(plugins, fileName, sfc, codegenStack) {
     return structuredResult;
 }
 exports.computedFiles = computedFiles;
-function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codegenStack) {
+function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock) {
     const embeddedFiles = {};
     const files = (0, computeds_1.computed)(() => {
         try {
@@ -104,8 +102,8 @@ function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codege
             for (const fileInfo of fileInfos) {
                 if (!embeddedFiles[fileInfo.id]) {
                     embeddedFiles[fileInfo.id] = (0, computeds_1.computed)(() => {
-                        const [content, stacks] = codegenStack ? (0, language_core_1.track)([]) : [[], []];
-                        const file = new embeddedFile_1.VueEmbeddedCode(fileInfo.id, fileInfo.lang, content, stacks);
+                        const content = [];
+                        const file = new embeddedFile_1.VueEmbeddedCode(fileInfo.id, fileInfo.lang, content);
                         for (const plugin of plugins) {
                             if (!plugin.resolveEmbeddedCode) {
                                 continue;
@@ -151,8 +149,10 @@ function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codege
         return files().map(_file => {
             const { file, snapshot } = _file();
             const mappings = (0, language_core_1.buildMappings)(file.content);
+            const newMappings = [];
             let lastValidMapping;
-            for (const mapping of mappings) {
+            for (let i = 0; i < mappings.length; i++) {
+                const mapping = mappings[i];
                 if (mapping.source !== undefined) {
                     const block = nameToBlock()[mapping.source];
                     if (block) {
@@ -163,7 +163,17 @@ function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codege
                     }
                     mapping.source = undefined;
                 }
-                if (mapping.data.__combineLastMapping) {
+                if (mapping.data.__combineOffsetMapping !== undefined) {
+                    const offsetMapping = mappings[i - mapping.data.__combineOffsetMapping];
+                    if (typeof offsetMapping === 'string' || !offsetMapping) {
+                        throw new Error('Invalid offset mapping, mappings: ' + mappings.length + ', i: ' + i + ', offset: ' + mapping.data.__combineOffsetMapping);
+                    }
+                    offsetMapping.sourceOffsets.push(...mapping.sourceOffsets);
+                    offsetMapping.generatedOffsets.push(...mapping.generatedOffsets);
+                    offsetMapping.lengths.push(...mapping.lengths);
+                    continue;
+                }
+                else if (mapping.data.__combineLastMapping) {
                     lastValidMapping.sourceOffsets.push(...mapping.sourceOffsets);
                     lastValidMapping.generatedOffsets.push(...mapping.generatedOffsets);
                     lastValidMapping.lengths.push(...mapping.lengths);
@@ -172,12 +182,12 @@ function computedPluginFiles(plugins, plugin, fileName, sfc, nameToBlock, codege
                 else {
                     lastValidMapping = mapping;
                 }
+                newMappings.push(mapping);
             }
             return {
                 file,
                 snapshot,
-                mappings: mappings.filter(mapping => !mapping.data.__combineLastMapping),
-                codegenStacks: (0, language_core_1.buildStacks)(file.content, file.contentStacks),
+                mappings: newMappings,
             };
         });
     });