Fix AnnotationRule exception

* Return if there's no annotations found instead of throwing an exception * Fies #490
pinterest · Jul 3, 2019 · f098571 · f098571
1 parent 0fef759
commit f098571
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/...-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRule.kt b/...-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRule.kt
@@ -24,14 +24,16 @@ class AnnotationRule : Rule("annotation") {
         emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit
     ) {
         val root =
-            node.children().firstOrNull { it.elementType == MODIFIER_LIST && it.text != DATA_KEYWORD }
+            node.children().firstOrNull { it.elementType == MODIFIER_LIST }
                 ?: return
 
         val annotations =
             root.children()
                 .mapNotNull { it.psi as? KtAnnotationEntry }
                 .toList()
-        check(!annotations.isEmpty()) { "Annotations list should not be empty" }
+        if (annotations.isEmpty()) {
+            return
+        }
 
         // Join the nodes that immediately follow the annotations (whitespace), then add the final whitespace
         // if it's not a child of root. This happens when a new line separates the annotations from the annotated

diff --git a/...eset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRuleTest.kt b/...eset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/AnnotationRuleTest.kt
@@ -329,7 +329,18 @@ class AnnotationRuleTest {
 
             data class FileModel(val uri: String, val name: String)
             """.trimIndent()
-        assertThat(AnnotationRule().format(code)).isEqualTo(code)
+        assertThat(AnnotationRule().lint(code)).isEmpty()
+    }
+
+    @Test
+    fun `no annotation present for function override passes`() {
+        val code =
+            """
+            package com.example.application.a.b
+
+            override fun foo()
+            """.trimIndent()
+        assertThat(AnnotationRule().lint(code)).isEmpty()
     }
 
     @Test
@@ -344,6 +355,6 @@ class AnnotationRuleTest {
                 fun gallery(): String = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).path
             }
             """.trimIndent()
-        assertThat(AnnotationRule().format(code)).isEqualTo(code)
+        assertThat(AnnotationRule().lint(code)).isEmpty()
     }
 }