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

fixes for review comments

Browse Source
This commit is contained in:
Maxim.Mossienko
2014-05-13 18:15:18 +02:00
parent 136d116f97
commit 3e3b44bedb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java
+7 -6
View File
@@ -69,7 +69,7 @@ public class PsiShortNamesCacheImpl extends PsiShortNamesCache {
if (classes.isEmpty()) return PsiClass.EMPTY_ARRAY;
ArrayList<PsiClass> list = new ArrayList<PsiClass>(classes.size());
Map<String, List<PsiClass>> uniqueQName2Classes = new THashMap<String, List<PsiClass>>(classes.size());
List<PsiClass> hiddenClasses = null;
Set<PsiClass> hiddenClassesToRemove = null;
OuterLoop:
for (PsiClass aClass : classes) {
@@ -83,16 +83,17 @@ public class PsiShortNamesCacheImpl extends PsiShortNamesCache {
if (previousQNamedClasses != null) {
qNamedClasses = new SmartList<PsiClass>();
for(PsiClass previousClass:previousQNamedClasses) {
VirtualFile previousClassVFile = previousClass.getContainingFile().getVirtualFile();
int res = scope.compare(previousClassVFile, vFile);
if (res > 0) {
continue OuterLoop; // previousClass hides aClass
continue OuterLoop; // previousClass hides aClass in classpath, so skip adding aClass
}
else if (res < 0) {
// aClass hides previousClass
if (hiddenClasses == null) hiddenClasses = new SmartList<PsiClass>();
hiddenClasses.add(previousClass);
// aClass hides previousClass in classpath, so remove it from list later
if (hiddenClassesToRemove == null) hiddenClassesToRemove = new THashSet<PsiClass>();
hiddenClassesToRemove.add(previousClass);
qNamedClasses.add(aClass);
} else {
qNamedClasses.add(aClass);
@@ -106,7 +107,7 @@ public class PsiShortNamesCacheImpl extends PsiShortNamesCache {
list.add(aClass);
}
if (hiddenClasses != null) list.removeAll(hiddenClasses);
if (hiddenClassesToRemove != null) list.removeAll(hiddenClassesToRemove);
return list.toArray(new PsiClass[list.size()]);
}