Fixed unused infix function call import false positive

pinterest · Jan 25, 2017 · d9cf92c · d9cf92c
1 parent e30bdf5
commit d9cf92c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...-standard/src/main/kotlin/com/gihub/shyiko/ktlint/ruleset/standard/NoUnusedImportsRule.kt b/...-standard/src/main/kotlin/com/gihub/shyiko/ktlint/ruleset/standard/NoUnusedImportsRule.kt
@@ -1,6 +1,7 @@
 package com.gihub.shyiko.ktlint.ruleset.standard
 
 import com.github.shyiko.ktlint.core.Rule
+import org.jetbrains.kotlin.KtNodeTypes
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
@@ -17,8 +18,9 @@ class NoUnusedImportsRule : Rule("no-unused-imports") {
             emit: (offset: Int, errorMessage: String, canBeAutoCorrected: Boolean) -> Unit) {
         if (node.elementType == KtStubElementTypes.FILE) {
             node.visit { node ->
-                if (node.elementType == KtStubElementTypes.REFERENCE_EXPRESSION &&
-                        !node.psi.isPartOf(KtImportDirective::class)) {
+                val type = node.elementType
+                if ((type == KtNodeTypes.REFERENCE_EXPRESSION || type == KtNodeTypes.OPERATION_REFERENCE) &&
+                    !node.psi.isPartOf(KtImportDirective::class)) {
                     ref.add(node.text.trim('`'))
                 }
             }

diff --git a/...dard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoUnusedImportsRuleTest.kt b/...dard/src/test/kotlin/com/github/shyiko/ktlint/ruleset/standard/NoUnusedImportsRuleTest.kt
@@ -22,10 +22,12 @@ class NoUnusedImportsRuleTest {
             import p.a.*
             import escaped.`when`
             import escaped.`foo`
+            import infixfunc
 
             fun main() {
                 println(a())
                 C.call(B())
+                1 infixfunc 2
                 `when`()
             }
             """.trimIndent()