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

goto implementation: compare by offset when presentations are same (IDEA-180495)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-10-13 19:36:58 +02:00
parent d2f67c7d76
commit 8ec901f89d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java
+6 -1
View File
@@ -40,6 +40,7 @@ import com.intellij.pom.Navigatable;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiNamedElement;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.CollectionListModel;
import com.intellij.ui.components.JBList;
import com.intellij.ui.popup.AbstractPopup;
@@ -220,7 +221,11 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler {
return new Comparator<PsiElement>() {
@Override
public int compare(PsiElement o1, PsiElement o2) {
return getComparingObject(o1).compareTo(getComparingObject(o2));
int diff = getComparingObject(o1).compareTo(getComparingObject(o2));
if (diff == 0) {
return ReadAction.compute(() -> PsiUtilCore.compareElementsByPosition(o1, o2));
}
return diff;
}
private Comparable getComparingObject(PsiElement o1) {