Fix error on formatting annotation for primary constructor (#628)

pinterest · Oct 29, 2019 · 8d4ebca · 8d4ebca
1 parent fc5f03d
commit 8d4ebca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/...-experimental/src/main/kotlin/com/pinterest/ktlint/ruleset/experimental/AnnotationRule.kt b/...-experimental/src/main/kotlin/com/pinterest/ktlint/ruleset/experimental/AnnotationRule.kt
@@ -94,7 +94,8 @@ class AnnotationRule : Rule("annotation") {
             // text in the file
             val newLineWithIndent = (nodeBeforeAnnotations?.text ?: "\n").let {
                 // Make sure we only insert a single newline
-                it.substring(it.lastIndexOf('\n'))
+                if (it.contains('\n')) it.substring(it.lastIndexOf('\n'))
+                else it
             }
 
             if (noWhiteSpaceAfterAnnotation) {

diff --git a/...erimental/src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/AnnotationRuleTest.kt b/...erimental/src/test/kotlin/com/pinterest/ktlint/ruleset/experimental/AnnotationRuleTest.kt
@@ -440,4 +440,19 @@ class AnnotationRuleTest {
             """.trimIndent()
         )
     }
+
+    @Test
+    fun `no error with formatting annotation for primary constructor`() {
+        val code =
+            """
+            class Foo @Inject internal constructor()
+            """.trimIndent()
+        assertThat(
+            AnnotationRule().format(code)
+        ).isEqualTo(
+            """
+            class Foo @Inject internal constructor()
+            """.trimIndent()
+        )
+    }
 }