Fix indentation for lines at expected indentation level but with wron…

…g indentation style (pinterest#425)
paul-dingemans · Dec 25, 2020 · 7e749f0 · 7e749f0
1 parent 68e65db
commit 7e749f0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/...ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt b/...ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
@@ -1054,7 +1054,9 @@ class IndentationRule : Rule("indent"), Rule.Modifier.RestrictToRootLast {
                 (if (!autoCorrect) "would have " else "") +
                     "changed indentation to $expectedIndentLength (from ${normalizedNodeIndent.length})"
             }
-            if (autoCorrect) {
+        }
+        if (autoCorrect) {
+            if (nodeIndent != normalizedNodeIndent || normalizedNodeIndent.length != expectedIndentLength) {
                 val indent = when (editorConfig.indentStyle) {
                     IndentStyle.SPACE -> " "
                     IndentStyle.TAB -> "\t"

diff --git a/...set-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt b/...set-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt
@@ -343,6 +343,32 @@ internal class IndentationRuleTest {
             .isEqualTo("fun main() {\n    return 0\n}")
     }
 
+    @Test
+    fun testUnexpectedTabCharacterForLinesAtCorrectIndentationLevel() {
+        val ktScript = "" +
+            "class Foo {\n" +
+            "\tfun doBar() {\n" +
+            "\t\t\tprintln(\"test\")\n" +
+            "\t}\n" +
+            "}\n"
+        assertThat(IndentationRule().lint(ktScript)).isEqualTo(
+            listOf(
+                LintError(line = 2, col = 1, ruleId = "indent", detail = "Unexpected tab character(s)"),
+                LintError(line = 3, col = 1, ruleId = "indent", detail = "Unexpected tab character(s)"),
+                LintError(line = 3, col = 1, ruleId = "indent", detail = "Unexpected indentation (12) (should be 8)"),
+                LintError(line = 4, col = 1, ruleId = "indent", detail = "Unexpected tab character(s)")
+            )
+        )
+        assertThat(IndentationRule().format(ktScript))
+            .isEqualTo(
+                "class Foo {\n" +
+                    "    fun doBar() {\n" +
+                    "        println(\"test\")\n" +
+                    "    }\n" +
+                    "}\n"
+            )
+    }
+
     @Test
     fun testUnexpectedTabCharacterWithCustomIndentSize() {
         val ktScript = "fun main() {\n\t\treturn 0\n\t}"