Add alphabetical sorting diagnostics with same ranges

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt

@@ -4,7 +4,7 @@ fun foo() {
     val x: Int? = null
     val a = Array<Int>(3, {0})
 
-    if (x != null) bar(a[<!DEBUG_INFO_SMARTCAST!>x<!>]) else bar(a[<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>])
+    if (x != null) bar(a[<!DEBUG_INFO_SMARTCAST!>x<!>]) else bar(a[<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>])
     bar(a[if (x == null) 0 else <!DEBUG_INFO_SMARTCAST!>x<!>])
     bar(a[<!TYPE_MISMATCH!>x<!>])
     

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt

@@ -6,6 +6,6 @@ fun foo() {
     val x: Int? = null
 
     bar(1 + (if (x == null) 0 else x))
-    bar(<!NI;TYPE_MISMATCH!>if (x == null) <!NI;TYPE_MISMATCH, DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!> else x<!>)
+    bar(<!NI;TYPE_MISMATCH!>if (x == null) <!DEBUG_INFO_CONSTANT, NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!> else x<!>)
     if (x != null) bar(x + x/(x-x*x))
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt

@@ -17,14 +17,14 @@ fun foo() {
         if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
         bar(bar(x))
     } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
-        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
+        bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> != null<!>) {
             bar(x)
             if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x)
             if (<!SENSELESS_COMPARISON!>x == null<!>) bar(x) else bar(x)
             bar(bar(x) + bar(x))
         } else if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>x<!> == null<!>) {
-            bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
+            bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         }
     }
 

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.kt

@@ -12,5 +12,5 @@ fun foo() {
     do {
         bar(<!TYPE_MISMATCH!>y<!>)
     } while (y != null)
-    bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>)
+    bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>y<!>)
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.kt

@@ -6,7 +6,7 @@ fun foo() {
     bar(if (x == null) 0 else <!DEBUG_INFO_SMARTCAST!>x<!>)
 
     if (x == null) {
-        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
+        bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
         return
     } else {
         bar(<!DEBUG_INFO_SMARTCAST!>x<!>)

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt

@@ -7,6 +7,6 @@ fun foo() {
 
     val <!UNUSED_VARIABLE!>a<!> = object {
         fun baz() = bar(if (x == null) 0 else <!DEBUG_INFO_SMARTCAST!>x<!>)
-        fun quux(): Int = <!NI;TYPE_MISMATCH!>if (x == null) <!OI;TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!> else <!DEBUG_INFO_SMARTCAST!>x<!><!>
+        fun quux(): Int = <!NI;TYPE_MISMATCH!>if (x == null) <!DEBUG_INFO_CONSTANT, OI;TYPE_MISMATCH!>x<!> else <!DEBUG_INFO_SMARTCAST!>x<!><!>
     }
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt

@@ -9,10 +9,10 @@ fun foo(): Int {
     if (x != null) return x
     
     val y: Int? = null
-    if (y == null) return <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>y<!> != null<!>) y else <!OI;TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!><!>
+    if (y == null) return <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>y<!> != null<!>) y else <!DEBUG_INFO_CONSTANT, OI;TYPE_MISMATCH!>y<!><!>
     
     val z: Int? = null
     if (z != null) return if (<!SENSELESS_COMPARISON!>z == null<!>) z else z
     
-    return <!NI;TYPE_MISMATCH, DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>z<!>
+    return <!DEBUG_INFO_CONSTANT, NI;TYPE_MISMATCH, TYPE_MISMATCH!>z<!>
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.kt

@@ -16,6 +16,6 @@ class Derived : Base() {
 
         val y: Int? = null
         if (y != null) super.bar(this.baz(<!DEBUG_INFO_SMARTCAST!>y<!>))
-        else this.baz(super.bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>))
+        else this.baz(super.bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>y<!>))
     }
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.kt

@@ -3,7 +3,7 @@ fun bar(x: Int): RuntimeException = RuntimeException(x.toString())
 fun foo() {
     val x: Int? = null
 
-    if (x == null) throw bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
+    if (x == null) throw bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
     throw bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
     <!UNREACHABLE_CODE!>throw bar(<!DEBUG_INFO_SMARTCAST!>x<!>)<!>
 }

compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.kt

@@ -3,7 +3,7 @@ fun bar(x: Int): Int = x + 1
 fun foo() {
     val x: Int? = null
     while (x == null) {
-        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>x<!>)
+        bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
     }
     bar(<!DEBUG_INFO_SMARTCAST!>x<!>)
     
@@ -11,11 +11,11 @@ fun foo() {
     while (y != null) {
         bar(<!DEBUG_INFO_SMARTCAST!>y<!>)
     }
-    bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>y<!>)
+    bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>y<!>)
     
     val z: Int? = null
     while (z == null) {
-        bar(<!TYPE_MISMATCH, DEBUG_INFO_CONSTANT!>z<!>)
+        bar(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>z<!>)
         break
     }
     bar(<!TYPE_MISMATCH!>z<!>)