don't merge different descriptions at same start offset

b1138fe3 · Anna.Kozlova · 1d95e4ee · b1138fe3
Commit b1138fe3 authored 8 years ago by Anna.Kozlova
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 2 deletions
+5 -2
--- a/platform/analysis-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/CommonProblemDescriptor.java
@@ -36,8 +36,11 @@ public interface CommonProblemDescriptor {
      if (diff != 0) {
        return diff;
      }
-      return PsiUtilCore.compareElementsByPosition(((ProblemDescriptor)c2).getPsiElement(),
-                                                   ((ProblemDescriptor)c1).getPsiElement());
+
+      diff = PsiUtilCore.compareElementsByPosition(((ProblemDescriptor)c2).getPsiElement(), ((ProblemDescriptor)c1).getPsiElement());
+      if (diff != 0) {
+        return diff;
+      }
    }
    return c1.getDescriptionTemplate().compareTo(c2.getDescriptionTemplate());
  };