Allow value arguments with a multiline expression to be indented on a separate line

Closes #1217

Author: paul-dingemans

CHANGELOG.md

@@ -258,6 +258,9 @@ Previously the default value for `.editorconfig` property `max_line_length` was
 * Enforce spacing around rangeUntil operator `..<` similar to the range operator `..` in `range-spacing`  ([#1858](https://github.com/pinterest/ktlint/issues/1858))
 * When `.editorconfig` property `ij_kotlin_imports_layout` contains a `|` but no import exists that match any pattern before the first `|` then do not report a violation nor insert a blank line `import-ordering` ([#1845](https://github.com/pinterest/ktlint/issues/1845))
 * When negate-patterns only are specified in Ktlint CLI then automatically add the default include patterns (`**/*.kt` and `**/*.kts`) so that all Kotlin files excluding the files matching the negate-patterns will be processed ([#1847](https://github.com/pinterest/ktlint/issues/1847))
+* Do not remove newlines from multiline type parameter lists `type-parameter-list-spacing` ([#1867](https://github.com/pinterest/ktlint/issues/1867))
+* Wrap each type parameter in a multiline type parameter list `wrapping` ([#1867](https://github.com/pinterest/ktlint/issues/1867))
+* Allow value arguments with a multiline expression to be indented on a separate line `indent` ([#1217](https://github.com/pinterest/ktlint/issues/1217))
 
 ### Changed
 * Wrap the parameters of a function literal containing a multiline parameter list (only in `ktlint_official` code style) `parameter-list-wrapping` ([#1681](https://github.com/pinterest/ktlint/issues/1681)).

ktlint-cli/src/main/kotlin/com/pinterest/ktlint/cli/internal/KtlintCommandLine.kt

@@ -63,7 +63,7 @@ private lateinit var logger: KLogger
 
 @Command(
     headerHeading =
-    """
+        """
 An anti-bikeshedding Kotlin linter with built-in formatter.
 (https://github.com/pinterest/ktlint).
 

ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/IndentationRule.kt

@@ -71,6 +71,7 @@ import com.pinterest.ktlint.rule.engine.core.api.ElementType.TYPE_CONSTRAINT_LIS
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.TYPE_PARAMETER_LIST
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.TYPE_REFERENCE
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.USER_TYPE
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.VALUE_ARGUMENT
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.VALUE_ARGUMENT_LIST
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.VALUE_PARAMETER
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.VALUE_PARAMETER_LIST
@@ -204,6 +205,9 @@ public class IndentationRule :
                     lastChildIndent = "",
                 )
 
+            node.elementType == VALUE_ARGUMENT ->
+                visitValueArgument(node)
+
             node.elementType == SECONDARY_CONSTRUCTOR ->
                 visitSecondaryConstructor(node)
 
@@ -327,6 +331,22 @@ public class IndentationRule :
         }
     }
 
+    private fun visitValueArgument(node: ASTNode) {
+        if (codeStyle == ktlint_official) {
+            // Deviate from standard IntelliJ IDEA formatting to allow formatting below:
+            //     val foo = foo(
+            //         parameterName =
+            //             "The quick brown fox "
+            //                .plus("jumps ")
+            //                .plus("over the lazy dog"),
+            //     )
+            startIndentContext(
+                fromAstNode = node,
+                lastChildIndent = "",
+            )
+        }
+    }
+
     private fun visitSecondaryConstructor(node: ASTNode) {
         node
             .findChildByType(CONSTRUCTOR_DELEGATION_CALL)

ktlint-ruleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/IndentationRuleTest.kt

@@ -4850,7 +4850,7 @@ internal class IndentationRuleTest {
         }
 
         @Test
-        fun `Given ktlint_official code style then indent the type when it does not fit on the same line as the variable name`() {
+        fun `Given a type which does not fit on the same line as the variable name`() {
             val code =
                 """
                 // $MAX_LINE_LENGTH_MARKER           $EOL_CHAR
@@ -4874,6 +4874,35 @@ internal class IndentationRuleTest {
                 .setMaxLineLength()
                 .isFormattedAs(formattedCode)
         }
+
+        @Test
+        fun `Issue 1217 - Given a function parameter with a multiline expression starting on a new line`() {
+            val code =
+                """
+                val foo = foo(
+                    parameterName =
+                    "The quick brown fox "
+                        .plus("jumps ")
+                        .plus("over the lazy dog"),
+                )
+                """.trimIndent()
+            val formattedCode =
+                """
+                val foo = foo(
+                    parameterName =
+                        "The quick brown fox "
+                            .plus("jumps ")
+                            .plus("over the lazy dog"),
+                )
+                """.trimIndent()
+            indentationRuleAssertThat(code)
+                .withEditorConfigOverride(CODE_STYLE_PROPERTY to ktlint_official)
+                .hasLintViolations(
+                    LintViolation(3, 1, "Unexpected indentation (4) (should be 8)"),
+                    LintViolation(4, 1, "Unexpected indentation (8) (should be 12)"),
+                    LintViolation(5, 1, "Unexpected indentation (8) (should be 12)"),
+                ).isFormattedAs(formattedCode)
+        }
     }
 
     @Nested