NoUnusedImportsRule: fix false positive for static java function imports

pinterest · Sep 7, 2020 · fcdb9db · fcdb9db
1 parent b01ba62
commit fcdb9db
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 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
@@ -50,7 +50,7 @@ class NoUnusedImportsRule : Rule("no-unused-imports") {
     private val conditionalWhitelist = mapOf<(String) -> Boolean, (node: ASTNode) -> Boolean>(
         Pair(
             // Ignore provideDelegate if there is a `by` anywhere in the file
-            { importPath -> importPath.endsWith("provideDelegate") },
+            { importPath -> importPath.endsWith(".provideDelegate") },
             { rootNode ->
                 var hasByKeyword = false
                 rootNode.visit { child ->
@@ -103,7 +103,7 @@ class NoUnusedImportsRule : Rule("no-unused-imports") {
             val directCalls = ref.filter { !it.inDotQualifiedExpression }.map { it.text }
             parentExpressions.forEach { parent ->
                 imports.removeIf { imp ->
-                    imp.endsWith(parent) && directCalls.none { imp.endsWith(it) }
+                    imp.endsWith(".$parent") && directCalls.none { imp.endsWith(".$it") }
                 }
             }
         } else if (node.elementType == PACKAGE_DIRECTIVE) {
@@ -160,12 +160,10 @@ class NoUnusedImportsRule : Rule("no-unused-imports") {
             return false
         }
 
-        val staticImports = imports.filter { it.endsWith(text) }
+        val staticImports = imports.filter { it.endsWith(".$text") }
         staticImports.forEach { import ->
-            var count = 0
-            imports.forEach {
-                val startsWith = it.startsWith(import.substringBefore(text))
-                if (startsWith) count += 1
+            val count = imports.count {
+                it.startsWith(import.substringBefore(text))
             }
             // Parent import and static import both are present
             if (count > 1) {

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
@@ -593,4 +593,21 @@ class NoUnusedImportsRuleTest {
             )
         ).isEmpty()
     }
+
+    @Test
+    fun `only redundant static java function imports should be removed`() {
+        assertThat(
+            NoUnusedImportsRule().lint(
+                """
+                import com.google.cloud.bigtable.data.v2.models.Mutation
+                import com.google.cloud.bigtable.data.v2.models.Row
+                import com.google.cloud.bigtable.data.v2.models.RowMutation.create
+
+                fun test(row: Row) {
+                    create("string", "string", Mutation.create())
+                }
+                """.trimIndent()
+            )
+        ).isEmpty()
+    }
 }