update logic

Author: mysticatea

lib/rules/html-indent.js

@@ -388,12 +388,19 @@ function create (context) {
   }
 
   /**
-   * Check whether a given token is the first token of a statement.
+   * Check whether a given token is the first token of:
+   *
+   * - ExpressionStatement
+   * - VExpressionContainer
+   * - A parameter of CallExpression/NewExpression
+   * - An element of ArrayExpression
+   * - An expression of SequenceExpression
+   *
    * @param {Token} token The token to check.
    * @param {Node} belongingNode The node that the token is belonging to.
-   * @returns {boolean} `true` if the token is the first token of a statement.
+   * @returns {boolean} `true` if the token is the first token of an element.
    */
-  function isFirstOfStatement (token, belongingNode) {
+  function isBeginningOfElement (token, belongingNode) {
     let node = belongingNode
 
     while (node != null) {
@@ -405,6 +412,23 @@ function create (context) {
       if (t === 'VExpressionContainer') {
         return node.range[0] === token.range[0]
       }
+      if (t === 'CallExpression' || t === 'NewExpression') {
+        const openParen = template.getTokenAfter(parent.callee, isNotRightParen)
+        return parent.arguments.some(param =>
+          getFirstAndLastTokens(param, openParen.range[1]).firstToken.range[0] === token.range[0]
+        )
+      }
+      if (t === 'ArrayExpression') {
+        return parent.elements.some(element =>
+          element != null &&
+          getFirstAndLastTokens(element).firstToken.range[0] === token.range[0]
+        )
+      }
+      if (t === 'SequenceExpression') {
+        return parent.expressions.some(expr =>
+          getFirstAndLastTokens(expr).firstToken.range[0] === token.range[0]
+        )
+      }
 
       node = parent
     }
@@ -751,7 +775,7 @@ function create (context) {
       const shouldIndent = (
         prevToken == null ||
         prevToken.loc.end.line === leftToken.loc.start.line ||
-        isFirstOfStatement(leftToken, node)
+        isBeginningOfElement(leftToken, node)
       )
 
       setOffset([opToken, rightToken], shouldIndent ? 1 : 0, leftToken)

tests/lib/rules/html-indent.js

@@ -1342,6 +1342,91 @@ tester.run('html-indent', rule, {
           }"
         />
       </template>
+    `,
+    unIndent`
+      <template>
+        <div
+          :class="
+            [
+              a
+                +
+                b,
+              c
+                +
+                d
+            ]
+          "
+        />
+      </template>
+    `,
+    unIndent`
+      <template>
+        <div
+          :class="
+            foo(
+              a
+                +
+                b,
+              c
+                +
+                d
+            )
+          "
+        />
+        <div
+          :class="
+            new Foo(
+              a
+                +
+                b,
+              c
+                +
+                d
+            )
+          "
+        />
+      </template>
+    `,
+    unIndent`
+      <template>
+        <div
+          :class="
+            a
+              +
+              b,
+            c
+              +
+              d
+          "
+        />
+      </template>
+    `,
+    unIndent`
+      <template>
+        <div
+          :class="
+            foo(
+              a
+                +
+                b
+            )
+          "
+        />
+        <div
+          :class="
+            foo(
+              (
+                a +
+                b
+              ),
+              (
+                c +
+                d
+              )
+            )
+          "
+        />
+      </template>
     `
   ],