Fix indent of explicit constructor (#2118)

* Fix indent of explicit constructor (also see #2115)
* Fix error in `hasNewLineInClosedRange` and `noNewLineInClosedRange`

ktlint-rule-engine-core/src/main/kotlin/com/pinterest/ktlint/rule/engine/core/api/ASTNodeExtension.kt

@@ -333,10 +333,7 @@ private fun String.replaceTabAndNewline(): String = replace("\t", "\\t").replace
 public fun hasNewLineInClosedRange(
     from: ASTNode,
     to: ASTNode,
-): Boolean =
-    from.isWhiteSpaceWithNewline() ||
-        leavesInOpenRange(from, to).any { it.textContains('\n') } ||
-        to.isWhiteSpaceWithNewline()
+): Boolean = leavesInClosedRange(from, to).any { it.textContains('\n') }
 
 /**
  * Verifies that no leaf contains a newline in the closed range [from] - [to]. Also, the boundary nodes [from] and [to]
@@ -345,10 +342,7 @@ public fun hasNewLineInClosedRange(
 public fun noNewLineInClosedRange(
     from: ASTNode,
     to: ASTNode,
-): Boolean =
-    !from.isWhiteSpaceWithNewline() &&
-        noNewLineInOpenRange(from, to) &&
-        !to.isWhiteSpaceWithNewline()
+): Boolean = leavesInClosedRange(from, to).none { it.textContains('\n') }
 
 /**
  * Verifies that no leaf contains a newline in the open range [from] - [to]. This means that the boundary nodes are excluded from the range
@@ -373,7 +367,27 @@ public fun leavesInOpenRange(
 ): Sequence<ASTNode> =
     from
         .leaves()
-        .takeWhile { it != to && it != to.firstChildNode }
+        .takeWhile { it != to && it != to.lastChildLeafOrSelf() }
+
+/**
+ * Creates a sequence of leaf nodes in the closed range [from] - [to]. This means that the boundary nodes are included from the range in
+ * case they would happen to be a leaf node. In case [from] is a [CompositeElement] than the first leaf node in the sequence is the first
+ * leaf node in this [CompositeElement]. In case [to] is a [CompositeElement] than the last node in the sequence is the last leaf node of
+ * this [CompositeElement].
+ */
+public fun leavesInClosedRange(
+    from: ASTNode,
+    to: ASTNode,
+): Sequence<ASTNode> {
+    val stopAtLeaf =
+        to
+            .lastChildLeafOrSelf()
+            .nextLeaf()
+    return from
+        .firstChildLeafOrSelf()
+        .leavesIncludingSelf()
+        .takeWhile { it != stopAtLeaf }
+}
 
 public fun ASTNode.isValOrVarKeyword(): Boolean = elementType == VAL_KEYWORD || elementType == VAR_KEYWORD || elementType == VARARG_KEYWORD
 

ktlint-rule-engine-core/src/test/kotlin/com/pinterest/ktlint/rule/engine/core/api/ASTNodeExtensionTest.kt

@@ -52,6 +52,36 @@ class ASTNodeExtensionTest {
         )
     }
 
