update logic

Author: mysticatea

lib/rules/html-indent.js

@@ -198,6 +198,47 @@ function isBeginningOfLine (node, index, nodes) {
   return false
 }
 
+/**
+ * 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 an element.
+ */
+function isBeginningOfElement (token, belongingNode) {
+  let node = belongingNode
+
+  while (node != null) {
+    const parent = node.parent
+    const t = parent && parent.type
+    if (t != null && (t.endsWith('Statement') || t.endsWith('Declaration'))) {
+      return parent.range[0] === token.range[0]
+    }
+    if (t === 'VExpressionContainer') {
+      return node.range[0] === token.range[0]
+    }
+    if (t === 'CallExpression' || t === 'NewExpression') {
+      return parent.arguments.some(param => param.range[0] === token.range[0])
+    }
+    if (t === 'ArrayExpression') {
+      return parent.elements.some(element => element != null && element.range[0] === token.range[0])
+    }
+    if (t === 'SequenceExpression') {
+      return parent.expressions.some(expr => expr.range[0] === token.range[0])
+    }
+
+    node = parent
+  }
+
+  return false
+}
+
 /**
  * Creates AST event handlers for html-indent.
  *
@@ -387,31 +428,6 @@ function create (context) {
     return template.getFirstToken(node)
   }
 
-  /**
-   * Check whether a given token is the first token of a statement.
-   * @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.
-   */
-  function isFirstOfStatement (token, belongingNode) {
-    let node = belongingNode
-
-    while (node != null) {
-      const parent = node.parent
-      const t = parent && parent.type
-      if (t != null && (t.endsWith('Statement') || t.endsWith('Declaration'))) {
-        return parent.range[0] === token.range[0]
-      }
-      if (t === 'VExpressionContainer') {
-        return node.range[0] === token.range[0]
-      }
-
-      node = parent
-    }
-
-    return false
-  }
-
   /**
    * Ignore all tokens of the given node.
    * @param {Node} node The node to ignore.
@@ -751,7 +767,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,64 @@ 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>
     `
   ],