MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

search for duplicated classes in resolve scope to hide conflicts from different test scopes, as for android

Browse Source
This commit is contained in:
Lucas Smaira
2016-11-03 19:11:18 +01:00
committed by Anna.Kozlova
parent 9f59461a90
commit 40147bba55
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
+1 -2
View File
@@ -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);