+    @Test
+    fun `Given an enum class body then get all leaves in the closed range of the class body`() {
+        val code =
+            """
+            enum class Shape {
+                FOO, FOOBAR, BAR
+            }
+            """.trimIndent()
+        val enumClassBody = code.transformAst(::toEnumClassBodySequence)
+
+        val actual =
+            leavesInClosedRange(enumClassBody.first(), enumClassBody.last())
+                .map { it.text }
+                .toList()
+
+        assertThat(actual).containsExactly(
+            "{",
+            "\n    ",
+            "FOO",
+            ",",
+            " ",
+            "FOOBAR",
+            ",",
+            " ",
+            "BAR",
+            "\n",
+            "}",
+        )
+    }
+
     @Nested
     inner class NoNewLineInOpenRange {
         @Test
@@ -111,14 +141,9 @@ class ASTNodeExtensionTest {
         fun `Given an enum class with no whitespace leaf containing a newline between the first and last enum entry`() {
             val code =
                 """
-                enum class Shape {
-                    FOO, FOOBAR, BAR
-                }
+                enum class Shape { FOO, FOOBAR, BAR }
                 """.trimIndent()
-            val enumEntries =
-                code
-                    .transformAst(::toEnumClassBodySequence)
-                    .filter { it.elementType == ENUM_ENTRY }
+            val enumEntries = code.transformAst(::toEnumClassBodySequence)
 
             val actual = hasNewLineInClosedRange(enumEntries.first(), enumEntries.last())
 
@@ -129,12 +154,16 @@ class ASTNodeExtensionTest {
         fun `Given a range of nodes starting with a whitespace leaf containing a newline but other whitespace leaves not containing a newline`() {
             val code =
                 """
-                enum class Shape {
-                    FOO, FOOBAR, BAR } // Malformed on purpose for test
+                enum class Shape
+                    { FOO, FOOBAR, BAR } // Malformed on purpose for test
                 """.trimIndent()
-            val enumClassBody = code.transformAst(::toEnumClassBodySequence)
+            val enumClass = code.transformAst(::toEnumClassSequence)
 
-            val actual = hasNewLineInClosedRange(enumClassBody.first(), enumClassBody.last())
+            val actual =
+                hasNewLineInClosedRange(
+                    enumClass.first { it.isWhiteSpaceWithNewline() },
+                    enumClass.last(),
+                )
 
             assertThat(actual).isTrue
         }
@@ -163,9 +192,13 @@ class ASTNodeExtensionTest {
                 enum class Shape { FOO, FOOBAR, BAR
                 } // Malformed on purpose for test
                 """.trimIndent()
-            val enumClassBody = code.transformAst(::toEnumClassBodySequence)
+            val enumBodyClass = code.transformAst(::toEnumClassBodySequence)
 
-            val actual = hasNewLineInClosedRange(enumClassBody.first(), enumClassBody.last())
+            val actual =
+                hasNewLineInClosedRange(
+                    enumBodyClass.first(),
+                    enumBodyClass.last { it.isWhiteSpaceWithNewline() },
+                )
 
             assertThat(actual).isTrue
         }
@@ -601,15 +634,21 @@ class ASTNodeExtensionTest {
             ?.children()
             .orEmpty()
 
+    private fun toEnumClassSequence(fileASTNode: FileASTNode) =
+        fileASTNode
+            .findChildByType(CLASS)
+            ?.children()
+            .orEmpty()
+
     /**
      * A dummy rule for testing. Optionally the rule can be created with a lambda to be executed for each node visited.
      */
     private open class DummyRule(
         val block: (node: ASTNode) -> Unit = {},
     ) : Rule(
-        ruleId = RuleId("test:dummy-rule"),
-        about = About(),
-    ) {
+            ruleId = RuleId("test:dummy-rule"),
+            about = About(),
+        ) {
         override fun beforeVisitChildNodes(
             node: ASTNode,
             autoCorrect: Boolean,

ktlint-rule-engine/src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/rules/InternalRule.kt

@@ -19,8 +19,8 @@ public open class InternalRule internal constructor(
     override val visitorModifiers: Set<VisitorModifier> = emptySet(),
     override val usesEditorConfigProperties: Set<EditorConfigProperty<*>> = emptySet(),
 ) : Rule(
-    ruleId = RuleId("internal:$id"),
-    visitorModifiers = visitorModifiers,
-    usesEditorConfigProperties = usesEditorConfigProperties,
-    about = INTERNAL_RULE_ABOUT,
-)
+        ruleId = RuleId("internal:$id"),
+        visitorModifiers = visitorModifiers,
+        usesEditorConfigProperties = usesEditorConfigProperties,
+        about = INTERNAL_RULE_ABOUT,
+    )

ktlint-rule-engine/src/test/kotlin/com/pinterest/ktlint/rule/engine/api/KtLintTest.kt

@@ -473,9 +473,9 @@ class KtLintTest {
 private open class DummyRule(
     val block: (node: ASTNode) -> Unit = {},
 ) : Rule(
-    ruleId = RuleId("test:dummy"),
-    about = About(),
-) {
+        ruleId = RuleId("test:dummy"),
+        about = About(),
+    ) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,
@@ -536,10 +536,10 @@ private class SimpleTestRule(
     private val stopTraversalInAfterVisitChildNodes: (ASTNode) -> Boolean = { false },
     private val stopTraversalInAfterLastNode: Boolean = false,
 ) : Rule(
-    ruleId = ruleId,
-    about = About(),
-    visitorModifiers,
-) {
+        ruleId = ruleId,
+        about = About(),
+        visitorModifiers,
+    ) {
     override fun beforeFirstNode(editorConfig: EditorConfig) {
         ruleExecutionCalls.add(RuleExecutionCall(ruleId, BEFORE_FIRST))
         if (stopTraversalInBeforeFirstNode) {

ktlint-rule-engine/src/test/kotlin/com/pinterest/ktlint/rule/engine/internal/RuleProviderSorterTest.kt

@@ -450,10 +450,10 @@ class RuleProviderSorterTest {
         ruleId: RuleId,
         visitorModifiers: Set<VisitorModifier> = emptySet(),
     ) : Rule(
-        ruleId = ruleId,
-        about = About(),
-        visitorModifiers,
-    ) {
+            ruleId = ruleId,
+            about = About(),
+            visitorModifiers,
+        ) {
         constructor(ruleId: RuleId, visitorModifier: VisitorModifier) : this(ruleId, setOf(visitorModifier))
 
         override fun beforeVisitChildNodes(

ktlint-rule-engine/src/test/kotlin/com/pinterest/ktlint/rule/engine/internal/rulefilter/InternalRuleProvidersFilterTest.kt

@@ -43,10 +43,10 @@ class InternalRuleProvidersFilterTest {
         ruleId: RuleId,
         visitorModifiers: Set<VisitorModifier> = emptySet(),
     ) : Rule(
-        ruleId = ruleId,
-        about = About(),
-        visitorModifiers,
-    ) {
+            ruleId = ruleId,
+            about = About(),
+            visitorModifiers,
+        ) {
         override fun beforeVisitChildNodes(
             node: ASTNode,
             autoCorrect: Boolean,

ktlint-rule-engine/src/test/kotlin/com/pinterest/ktlint/rule/engine/internal/rulefilter/RunAfterRuleFilterTest.kt

@@ -363,10 +363,10 @@ class RunAfterRuleFilterTest {
         ruleId: RuleId,
         visitorModifiers: Set<VisitorModifier> = emptySet(),
     ) : Rule(
-        ruleId = ruleId,
-        about = About(),
-        visitorModifiers,
-    ) {
+            ruleId = ruleId,
+            about = About(),
+            visitorModifiers,
+        ) {
         constructor(ruleId: RuleId, visitorModifier: VisitorModifier) : this(ruleId, setOf(visitorModifier))
 
         override fun beforeVisitChildNodes(

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

@@ -21,8 +21,8 @@ public open class StandardRule internal constructor(
     override val visitorModifiers: Set<VisitorModifier> = emptySet(),
     override val usesEditorConfigProperties: Set<EditorConfigProperty<*>> = emptySet(),
 ) : Rule(
-    ruleId = RuleId("${RuleSetId.STANDARD.value}:$id"),
-    visitorModifiers = visitorModifiers,
-    usesEditorConfigProperties = usesEditorConfigProperties,
-    about = STANDARD_RULE_ABOUT,
-)
+        ruleId = RuleId("${RuleSetId.STANDARD.value}:$id"),
+        visitorModifiers = visitorModifiers,
+        usesEditorConfigProperties = usesEditorConfigProperties,
+        about = STANDARD_RULE_ABOUT,
+    )