Fixing #836 (#839)

pinterest · Aug 20, 2020 · d9e6716 · d9e6716
1 parent c9d1db3
commit d9e6716
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...set-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRule.kt b/...set-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRule.kt
@@ -146,6 +146,12 @@ class NoUnusedImportsRule : Rule("no-unused-imports") {
 
     // Contains list of all imports and checks if given import is present
     private fun checkIfParentImportExists(text: String): Boolean {
+        // Only check static imports; identified if they start with a capital letter indicating a
+        // class name rather than a sub-package
+        if (text.isNotEmpty() && text[0] !in 'A'..'Z') {
+            return false
+        }
+
         val staticImports = imports.filter { it.endsWith(text) }
         staticImports.forEach { import ->
             var count = 0

diff --git a/...standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRuleTest.kt b/...standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/NoUnusedImportsRuleTest.kt
@@ -553,6 +553,24 @@ class NoUnusedImportsRuleTest {
 
                         assertThat(actual).isEqualTo(expected)
                     }
+                    }
+                """.trimIndent()
+            ).isEmpty()
+        )
+    }
+
+    @Test
+    fun `only redundant static imports should be removed`() {
+        assertThat(
+            NoUnusedImportsRule().lint(
+                """
+                import com.foo.psi.abc
+                import com.foo.psi.findAnnotation
+
+                fun main() {
+                    val psi = getPsi()
+                    psi.abc()
+                    val bar = psi.findAnnotation(SOME_CONSTANT)
                 }
                 """.trimIndent()
             )