diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
index 3647676cf237..edb2b704e92a 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.resolve.MemberComparator
 import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData
-import kotlin.comparisons.compareBy
 
 object IdeRenderers {
 
diff --git a/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt b/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
index 9fca59ebab6f..80d6b6cf4858 100644
--- a/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
@@ -4,8 +4,8 @@
 package test
 
 <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
-    fun <get-x>(): Int defined in test
-    fun getX(): Int defined in test">val x</error> = 1
+    fun <get-x>(): Int defined in test in file topLevelMultifileRuntime.kt
+    fun getX(): Int defined in test in file topLevelMultifileRuntime.kt">val x</error> = 1
 <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
-    fun <get-x>(): Int defined in test
-    fun getX(): Int defined in test">fun getX()</error> = 1
+    fun <get-x>(): Int defined in test in file topLevelMultifileRuntime.kt
+    fun getX(): Int defined in test in file topLevelMultifileRuntime.kt">fun getX()</error> = 1
diff --git a/plugins/kotlin/idea/tests/testData/checker/regression/kt9887.kt b/plugins/kotlin/idea/tests/testData/checker/regression/kt9887.kt
index a1b076a4684b..be47483dbeaf 100644
--- a/plugins/kotlin/idea/tests/testData/checker/regression/kt9887.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/regression/kt9887.kt
@@ -2,4 +2,4 @@ open class A<T>()
 class G<T>()
 
 
-class B : A<<error descr="[WRONG_NUMBER_OF_TYPE_ARGUMENTS] One type argument expected for class G<T> defined in root package">G</error>>()
\ No newline at end of file
+class B : A<<error descr="[WRONG_NUMBER_OF_TYPE_ARGUMENTS] One type argument expected for class G<T> defined in root package in file kt9887.kt">G</error>>()
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt
index 3a3b139fa622..aba60bddda9f 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage1.txt
@@ -1,2 +1,2 @@
 <!-- conflictingOverloadsDefaultPackage1 -->
-Conflicting overloads: public fun foo(x: Int): Int defined in root package, public fun foo(y: Int): Int defined in root package
\ No newline at end of file
+Conflicting overloads: public fun foo(x: Int): Int defined in root package in file conflictingOverloadsDefaultPackage.kt, public fun foo(y: Int): Int defined in root package in file conflictingOverloadsDefaultPackage.kt
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt
index c717e1e525e5..2217fe06dc95 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/conflictingOverloadsDefaultPackage2.txt
@@ -1,2 +1,2 @@
 <!-- conflictingOverloadsDefaultPackage2 -->
-Conflicting overloads: public fun foo(x: Int): Int defined in root package, public fun foo(y: Int): Int defined in root package
\ No newline at end of file
+Conflicting overloads: public fun foo(x: Int): Int defined in root package in file conflictingOverloadsDefaultPackage.kt, public fun foo(y: Int): Int defined in root package in file conflictingOverloadsDefaultPackage.kt
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt
index 461b2e88f11b..afc94ada068c 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel1.txt
@@ -1,2 +1,2 @@
 <!-- constructorsRedeclarationTopLevel1 -->
-Conflicting overloads: public fun Element(x: String): Unit defined in root package, public constructor Element(x: String) defined in Element
\ No newline at end of file
+Conflicting overloads: public fun Element(x: String): Unit defined in root package in file constructorsRedeclarationTopLevel.kt, public constructor Element(x: String) defined in Element
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt
index 34db820434d6..967d8b682df1 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/constructorsRedeclarationTopLevel2.txt
@@ -1,2 +1,2 @@
 <!-- constructorsRedeclarationTopLevel2 -->
-Conflicting overloads: public fun Element(x: String): Unit defined in root package, public constructor Element(x: String) defined in Element
\ No newline at end of file
+Conflicting overloads: public fun Element(x: String): Unit defined in root package in file constructorsRedeclarationTopLevel.kt, public constructor Element(x: String) defined in Element
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableGeneric1.html b/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableGeneric1.html
index eb44484b372d..105d90f4aa49 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableGeneric1.html
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableGeneric1.html
@@ -4,9 +4,9 @@ None of the following functions can be called with the arguments supplied.
 <ul>
   <li>foo(<font color=red><b>T</b></font>, Any, MutableList<`<font color=red><b>T</b></font>>, MutableList<`<font color=red><b>T</b></font>>)<br/>
   <i>where</i> <font color=red><b>T</b></font><i> cannot be inferred</i><i> for </i><br/>
-  <b>fun</b> <`T> foo(t: T, a: Any, lt: MutableList<`T>, lr: MutableList<`T>): Int <i>defined in</i> p</li>
+  <b>fun</b> <`T> foo(t: T, a: Any, lt: MutableList<`T>, lr: MutableList<`T>): Int <i>defined in</i> p <i>in file</i> noneApplicableGeneric.kt</li>
   <li>foo(Int, <font color=red><b>R</b></font>, MutableList<`Int>, MutableList<`<font color=red><b>R</b></font>>)<br/>
   <i>where</i> <font color=red><b>R</b></font><i> cannot be inferred</i>; T = Int<i> for </i><br/>
-  <b>fun</b> <`T, R> foo(t: T, r: R, lt: MutableList<`T>, lr: MutableList<`R>): Int <i>defined in</i> p</li>
+  <b>fun</b> <`T, R> foo(t: T, r: R, lt: MutableList<`T>, lr: MutableList<`R>): Int <i>defined in</i> p <i>in file</i> noneApplicableGeneric.kt</li>
 </ul>
 </html>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableTxt1.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableTxt1.txt
index 3ceb80f3e787..a41e14776c21 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableTxt1.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/noneApplicableTxt1.txt
@@ -1,5 +1,5 @@
 <!-- noneApplicableTxt1 -->
 None of the following functions can be called with the arguments supplied: 
-public fun foo(b: a.b.String): Unit defined in a.b
-public fun foo(i: Int): Unit defined in a.b
-public fun foo(a: kotlin.String): Unit defined in a.b
\ No newline at end of file
+public fun foo(b: a.b.String): Unit defined in a.b in file noneApplicableTxt.kt
+public fun foo(i: Int): Unit defined in a.b in file noneApplicableTxt.kt
+public fun foo(a: kotlin.String): Unit defined in a.b in file noneApplicableTxt.kt
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityHtml1.html b/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityHtml1.html
index 30ee43babd26..26ceb0289375 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityHtml1.html
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityHtml1.html
@@ -3,7 +3,7 @@
 Overload resolution ambiguity. All these functions match.
 <ul>
   <li><b>public</b> <b>fun</b> <`T> foo(b: a.b.String, t: ???): Unit <i>defined in</i> a.b</li>
-  <li><b>public</b> <b>fun</b> foo(i: Int): Unit <i>defined in</i> a.b</li>
+  <li><b>public</b> <b>fun</b> foo(i: Int): Unit <i>defined in</i> a.b <i>in file</i> overloadResolutionAmbiguityHtml.kt</li>
   <li><b>public</b> <b>fun</b> <`T> foo(a: kotlin.String, t: ???): Unit <i>defined in</i> a.b</li>
 </ul>
 </html>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityTxt1.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityTxt1.txt
index 976c8db72270..82df8f335f10 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityTxt1.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/overloadResolutionAmbiguityTxt1.txt
@@ -1,5 +1,5 @@
 <!-- overloadResolutionAmbiguityTxt1 -->
 Overload resolution ambiguity: 
 public fun <T> foo(b: a.b.String, t: ???): Unit defined in a.b
-public fun foo(i: Int): Unit defined in a.b
+public fun foo(i: Int): Unit defined in a.b in file overloadResolutionAmbiguityTxt.kt
 public fun <T> foo(a: kotlin.String, t: ???): Unit defined in a.b
\ No newline at end of file