Fix indent of IS_EXPRESSION, PREFIX_EXPRESSION and POSTFIX_EXPRESSION

CHANGELOG.md

@@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 * Log message `Format was not able to resolve all violations which (theoretically) can be autocorrected in file ... in 3 consecutive runs of format` is now only displayed in case a new ktlint rule is actually needed. [#2129](https://github.com/pinterest/ktlint/issues/2129)
 * Fix wrapping of function signature in case the opening brace of the function body block exceeds the maximum line length. Fix upsert of whitespace into composite nodes. `function-signature` [#2130](https://github.com/pinterest/ktlint/issues/2130)
 * Fix spacing around colon in annotations `spacing-around-colon` ([#2093](https://github.com/pinterest/ktlint/issues/2093))
+* Fix indent of IS_EXPRESSION, PREFIX_EXPRESSION and POSTFIX_EXPRESSION in case it contains a linebreak `indent` [#2094](https://github.com/pinterest/ktlint/issues/2094)
 
 ### Changed
 

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

@@ -35,6 +35,7 @@ import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUN
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.FUNCTION_LITERAL
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.IDENTIFIER
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.IF
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.IS_EXPRESSION
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.KDOC
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.KDOC_END
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.KDOC_LEADING_ASTERISK
@@ -50,6 +51,8 @@ import com.pinterest.ktlint.rule.engine.core.api.ElementType.OBJECT_DECLARATION
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.OPEN_QUOTE
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.OPERATION_REFERENCE
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.PARENTHESIZED
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.POSTFIX_EXPRESSION
+import com.pinterest.ktlint.rule.engine.core.api.ElementType.PREFIX_EXPRESSION
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.PRIMARY_CONSTRUCTOR
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.PROPERTY
 import com.pinterest.ktlint.rule.engine.core.api.ElementType.PROPERTY_ACCESSOR
@@ -263,6 +266,11 @@ public class IndentationRule :
                 node.elementType == USER_TYPE ->
                 startIndentContext(node)
 
+            node.elementType == IS_EXPRESSION ||
+                node.elementType == PREFIX_EXPRESSION ||
+                node.elementType == POSTFIX_EXPRESSION ->
+                startIndentContext(node)
+
             node.elementType == DELEGATED_SUPER_TYPE_ENTRY ||
                 node.elementType == ANNOTATED_EXPRESSION ||
                 node.elementType == TYPE_REFERENCE ->

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

@@ -5340,6 +5340,63 @@ internal class IndentationRuleTest {
             .hasNoLintViolations()
     }
 
+    @Test
+    fun `Issue 2094 - Given a malformed IS_EXPRESSION`() {
+        val code =
+            """
+            fun foo(any: Any) =
+                any is
+                Foo
+            """.trimIndent()
+        val formattedCode =
+            """
+            fun foo(any: Any) =
+                any is
+                    Foo
+            """.trimIndent()
+        indentationRuleAssertThat(code)
+            .hasLintViolation(3, 1, "Unexpected indentation (4) (should be 8)")
+            .isFormattedAs(formattedCode)
+    }
+
+    @Test
+    fun `Issue 2094 - Given a malformed PREFIX_EXPRESSION`() {
+        val code =
+            """
+            fun foo(value: Int) =
+                ++
+                value
+            """.trimIndent()
+        val formattedCode =
+            """
+            fun foo(value: Int) =
+                ++
+                    value
+            """.trimIndent()
+        indentationRuleAssertThat(code)
+            .hasLintViolation(3, 1, "Unexpected indentation (4) (should be 8)")
+            .isFormattedAs(formattedCode)
+    }
+
+    @Test
+    fun `Issue 2094 - Given a malformed POSTFIX_EXPRESSION`() {
+        val code =
+            """
+            fun foo(value: Int) =
+                --
+                value
+            """.trimIndent()
+        val formattedCode =
+            """
+            fun foo(value: Int) =
+                --
+                    value
+            """.trimIndent()
+        indentationRuleAssertThat(code)
+            .hasLintViolation(3, 1, "Unexpected indentation (4) (should be 8)")
+            .isFormattedAs(formattedCode)
+    }
+
     private companion object {
         val INDENT_STYLE_TAB =
             INDENT_STYLE_PROPERTY to PropertyType.IndentStyleValue.tab

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

@@ -574,12 +574,11 @@ class MultilineExpressionWrappingTest {
             fun foo(any: Any) = any is
                 Foo
             """.trimIndent()
-        // TODO: https://github.com/pinterest/ktlint/issues/2094 Fix formatting by indent rule
         val formattedCode =
             """
             fun foo(any: Any) =
                 any is
-                Foo
+                    Foo
             """.trimIndent()
         multilineExpressionWrappingAssertThat(code)
             .addAdditionalRuleProvider { IndentationRule() }
@@ -615,12 +614,11 @@ class MultilineExpressionWrappingTest {
             fun foo(any: Int) = ++
                 42
             """.trimIndent()
-        // TODO: https://github.com/pinterest/ktlint/issues/2094 Fix formatting by indent rule
         val formattedCode =
             """
             fun foo(any: Int) =
                 ++
-                42
+                    42
             """.trimIndent()
         multilineExpressionWrappingAssertThat(code)
             .addAdditionalRuleProvider { IndentationRule() }