Fixing bug with improper indentation for enums with multi-line initia…

…lizers Fixes pinterest#518
shashachu · Jul 16, 2019 · 9c694c6 · 9c694c6
1 parent f024d20
commit 9c694c6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/...experimental/src/main/kotlin/com/pinterest/ktlint/ruleset/experimental/IndentationRule.kt b/...experimental/src/main/kotlin/com/pinterest/ktlint/ruleset/experimental/IndentationRule.kt
@@ -689,6 +689,11 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
     }
 
     private fun adjustExpectedIndentInsideSuperTypeCall(n: ASTNode, ctx: IndentContext) {
+        // Don't adjust indents for initializer lists
+        if (n.treeParent?.elementType != SUPER_TYPE_LIST) {
+            return
+        }
+
         if (
             // n.treePrev == null &&
             // n.treeParent.elementType == SUPER_TYPE_LIST &&

diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-supertype-expected.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-supertype-expected.kt.spec
@@ -61,3 +61,15 @@ class AndroidModuleDependency()
 class AndroidModuleDependency()
     : ModuleDependency(name, methodToCall, method),
     ModuleDependency(name, methodToCall, method)
+
+// https://github.com/pinterest/ktlint/issues/518
+enum class Color(val displayName: String, val value: Int) {
+    RED(
+        displayName = "Red",
+        value = 1
+    ),
+    BLUE(
+        displayName = "Blue",
+        value = 2
+    );
+}
diff --git a/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-supertype.kt.spec b/ktlint-ruleset-experimental/src/test/resources/spec/indent/format-supertype.kt.spec
@@ -56,3 +56,15 @@ class AndroidModuleDependency()
 class AndroidModuleDependency()
     : ModuleDependency(name, methodToCall, method),
     ModuleDependency(name, methodToCall, method)
+
+// https://github.com/pinterest/ktlint/issues/518
+enum class Color(val displayName: String, val value: Int) {
+    RED(
+        displayName = "Red",
+        value = 1
+    ),
+    BLUE(
+        displayName = "Blue",
+        value = 2
+    );
+}