From e96b5f3117d7049aec76bf62270fb4d8feb7c88f Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Tue, 27 Mar 2018 16:26:19 +0200
Subject: [PATCH] Fix false positive in redundant companion reference #KT-23435
 Fixed

---
 .../RedundantCompanionReferenceInspection.kt      | 10 ++++++----
 .../redundantCompanionReference/methodArgument.kt | 15 +++++++++++++++
 .../inspections/LocalInspectionTestGenerated.java |  6 ++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 idea/testData/inspectionsLocal/redundantCompanionReference/methodArgument.kt

diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt
index 62cdb233971..9c810d5626e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantCompanionReferenceInspection.kt
@@ -13,8 +13,10 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElementVisitor
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
+import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
+import org.jetbrains.kotlin.psi.KtObjectDeclaration
+import org.jetbrains.kotlin.psi.KtReferenceExpression
+import org.jetbrains.kotlin.psi.referenceExpressionVisitor
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
 class RedundantCompanionReferenceInspection : AbstractKotlinInspection() {
@@ -24,7 +26,7 @@ class RedundantCompanionReferenceInspection : AbstractKotlinInspection() {
             val descriptor = (expression.mainReference.resolve() as? KtObjectDeclaration)?.descriptor ?: return
             if (!DescriptorUtils.isCompanionObject(descriptor)) return
 
-            val parent = expression.getStrictParentOfType<KtDotQualifiedExpression>() ?: return
+            val parent = expression.parent as? KtDotQualifiedExpression ?: return
             if (expression == parent.receiverExpression && expression.text == descriptor.containingDeclaration?.name?.asString()) return
             if (expression == parent.selectorExpression && parent.parent !is KtDotQualifiedExpression) return
 
@@ -45,7 +47,7 @@ private class RemoveRedundantCompanionReferenceFix : LocalQuickFix {
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
         val expression = descriptor.psiElement as? KtReferenceExpression ?: return
-        val parent = expression.getStrictParentOfType<KtDotQualifiedExpression>() ?: return
+        val parent = expression.parent as? KtDotQualifiedExpression ?: return
         val selector = parent.selectorExpression ?: return
         val receiver = parent.receiverExpression
         if (expression == receiver) parent.replace(selector) else parent.replace(receiver)
diff --git a/idea/testData/inspectionsLocal/redundantCompanionReference/methodArgument.kt b/idea/testData/inspectionsLocal/redundantCompanionReference/methodArgument.kt
new file mode 100644
index 00000000000..c797ffc07ac
--- /dev/null
+++ b/idea/testData/inspectionsLocal/redundantCompanionReference/methodArgument.kt
@@ -0,0 +1,15 @@
+// PROBLEM: none
+
+class C {
+    companion object {
+    }
+}
+
+class Test {
+    fun foo(i: Any) {
+    }
+
+    fun test() {
+        this.foo(<caret>C)
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index d0d5a910556..5edcf55f27e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -2565,6 +2565,12 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("methodArgument.kt")
+        public void testMethodArgument() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantCompanionReference/methodArgument.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("notCompanion.kt")
         public void testNotCompanion() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/redundantCompanionReference/notCompanion.kt");