From d5d87f3a8d6627b7802cdd320bfaeba4b5e4829f Mon Sep 17 00:00:00 2001
From: Pavel Dolgov <pavel.dolgov@jetbrains.com>
Date: Thu, 27 Apr 2017 16:56:24 +0300
Subject: [PATCH] Java: When searching for a class accessed with reflection try
 ResolveScope first to search in proper JDK/libraries - correction after
 review (IDEA-171808, IDEA-CR-20541)

---
 .../Java9ReflectionClassVisibilityInspection.java           | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/reflectiveAccess/Java9ReflectionClassVisibilityInspection.java b/java/java-impl/src/com/intellij/codeInspection/reflectiveAccess/Java9ReflectionClassVisibilityInspection.java
index a3672c902895..1989badee24d 100644
--- a/java/java-impl/src/com/intellij/codeInspection/reflectiveAccess/Java9ReflectionClassVisibilityInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/reflectiveAccess/Java9ReflectionClassVisibilityInspection.java
@@ -22,7 +22,6 @@ import com.intellij.codeInspection.BaseJavaBatchLocalInspectionTool;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
@@ -71,10 +70,7 @@ public class Java9ReflectionClassVisibilityInspection extends BaseJavaBatchLocal
       if (className != null) {
         final Project project = holder.getProject();
         final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
-        PsiClass psiClass = facade.findClass(className, holder.getFile().getResolveScope());
-        if (psiClass == null) {
-          psiClass = facade.findClass(className, GlobalSearchScope.allScope(project));
-        }
+        final PsiClass psiClass = facade.findClass(className, callExpression.getResolveScope());
         if (psiClass != null) {
           final PsiJavaModule otherModule = JavaModuleGraphUtil.findDescriptorByElement(psiClass);
           if (otherModule != null && otherModule != javaModule) {