Allow spread operator starting on new line (fixes regression of #2300)

pinterest · Oct 13, 2023 · a6c7eb9 · a6c7eb9
1 parent 2b25d78
commit a6c7eb9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/...standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/ChainWrappingRule.kt b/...standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/ChainWrappingRule.kt
@@ -106,12 +106,18 @@ public class ChainWrappingRule :
                 return
             }
             val prevLeaf = node.prevLeaf()
-            if (node.elementType != MUL && prevLeaf?.isPartOfSpread() == true) {
-                // fn(*typedArray<...>()) case
+            if (node.isPartOfSpread()) {
+                // Allow:
+                //    fn(
+                //        *typedArray<...>()
+                //    )
                 return
             }
             if (prefixTokens.contains(elementType) && node.isInPrefixPosition()) {
-                // unary +/-
+                // Allow:
+                //    fn(
+                //        -42
+                //    )
                 return
             }
 
@@ -160,14 +166,16 @@ public class ChainWrappingRule :
     }
 
     private fun ASTNode.isPartOfSpread() =
-        prevCodeLeaf()?.let { leaf ->
-            val type = leaf.elementType
-            type == LPAR ||
-                type == COMMA ||
-                type == LBRACE ||
-                type == ELSE_KEYWORD ||
-                KtTokens.OPERATIONS.contains(type)
-        } == true
+        elementType == MUL &&
+            prevCodeLeaf()
+                ?.let { leaf ->
+                    val type = leaf.elementType
+                    type == LPAR ||
+                        type == COMMA ||
+                        type == LBRACE ||
+                        type == ELSE_KEYWORD ||
+                        KtTokens.OPERATIONS.contains(type)
+                } == true
 
     private fun ASTNode.isInPrefixPosition() = treeParent?.treeParent?.elementType == PREFIX_EXPRESSION
 

diff --git a/...dard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/ChainWrappingRuleTest.kt b/...dard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/ChainWrappingRuleTest.kt
@@ -329,4 +329,15 @@ class ChainWrappingRuleTest {
                 .isFormattedAs(formattedCode)
         }
     }
+
+    @Test
+    fun `Given a spread operator starting on a new line`() {
+        val code =
+            """
+            val foo = foo(
+                *bar,
+            )
+            """.trimIndent()
+        chainWrappingRuleAssertThat(code).hasNoLintViolations()
+    }
 }