Fix crash on <textarea> without end tag in vue/html-indent rule (#…

…1755) * Fix crash on `<textarea>` without end tag in `vue/html-indent` rule * refactor
vuejs · Jan 8, 2022 · a475176 · a475176
1 parent e7b77aa
commit a475176
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 6 deletions.
diff --git a/lib/utils/indent-common.js b/lib/utils/indent-common.js
@@ -301,7 +301,7 @@ module.exports.defineVisitor = function create(
       tokenStore.getTokenAfter(node)
 
     /** @type {SourceCode.CursorWithSkipOptions} */
-    const option = {
+    const cursorOptions = {
       includeComments: true,
       filter: (token) =>
         token != null &&
@@ -311,11 +311,11 @@ module.exports.defineVisitor = function create(
           token.type === 'HTMLEndTagOpen' ||
           token.type === 'HTMLComment')
     }
-    for (const token of tokenStore.getTokensBetween(
-      node.startTag,
-      endToken,
-      option
-    )) {
+    const contentTokens = endToken
+      ? tokenStore.getTokensBetween(node.startTag, endToken, cursorOptions)
+      : tokenStore.getTokensAfter(node.startTag, cursorOptions)
+
+    for (const token of contentTokens) {
       ignoreTokens.add(token)
     }
     ignoreTokens.add(endToken)

diff --git a/tests/lib/rules/html-indent.js b/tests/lib/rules/html-indent.js
@@ -403,6 +403,22 @@ tester.run(
         text <span /> <!-- comment --></pre>
         </template>
       `
+      },
+      {
+        filename: 'test.vue',
+        code: unIndent`
+        <template>
+          <textarea>
+        </template>
+        `
+      },
+      {
+        filename: 'test.vue',
+        code: unIndent`
+        <template>
+          <pre>
+        </template>
+        `
       }
     ],
 
@@ -929,6 +945,25 @@ tester.run(
             line: 2
           }
         ]
+      },
+      {
+        filename: 'test.vue',
+        code: unIndent`
+        <template>
+            <textarea>
+        </template>
+        `,
+        output: unIndent`
+        <template>
+          <textarea>
+        </template>
+        `,
+        errors: [
+          {
+            message: 'Expected indentation of 2 spaces but found 4 spaces.',
+            line: 2
+          }
+        ]
       }
     ]
   )