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

make InspectionResultsViewComparator.compareEntities faster again

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-11-02 20:21:49 +01:00
parent cdc9db363f
commit af501262cf
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java
+27 -29
View File
@@ -13,6 +13,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileWithId;
import com.intellij.profile.codeInspection.ui.inspectionsTree.InspectionsConfigTreeComparator;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
@@ -145,46 +146,43 @@ public class InspectionResultsViewComparator implements Comparator<InspectionTre
}
private static int compareEntities(final RefEntity entity1, final RefEntity entity2) {
if (entity1 instanceof RefFile && entity2 instanceof RefFile) {
VirtualFile file1 = ((RefFile)entity1).getPointer().getVirtualFile();
VirtualFile file2 = ((RefFile)entity2).getPointer().getVirtualFile();
if (file1 instanceof VirtualFileWithId && file2 instanceof VirtualFileWithId) {
return ((VirtualFileWithId)file1).getId() - ((VirtualFileWithId)file2).getId();
}
int cmp = file1.getName().compareToIgnoreCase(file2.getName());
if (cmp != 0) return cmp;
cmp = file1.getPath().compareToIgnoreCase(file2.getPath());
return cmp;
}
if (entity1 != null && entity2 != null) {
int cmp = compareEntitiesByName(entity1, entity2);
if (cmp != 0) return cmp;
}
if (entity1 instanceof RefElement && entity2 instanceof RefElement) {
final SmartPsiElementPointer p1 = ((RefElement)entity1).getPointer();
final SmartPsiElementPointer p2 = ((RefElement)entity2).getPointer();
if (p1 != null && p2 != null) {
final VirtualFile file1 = p1.getVirtualFile();
final VirtualFile file2 = p2.getVirtualFile();
if (file1 != null && file2 != null && file1.isValid() && file2.isValid()) {
if (file1.equals(file2)) {
final int positionComparing = PsiUtilCore.compareElementsByPosition(((RefElement)entity1).getElement(), ((RefElement)entity2).getElement());
if (positionComparing != 0) {
return positionComparing;
}
if (file1 != null && file1.isValid() && file2 != null && file2.isValid()) {
int cmp = PsiUtilCore.compareElementsByPosition(((RefElement)entity1).getElement(), ((RefElement)entity2).getElement());
if (cmp != 0) return cmp;
if (file1 instanceof VirtualFileWithId && file2 instanceof VirtualFileWithId) {
return ((VirtualFileWithId)file1).getId() - ((VirtualFileWithId)file2).getId();
}
int res = file1.getName().compareToIgnoreCase(file2.getName());
if (res != 0) return res;
return file1.getPath().compareToIgnoreCase(file2.getPath());
}
if (file1 != null && Comparing.equal(file1, file2) && file1.isValid()) {
final int positionComparing = PsiUtilCore.compareElementsByPosition(((RefElement)entity1).getElement(), ((RefElement)entity2).getElement());
if (positionComparing != 0) {
return positionComparing;
}
}
return 0;
}
if (p1 != null) return -1;
if (p2 != null) return 1;
return 0;
}
if (entity1 instanceof RefFile && entity2 instanceof RefFile) {
final VirtualFile file1 = ((RefFile)entity1).getPointer().getVirtualFile();
final VirtualFile file2 = ((RefFile)entity2).getPointer().getVirtualFile();
if (file1 != null && file2 != null) {
if (file1.equals(file2)) return 0;
final int cmp = compareEntitiesByName(entity1, entity2);
if (cmp != 0) return cmp;
return file1.getPath().compareToIgnoreCase(file2.getPath());
}
}
if (entity1 != null && entity2 != null) {
return compareEntitiesByName(entity1, entity2);
}
if (entity1 != null) return -1;
return entity2 != null ? 1 : 0;
return entity1 != null ? -1 : entity2 == null ? 0 : 1;
}
private static int compareEntitiesByName(RefEntity entity1, RefEntity entity2) {