Include file name for package-level members in diagnostics

idea/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
+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

idea/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
+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

idea/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
+Conflicting overloads: public fun Element(x: String): Unit defined in root package in file constructorsRedeclarationTopLevel.kt, public constructor Element(x: String) defined in Element

idea/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
+Conflicting overloads: public fun Element(x: String): Unit defined in root package in file constructorsRedeclarationTopLevel.kt, public constructor Element(x: String) defined in Element

idea/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>

idea/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
+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

idea/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>

idea/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