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

Extract psi class scope comparator

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-09-14 14:25:16 +03:00
parent 3b48c82ba0
commit 681bfa22e1
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFinderImpl.java
+3 -10
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.file.impl.JavaFileManager;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.stubs.StubTreeLoader;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.psi.util.PsiClassUtil;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
@@ -116,14 +116,7 @@ public class PsiElementFinderImpl extends PsiElementFinder implements DumbAware
}
if (list.size() > 1) {
ContainerUtil.quickSort(list, new Comparator<PsiClass>() {
@Override
public int compare(PsiClass o1, PsiClass o2) {
VirtualFile file1 = PsiUtilCore.getVirtualFile(o1);
VirtualFile file2 = PsiUtilCore.getVirtualFile(o2);
return file1 == null ? file2 == null ? 0 : -1 : file2 == null ? 1 : scope.compare(file2, file1);
}
});
ContainerUtil.quickSort(list, PsiClassUtil.createScopeComparator(scope));
}
return list.toArray(new PsiClass[list.size()]);
java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
+1 -10
View File
@@ -286,16 +286,7 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
return PsiSearchScopeUtil.isInScope(scope, aClass);
}
});
Arrays.sort(array, new Comparator<PsiClass>() {
@Override
public int compare(PsiClass o1, PsiClass o2) {
VirtualFile file1 = PsiUtilCore.getVirtualFile(o1);
VirtualFile file2 = PsiUtilCore.getVirtualFile(o2);
if (file1 == null) return file2 == null ? 0 : -1;
if (file2 == null) return 1;
return scope.compare(file2, file1);
}
});
Arrays.sort(array, PsiClassUtil.createScopeComparator(scope));
return array;
}