Add alphabetical sorting diagnostics with same ranges

compiler/frontend/src/org/jetbrains/kotlin/checkers/DiagnosticDescriptors.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.checkers
 
-import com.google.common.collect.Maps
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.checkers.diagnostics.AbstractTestDiagnostic
 import org.jetbrains.kotlin.checkers.diagnostics.PositionalTextDiagnostic
@@ -21,7 +20,7 @@ class ActualDiagnosticDescriptor internal constructor(start: Int, end: Int, val
 
     val textDiagnosticsMap: MutableMap<AbstractTestDiagnostic, TextDiagnostic>
         get() {
-            val diagnosticMap = Maps.newLinkedHashMap<AbstractTestDiagnostic, TextDiagnostic>()
+            val diagnosticMap = mutableMapOf<AbstractTestDiagnostic, TextDiagnostic>()
             for (diagnostic in diagnostics) {
                 diagnosticMap[diagnostic] = TextDiagnostic.asTextDiagnostic(diagnostic)
             }

compiler/frontend/src/org/jetbrains/kotlin/checkers/utils/CheckerTestUtil.kt

@@ -549,6 +549,7 @@ object CheckerTestUtil {
         }
 
         if (diagnosticsAsText.size != 0) {
+            diagnosticsAsText.sort()
             result.append("<!${diagnosticsAsText.joinToString(", ")}!>")
             isSkip = false
         }