New J2K: Fix RemoveRedundantExpressionQualifierProcessing

2019-03-13 14:59:49 +03:00
parent 6f7f516a4f
commit 0610583b80
1 changed files with 2 additions and 3 deletions
@@ -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)? {