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

inspection toolwindow: do not merge ProblemDescriptor-s with the same getLineNumber() IDEA-157966

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-06-29 15:30:16 +03:00
parent 4c3128df3a
commit f4515a9c7d
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java
+15 -2
View File
@@ -93,8 +93,21 @@ public class InspectionResultsViewComparator implements Comparator {
final CommonProblemDescriptor descriptor1 = ((ProblemDescriptionNode)node1).getDescriptor();
final CommonProblemDescriptor descriptor2 = ((ProblemDescriptionNode)node2).getDescriptor();
if (descriptor1 instanceof ProblemDescriptor && descriptor2 instanceof ProblemDescriptor) {
//TODO: Do not materialise lazy pointers
return ((ProblemDescriptor)descriptor1).getLineNumber() - ((ProblemDescriptor)descriptor2).getLineNumber();
int diff = ((ProblemDescriptor)descriptor1).getLineNumber() - ((ProblemDescriptor)descriptor2).getLineNumber();
if (diff != 0) {
return diff;
}
diff = ((ProblemDescriptor)descriptor1).getHighlightType().compareTo(((ProblemDescriptor)descriptor2).getHighlightType());
if (diff != 0) {
return diff;
}
diff = PsiUtilCore.compareElementsByPosition(((ProblemDescriptor)descriptor1).getStartElement(),
((ProblemDescriptor)descriptor2).getStartElement());
if (diff != 0) {
return diff;
}
return PsiUtilCore.compareElementsByPosition(((ProblemDescriptor)descriptor2).getEndElement(),
((ProblemDescriptor)descriptor1).getEndElement());
}
if (descriptor1 != null && descriptor2 != null) {
return descriptor1.getDescriptionTemplate().compareToIgnoreCase(descriptor2.getDescriptionTemplate());