From 0610583b8066697ad51ecbbf14c8efc3e8e8e4c3 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 13 Mar 2019 14:59:49 +0300
Subject: [PATCH] New J2K: Fix RemoveRedundantExpressionQualifierProcessing

---
 .../src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
index ecab4c82890..9d7054bee05 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/NewJ2kPostProcessings.kt
@@ -756,9 +756,8 @@ object NewJ2KPostProcessingRegistrar {
         private fun check(qualifiedExpression: KtQualifiedExpression): Boolean {
             val qualifier = (qualifiedExpression.receiverExpression as? KtNameReferenceExpression)
                 ?.referenceExpression()
-                ?.resolve() as? KtClassOrObject ?: return false
-            val topLevelClass = qualifiedExpression.getStrictParentOfType<KtClassOrObject>() ?: return false
-            return topLevelClass == qualifier
+                ?.resolve()?.safeAs<KtClassOrObject>()?.parentClassForCompanionOrThis() ?: return false
+            return qualifier.parentClassForCompanionOrThis() in qualifiedExpression.parentsOfType<KtClassOrObject>()
         }
 
         override fun createAction(element: PsiElement, diagnostics: Diagnostics): (() -> Unit)? {