From 40147bba55cfcf102fff50400894bad1de52285a Mon Sep 17 00:00:00 2001
From: Lucas Smaira <lsmaira@google.com>
Date: Thu, 3 Nov 2016 18:52:52 +0100
Subject: [PATCH] search for duplicated classes in resolve scope to hide
 conflicts from different test scopes, as for android

---
 .../codeInsight/daemon/impl/analysis/HighlightClassUtil.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
index 8778fe6c9c48..d68071494312 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
@@ -40,7 +40,6 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.*;
 import com.intellij.refactoring.util.RefactoringChangeUtil;
 import org.jetbrains.annotations.NotNull;
@@ -162,7 +161,7 @@ public class HighlightClassUtil {
     Module module = ModuleUtilCore.findModuleForPsiElement(aClass);
     if (module == null) return null;
 
-    PsiClass[] classes = JavaPsiFacade.getInstance(aClass.getProject()).findClasses(qualifiedName, GlobalSearchScope.moduleScope(module));
+    PsiClass[] classes = JavaPsiFacade.getInstance(aClass.getProject()).findClasses(qualifiedName, aClass.getResolveScope());
     if (classes.length < numOfClassesToFind) return null;
     final ModuleFileIndex fileIndex = ModuleRootManager.getInstance(module).getFileIndex();
     final VirtualFile virtualFile = PsiUtilCore.getVirtualFile(aClass);