From deb45e501138013e0062b33f02fa856327cf457b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 27 Sep 2021 08:07:44 +0200
Subject: [PATCH] NPE

EA-374986 - NPE: StaticMembersProcessor.registerMember

GitOrigin-RevId: 552d50c683da949cb3a35f74f70f2faef561b099
---
 .../impl/quickfix/StaticMembersProcessor.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
index c90fedfa0e3a..844132f7a978 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticMembersProcessor.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.CodeInsightUtil;
@@ -102,16 +102,17 @@ abstract class StaticMembersProcessor<T extends PsiMember & PsiDocCommentOwner>
         //methods in interfaces must have explicit static modifier or they are not static;
         return true;
       }
-    }
 
-    if (myAddStaticImport) {
-      if (!PsiUtil.isFromDefaultPackage(member)) {
+      if (myAddStaticImport) {
+        if (!PsiUtil.isFromDefaultPackage(member)) {
+          mySuggestions.putValue(containingClass, member);
+        }
+      }
+      else if (myInDefaultPackage || !PsiUtil.isFromDefaultPackage(member)) {
         mySuggestions.putValue(containingClass, member);
       }
     }
-    else if (myInDefaultPackage || !PsiUtil.isFromDefaultPackage(member)) {
-      mySuggestions.putValue(containingClass, member);
-    }
+
     return processCondition();
   }