@vue/language-core 2.0.10 → 2.0.11

package/lib/generators/template.js

@@ -68,7 +68,7 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
             if (expectErrorToken) {
                 const token = expectErrorToken;
                 const data = code[3];
-                if (data.verification) {
+                if (data.verification && (typeof data.verification !== 'object' || !data.verification.shouldReport)) {
                     code[3] = {
                         ...data,
                         verification: {
@@ -102,7 +102,6 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
     let hasSlot = false;
     let ignoreError = false;
     let expectErrorToken;
-    let expectedErrorNode;
     let elementIndex = 0;
     if (slotsAssignName) {
         localVars.set(slotsAssignName, 1);
@@ -166,13 +165,13 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
         }
         return tagOffsetsMap;
     }
-    function* generateExpectErrorComment() {
-        if (expectErrorToken && expectedErrorNode) {
+    function* resetDirectiveComments(endStr) {
+        if (expectErrorToken) {
             const token = expectErrorToken;
             yield _ts([
                 '',
                 'template',
-                expectedErrorNode.loc.start.offset,
+                expectErrorToken.node.loc.start.offset,
                 (0, utils_1.disableAllFeatures)({
                     verification: {
                         shouldReport: () => token.errors === 0,
@@ -183,14 +182,17 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
             yield _ts([
                 '',
                 'template',
-                expectedErrorNode.loc.end.offset,
+                expectErrorToken.node.loc.end.offset,
                 (0, utils_1.disableAllFeatures)({ __combineLastMapping: true }),
             ]);
             yield _ts('\n;\n');
+            expectErrorToken = undefined;
+            yield _ts(`// @vue-expect-error ${endStr}\n`);
+        }
+        if (ignoreError) {
+            ignoreError = false;
+            yield _ts(`// @vue-ignore ${endStr}\n`);
         }
-        ignoreError = false;
-        expectErrorToken = undefined;
-        expectedErrorNode = undefined;
     }
     function* generateCanonicalComponentName(tagText, offset, info) {
         if (validTsVarReg.test(tagText)) {
@@ -292,18 +294,22 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
         }
     }
     function* generateAstNode(node, parentEl, prevNode, componentCtxVar) {
-        yield* generateExpectErrorComment();
         if (prevNode?.type === CompilerDOM.NodeTypes.COMMENT) {
             const commentText = prevNode.content.trim().split(' ')[0];
             if (commentText.match(/^@vue-skip\b[\s\S]*/)) {
+                yield _ts('// @vue-skip\n');
                 return;
             }
-            else if (commentText.match(/^@vue-ignore\b[\s\S]*/)) {
+            else if (commentText.match(/^@vue-ignore\b[\s\S]*/) && !ignoreError) {
                 ignoreError = true;
+                yield _ts('// @vue-ignore start\n');
             }
-            else if (commentText.match(/^@vue-expect-error\b[\s\S]*/)) {
-                expectErrorToken = { errors: 0 };
-                expectedErrorNode = prevNode;
+            else if (commentText.match(/^@vue-expect-error\b[\s\S]*/) && !expectErrorToken) {
+                expectErrorToken = {
+                    errors: 0,
+                    node: prevNode,
+                };
+                yield _ts('// @vue-expect-error start\n');
             }
         }
         if (node.type === CompilerDOM.NodeTypes.ROOT) {
@@ -312,7 +318,7 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
                 yield* generateAstNode(childNode, parentEl, prev, componentCtxVar);
                 prev = childNode;
             }
-            yield* generateExpectErrorComment();
+            yield* resetDirectiveComments('end of root');
         }
         else if (node.type === CompilerDOM.NodeTypes.ELEMENT) {
             const vForNode = getVForNode(node);
@@ -343,6 +349,7 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
             // {{ ... }}
             const [content, start] = parseInterpolationNode(node, template.content);
             yield* generateInterpolation(content, node.content.loc, start, presetInfos.all, '(', ');\n');
+            yield* resetDirectiveComments('end of INTERPOLATION');
         }
         else if (node.type === CompilerDOM.NodeTypes.IF) {
             // v-if / v-else-if / v-else
@@ -374,16 +381,16 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
                 yield _ts(` `);
                 yield* generateInterpolation(branch.condition.content, branch.condition.loc, branch.condition.loc.start.offset, presetInfos.all, '(', ')');
                 blockConditions.push((0, language_core_1.toString)([...generateInterpolation(branch.condition.content, branch.condition.loc, undefined, undefined, '(', ')')]
-                    .map(code => code[1])));
+                    .map(([code]) => code)));
                 addedBlockCondition = true;
             }
             yield _ts(` {\n`);
+            yield* resetDirectiveComments('end of v-if start');
             let prev;
             for (const childNode of branch.children) {
                 yield* generateAstNode(childNode, parentEl, prev, componentCtxVar);
                 prev = childNode;
             }
-            yield* generateExpectErrorComment();
             yield* generateExtraAutoImport();
             yield _ts('}\n');
             if (addedBlockCondition) {
@@ -411,12 +418,12 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
             yield* generateInterpolation(source.content, source.loc, source.loc.start.offset, presetInfos.all, '(', ')');
             yield _ts('!)'); // #3102
             yield _ts(') {\n');
+            yield* resetDirectiveComments('end of v-for start');
             let prev;
             for (const childNode of node.children) {
                 yield* generateAstNode(childNode, parentEl, prev, componentCtxVar);
                 prev = childNode;
             }
-            yield* generateExpectErrorComment();
             yield* generateExtraAutoImport();
             yield _ts('}\n');
         }
@@ -608,6 +615,7 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
             }
             const slotBlockVars = [];
             yield _ts(`{\n`);
+            yield* resetDirectiveComments('end of element slot start');
             let hasProps = false;
             if (slotDir?.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
                 const slotAst = createTsAst(ts, slotDir, `(${slotDir.exp.content}) => {}`);
@@ -658,8 +666,6 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
                 yield* generateAstNode(childNode, parentEl, prev, componentCtxVar);
                 prev = childNode;
             }
-            yield* generateExpectErrorComment();
-            yield* generateExtraAutoImport();
             slotBlockVars.forEach(varName => {
                 localVars.set(varName, localVars.get(varName) - 1);
             });
@@ -680,15 +686,16 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
                 ]);
                 yield _ts(`'/* empty slot name completion */]\n`);
             }
+            yield* generateExtraAutoImport();
             yield _ts(`}\n`);
         }
         else {
+            yield* resetDirectiveComments('end of element children start');
             let prev;
             for (const childNode of node.children) {
                 yield* generateAstNode(childNode, parentEl, prev, componentCtxVar);
                 prev = childNode;
             }
-            yield* generateExpectErrorComment();
             // fix https://github.com/vuejs/language-tools/issues/932
             if (!hasSlotElements.has(node) && node.children.length) {
                 yield _ts(`(${componentCtxVar}.slots!).`);
@@ -1187,8 +1194,13 @@ function* generate(ts, compilerOptions, vueCompilerOptions, template, shouldGene
         }
         yield _ts('// @ts-ignore\n'); // #2304
         yield _ts('[');
+        const visited = new Set();
         for (const _vars of tempVars) {
             for (const v of _vars) {
+                if (visited.has(v.offset)) {
+                    continue;
+                }
+                visited.add(v.offset);
                 yield _ts([
                     v.text,
                     'template',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.10",
+	"version": "2.0.11",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.2.0-alpha.5",
+		"@volar/language-core": "~2.2.0-alpha.6",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "a20a2ee950b63a949660b7e8faf0faed0e5bad33"
+	"gitHead": "c89f25ffc32c760130adeeac796b9a5d20585bf7"
 }