From c785fc97ed5a5c01a7197b3d613ff045d40e43fa Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Wed, 6 Nov 2019 11:30:05 +0700
Subject: [PATCH] ExpressionUtils#getEffectiveQualifier: fix for static
 qualifier

GitOrigin-RevId: 48c9242ba7813841bd74c3d5f400b705e25fd3c9
---
 .../src/com/siyeh/ig/psiutils/ExpressionUtils.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java
index fb9ab1ca2ec0..ef2f42ad8b36 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpressionUtils.java
@@ -939,13 +939,13 @@ public class ExpressionUtils {
     }
     PsiClass memberClass = member.getContainingClass();
     if (memberClass != null) {
+      if (member.hasModifierProperty(PsiModifier.STATIC)) {
+        return factory.createReferenceExpression(memberClass);
+      }
       PsiClass containingClass = ClassUtils.getContainingClass(ref);
       if (containingClass == null) {
         containingClass = PsiTreeUtil.getContextOfType(ref, PsiClass.class);
       }
-      if (containingClass != null && member.hasModifierProperty(PsiModifier.STATIC)) {
-        return factory.createReferenceExpression(containingClass);
-      }
       if (!InheritanceUtil.isInheritorOrSelf(containingClass, memberClass, true)) {
         containingClass = ClassUtils.getContainingClass(containingClass);
         while (containingClass != null && !InheritanceUtil.isInheritorOrSelf(containingClass, memberClass, true)) {