diff --git a/idea/testData/checker/Override.kt b/idea/testData/checker/Override.kt
index b4a83a90178..970478854fd 100644
--- a/idea/testData/checker/Override.kt
+++ b/idea/testData/checker/Override.kt
@@ -26,11 +26,11 @@ package override
     }
 
     <error>class MyIllegalClass4</error> : MyTrait, MyAbstractClass() {
-        <error>fun foo()</error> {}
+        fun <error>foo</error>() {}
         <error>override</error> fun other() {}
     }
 
     class MyChildClass1 : MyClass() {
-        <error>fun foo()</error> {}
+        fun <error>foo</error>() {}
         override fun bar() {}
     }
diff --git a/idea/testData/checker/OverridesAndGenerics.kt b/idea/testData/checker/OverridesAndGenerics.kt
index 77933909810..2a05d64fe96 100644
--- a/idea/testData/checker/OverridesAndGenerics.kt
+++ b/idea/testData/checker/OverridesAndGenerics.kt
@@ -14,7 +14,7 @@
     class MyChildClass : MyGenericClass<Int>() {}
     class MyChildClass1<T> : MyGenericClass<T>() {}
     class MyChildClass2<T> : MyGenericClass<T>() {
-        <error>fun foo(t: T)</error> = t
+        fun <error>foo</error>(t: T) = t
         override fun bar(t: T) = t
     }
 
diff --git a/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt b/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
index 928f91b8693..a53b271040e 100644
--- a/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
+++ b/idea/testData/editor/quickDoc/DeprecationWithReplaceInfo.kt
@@ -3,4 +3,4 @@ fun <caret>lol() {
     println("lol")
 }
 
-//INFO: <pre>@<a href="psi_element://kotlin.Deprecated">Deprecated</a> <b>public</b> <b>fun</b> lol(): Unit <i>defined in</i> root package</pre><DL><DT><b>Deprecated:</b></DT><DD>lol no more mainstream</DD><DT><b>Replace with:</b></DT><DD><code>kek()</code></DD></DL>
+//INFO: <pre>@<a href="psi_element://kotlin.Deprecated">Deprecated</a> <b>public</b> <b>fun</b> lol(): Unit <i>defined in</i> root package <i>in file</i> DeprecationWithReplaceInfo.kt</pre><DL><DT><b>Deprecated:</b></DT><DD>lol no more mainstream</DD><DT><b>Replace with:</b></DT><DD><code>kek()</code></DD></DL>
diff --git a/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt b/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt
index 56966d1d88a..4a2c308b672 100644
--- a/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt
+++ b/idea/testData/editor/quickDoc/EscapeHtmlInsideCodeBlocks.kt
@@ -8,7 +8,7 @@
  */
 class <caret>A<T>
 
-//INFO: <pre><b>public</b> <b>final</b> <b>class</b> A&lt;T&gt; <i>defined in</i> root package</pre><p>Code block:</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> A&lt;T&gt; <i>defined in</i> root package <i>in file</i> EscapeHtmlInsideCodeBlocks.kt</pre><p>Code block:</p>
 //INFO: <pre><code>
 //INFO: A&lt;T&gt;
 //INFO: </code></pre><p>Code span: <code>&lt;T&gt;</code> is type parameter</p>
diff --git a/idea/testData/editor/quickDoc/ExtensionReceiver.kt b/idea/testData/editor/quickDoc/ExtensionReceiver.kt
index d3fa64995d8..b48eb25c8f6 100644
--- a/idea/testData/editor/quickDoc/ExtensionReceiver.kt
+++ b/idea/testData/editor/quickDoc/ExtensionReceiver.kt
@@ -7,4 +7,4 @@ fun Foo.bar() {
     foo(th<caret>is)
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> <a href="psi_element://Foo">Foo</a>.bar(): Unit <i>defined in</i> root package</pre>
+//INFO: <pre><b>public</b> <b>fun</b> <a href="psi_element://Foo">Foo</a>.bar(): Unit <i>defined in</i> root package <i>in file</i> ExtensionReceiver.kt</pre>
diff --git a/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt b/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt
index 2ff375d358e..d3e5b5e5d0e 100644
--- a/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt
+++ b/idea/testData/editor/quickDoc/ExtensionReceiverEnd.kt
@@ -7,4 +7,4 @@ fun Foo.bar() {
     foo(this<caret>)
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> <a href="psi_element://Foo">Foo</a>.bar(): Unit <i>defined in</i> root package</pre>
+//INFO: <pre><b>public</b> <b>fun</b> <a href="psi_element://Foo">Foo</a>.bar(): Unit <i>defined in</i> root package <i>in file</i> ExtensionReceiverEnd.kt</pre>
diff --git a/idea/testData/editor/quickDoc/IndentedCodeBlock.kt b/idea/testData/editor/quickDoc/IndentedCodeBlock.kt
index 8c1296e8348..c854f80022f 100644
--- a/idea/testData/editor/quickDoc/IndentedCodeBlock.kt
+++ b/idea/testData/editor/quickDoc/IndentedCodeBlock.kt
@@ -13,7 +13,7 @@
  */
 class <caret>A
 
-//INFO: <pre><b>public</b> <b>final</b> <b>class</b> A <i>defined in</i> root package</pre><br/><pre><code>val a = A()
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> A <i>defined in</i> root package <i>in file</i> IndentedCodeBlock.kt</pre><br/><pre><code>val a = A()
 //INFO: println(a) // comment</code></pre><pre><code>
 //INFO: &lt;fenced&gt;Code_block&lt;/fenced&gt;
 //INFO: </code></pre><pre><code>val b = B()
diff --git a/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java b/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java
index ea3aea7edd6..cf31cfc0c75 100644
--- a/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java
+++ b/idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java
@@ -6,4 +6,4 @@ class KotlinClassUsedFromJava {
     }
 }
 
-//INFO: <pre><b>public</b> <b>final</b> <b>class</b> Test <i>defined in</i> testing</pre><p>Some comment</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> Test <i>defined in</i> testing <i>in file</i> KotlinClassUsedFromJava_Data.kt</pre><p>Some comment</p>
diff --git a/idea/testData/editor/quickDoc/MethodFromStdLib.kt b/idea/testData/editor/quickDoc/MethodFromStdLib.kt
index ff448d6df98..ef9c4f78109 100644
--- a/idea/testData/editor/quickDoc/MethodFromStdLib.kt
+++ b/idea/testData/editor/quickDoc/MethodFromStdLib.kt
@@ -2,4 +2,4 @@ fun test() {
     listOf(1, 2, 4).<caret>filter { it > 0 }
 }
 
-//INFO: <pre><b>public</b> inline <b>fun</b> &lt;T&gt; <a href="psi_element://kotlin.collections.Iterable">Iterable</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt;.filter(predicate: (<a href="psi_element://kotlin.collections.filter.T">T</a>) &rarr; Boolean): <a href="psi_element://kotlin.collections.List">List</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt; <i>defined in</i> kotlin.collections</pre><p>Returns a list containing only elements matching the given <a href="psi_element://predicate">predicate</a>.</p>
+//INFO: <pre><b>public</b> inline <b>fun</b> &lt;T&gt; <a href="psi_element://kotlin.collections.Iterable">Iterable</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt;.filter(predicate: (<a href="psi_element://kotlin.collections.filter.T">T</a>) &rarr; Boolean): <a href="psi_element://kotlin.collections.List">List</a>&lt;<a href="psi_element://kotlin.collections.filter.T">T</a>&gt; <i>defined in</i> kotlin.collections <i>in file</i> CollectionsKt.class</pre><p>Returns a list containing only elements matching the given <a href="psi_element://predicate">predicate</a>.</p>
diff --git a/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt b/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt
index 22390000ad0..a2dd4bad33f 100644
--- a/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt
+++ b/idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt
@@ -3,4 +3,4 @@
  */
 class <caret>Some
 
-//INFO: <pre><b>public</b> <b>final</b> <b>class</b> Some <i>defined in</i> root package</pre><p>Usefull comment</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>class</b> Some <i>defined in</i> root package <i>in file</i> OnClassDeclarationWithNoPackage.kt</pre><p>Usefull comment</p>
diff --git a/idea/testData/editor/quickDoc/OnEnumClassReference.kt b/idea/testData/editor/quickDoc/OnEnumClassReference.kt
index 25a6d9e334c..dfb14429e45 100644
--- a/idea/testData/editor/quickDoc/OnEnumClassReference.kt
+++ b/idea/testData/editor/quickDoc/OnEnumClassReference.kt
@@ -7,4 +7,4 @@ fun use() {
     Some<caret>Enum::class
 }
 
-//INFO: <pre><b>public</b> <b>final</b> <b>enum class</b> SomeEnum : <a href="psi_element://kotlin.Enum">Enum</a>&lt;<a href="psi_element://SomeEnum">SomeEnum</a>&gt; <i>defined in</i> root package</pre><p>Useless one</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>enum class</b> SomeEnum : <a href="psi_element://kotlin.Enum">Enum</a>&lt;<a href="psi_element://SomeEnum">SomeEnum</a>&gt; <i>defined in</i> root package <i>in file</i> OnEnumClassReference.kt</pre><p>Useless one</p>
diff --git a/idea/testData/editor/quickDoc/OnEnumDeclaration.kt b/idea/testData/editor/quickDoc/OnEnumDeclaration.kt
index 96e55e7ac5b..fa04d7a560a 100644
--- a/idea/testData/editor/quickDoc/OnEnumDeclaration.kt
+++ b/idea/testData/editor/quickDoc/OnEnumDeclaration.kt
@@ -3,4 +3,4 @@
  */
 enum class SomeEnum<caret>
 
-//INFO: <pre><b>public</b> <b>final</b> <b>enum class</b> SomeEnum : <a href="psi_element://kotlin.Enum">Enum</a>&lt;<a href="psi_element://SomeEnum">SomeEnum</a>&gt; <i>defined in</i> root package</pre><p>Useless one</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>enum class</b> SomeEnum : <a href="psi_element://kotlin.Enum">Enum</a>&lt;<a href="psi_element://SomeEnum">SomeEnum</a>&gt; <i>defined in</i> root package <i>in file</i> OnEnumDeclaration.kt</pre><p>Useless one</p>
diff --git a/idea/testData/editor/quickDoc/OnEnumUsage.kt b/idea/testData/editor/quickDoc/OnEnumUsage.kt
index 6ccfc81e43a..117618fc88f 100644
--- a/idea/testData/editor/quickDoc/OnEnumUsage.kt
+++ b/idea/testData/editor/quickDoc/OnEnumUsage.kt
@@ -9,4 +9,4 @@ fun use() {
     Some<caret>Enum.One
 }
 
-//INFO: <pre><b>public</b> <b>final</b> <b>enum class</b> SomeEnum : <a href="psi_element://kotlin.Enum">Enum</a>&lt;<a href="psi_element://SomeEnum">SomeEnum</a>&gt; <i>defined in</i> root package</pre><p>Enum of 1, 2</p>
+//INFO: <pre><b>public</b> <b>final</b> <b>enum class</b> SomeEnum : <a href="psi_element://kotlin.Enum">Enum</a>&lt;<a href="psi_element://SomeEnum">SomeEnum</a>&gt; <i>defined in</i> root package <i>in file</i> OnEnumUsage.kt</pre><p>Enum of 1, 2</p>
diff --git a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
index 7f0777db3ef..b5695d06cf8 100644
--- a/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
+++ b/idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt
@@ -12,5 +12,5 @@ package test
  */
 fun <caret>testFun(first: String, second: Int) = 12
 
-//INFO: <pre><b>public</b> <b>fun</b> testFun(first: String, second: Int): Int <i>defined in</i> test</pre><p>Test function</p>
+//INFO: <pre><b>public</b> <b>fun</b> testFun(first: String, second: Int): Int <i>defined in</i> test <i>in file</i> OnFunctionDeclarationWithPackage.kt</pre><p>Test function</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>first</code> - Some</dd><dd><code>second</code> - Other</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsage.kt b/idea/testData/editor/quickDoc/OnMethodUsage.kt
index 792a157f64e..d7dd575d3a8 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsage.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsage.kt
@@ -12,5 +12,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsage.kt</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt b/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt
index 9d720de94f1..38bac449780 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageMultiline.kt
@@ -10,4 +10,4 @@ fun test() {
     <caret>testMethod()
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><p>Some documentation on two lines.</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageMultiline.kt</pre><p>Some documentation on two lines.</p>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
index 9bcb9ead457..f2ed28dcccf 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithBracketsInParam.kt
@@ -12,5 +12,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithBracketsInParam.kt</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt
index 8087176e991..a1b336ec2e9 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithCodeBlock.kt
@@ -24,7 +24,7 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><p>Some documentation.</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithCodeBlock.kt</pre><p>Some documentation.</p>
 //INFO: <pre><code>
 //INFO: Code block
 //INFO:     Second line
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt
index 6e3d2bb6ead..654a5126fdc 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithMarkdown.kt
@@ -27,7 +27,7 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><p>Some documentation. <strong>Bold</strong> <em>underline</em> <code>code</code> foo: bar (baz) <a href="psi_element://quux">quux</a>  'apos'</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithMarkdown.kt</pre><p>Some documentation. <strong>Bold</strong> <em>underline</em> <code>code</code> foo: bar (baz) <a href="psi_element://quux">quux</a>  'apos'</p>
 //INFO: <p><a href="http://www.kotlinlang.org">Kotlin</a> <a href="http://www.ibm.com">a<strong>b</strong><strong>d</strong> kas</a></p>
 //INFO: <p><a href="psi_element://C">C</a></p>
 //INFO: <p><a href="psi_element://C">See <strong>this</strong> class</a></p>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
index fc6edf826d3..104f1be6ad4 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReceiver.kt
@@ -13,7 +13,7 @@ fun test() {
     1.<caret>testMethod("value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> Int.testMethod(b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> Int.testMethod(b: String): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithReceiver.kt</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Receiver:</b></dt><dd>Some int</dd></dl>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>b</code> - String</dd></dl>
 //INFO: <dl><dt><b>Returns:</b></dt><dd>Return <a href="psi_element://a">a</a> and nothing else</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
index d2689982a5b..ee1b9160c38 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndLink.kt
@@ -13,6 +13,6 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithReturnAndLink.kt</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
 //INFO: <dl><dt><b>Returns:</b></dt><dd>Return <a href="psi_element://a">a</a> and nothing else</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
index 12e921a24a3..e868dfa30c3 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithReturnAndThrows.kt
@@ -14,7 +14,7 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(a: Int, b: String): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithReturnAndThrows.kt</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
 //INFO: <dl><dt><b>Returns:</b></dt><dd>Return value</dd></dl>
 //INFO: <dl><dt><b>Throws:</b></dt><dd><code>IllegalArgumentException</code> - if the weather is bad</dd></dl>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
index 363c22bd572..65956d8f011 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithSee.kt
@@ -17,5 +17,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package</pre><br/>
+//INFO: <pre><b>public</b> <b>fun</b> testMethod(): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithSee.kt</pre><br/>
 //INFO: <DD><DL><DT><b>See Also:</b><DD><a href="psi_element://C"><code>C</code></a>, <a href="psi_element://D"><code>D</code></a>, <a href="http://kotl.in">kotlin</a></DD></DL></DD>
diff --git a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
index 07031f65495..eab08dbc61f 100644
--- a/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
+++ b/idea/testData/editor/quickDoc/OnMethodUsageWithTypeParameter.kt
@@ -13,5 +13,5 @@ fun test() {
     <caret>testMethod(1, "value")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> &lt;T&gt; testMethod(a: Int, b: String): Unit <i>defined in</i> root package</pre><p>Some documentation</p>
+//INFO: <pre><b>public</b> <b>fun</b> &lt;T&gt; testMethod(a: Int, b: String): Unit <i>defined in</i> root package <i>in file</i> OnMethodUsageWithTypeParameter.kt</pre><p>Some documentation</p>
 //INFO: <dl><dt><b>Parameters:</b></dt><dd><code>T</code> - the type parameter</dd><dd><code>a</code> - Some int</dd><dd><code>b</code> - String</dd></dl>
diff --git a/idea/testData/editor/quickDoc/Samples.kt b/idea/testData/editor/quickDoc/Samples.kt
index 6d9f3665425..d285fdc3487 100644
--- a/idea/testData/editor/quickDoc/Samples.kt
+++ b/idea/testData/editor/quickDoc/Samples.kt
@@ -19,7 +19,7 @@ fun <caret>castTextSpell(spell: String) {
     throw SecurityException("Magic prohibited outside Hogwarts")
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> castTextSpell(spell: String): Unit <i>defined in</i> magic</pre><br/>
+//INFO: <pre><b>public</b> <b>fun</b> castTextSpell(spell: String): Unit <i>defined in</i> magic <i>in file</i> Samples.kt</pre><br/>
 //INFO: <dl><dt><b>Samples:</b></dt><dd><a href="psi_element://Samples.sampleMagic"><code>Samples.sampleMagic</code></a><pre><code>
 //INFO: castTextSpell("[asd] [dse] [asz]")
 //INFO: </code></pre></dd><dd><a href="psi_element://sampleScroll"><code>sampleScroll</code></a><pre><code>
diff --git a/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java b/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
index 12a628445eb..7e8e13aa306 100644
--- a/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
+++ b/idea/testData/editor/quickDoc/TopLevelMethodFromJava.java
@@ -8,4 +8,4 @@ class Testing {
     }
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> foo(bar: Int): Unit <i>defined in</i> some</pre><p>KDoc foo</p>
+//INFO: <pre><b>public</b> <b>fun</b> foo(bar: Int): Unit <i>defined in</i> some <i>in file</i> TopLevelMethodFromJava_Data.kt</pre><p>KDoc foo</p>
diff --git a/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt b/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
index 81abe6e0328..37a73ee27b1 100644
--- a/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
+++ b/idea/testData/editor/quickDoc/TypeNamesFromStdLibNavigation.kt
@@ -8,4 +8,4 @@ fun main(args: Array<String>) {
     <caret>foo()
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> foo(x: <a href="psi_element://A">A</a>): Unit <i>defined in</i> root package</pre>
+//INFO: <pre><b>public</b> <b>fun</b> foo(x: <a href="psi_element://A">A</a>): Unit <i>defined in</i> root package <i>in file</i> TypeNamesFromStdLibNavigation.kt</pre>
diff --git a/idea/testData/intentions/addNameToArgument/ambiguousCall.kt b/idea/testData/intentions/addNameToArgument/ambiguousCall.kt
index 70d5f2aea80..2793389ec70 100644
--- a/idea/testData/intentions/addNameToArgument/ambiguousCall.kt
+++ b/idea/testData/intentions/addNameToArgument/ambiguousCall.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: String, b: Boolean, c: Char): Unit defined in root package<br>public fun foo(s: String, b: Boolean, p: Int): Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: String, b: Boolean, c: Char): Unit defined in root package in file ambiguousCall.kt<br>public fun foo(s: String, b: Boolean, p: Int): Unit defined in root package in file ambiguousCall.kt
 fun foo(s: String, b: Boolean, p: Int){}
 fun foo(s: String, b: Boolean, c: Char){}
 
diff --git a/idea/testData/intentions/addNamesToCallArguments/ambiguousCall.kt b/idea/testData/intentions/addNamesToCallArguments/ambiguousCall.kt
index 1e749605207..04b6ccd9f46 100644
--- a/idea/testData/intentions/addNamesToCallArguments/ambiguousCall.kt
+++ b/idea/testData/intentions/addNamesToCallArguments/ambiguousCall.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: String, b: Boolean, c: Char): Unit defined in root package<br>public fun foo(s: String, b: Boolean, p: Int): Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: String, b: Boolean, c: Char): Unit defined in root package in file ambiguousCall.kt<br>public fun foo(s: String, b: Boolean, p: Int): Unit defined in root package in file ambiguousCall.kt
 fun foo(s: String, b: Boolean, p: Int){}
 fun foo(s: String, b: Boolean, c: Char){}
 
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt
index 5f87eac269c..ff9c4452688 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt
@@ -1,5 +1,5 @@
 // IS_AVAILABLE: true
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package in file ambigousOverload.kt<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package in file ambigousOverload.kt
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
 
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after
index 6ef205cc61d..f4f9a4b0bef 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after
@@ -1,5 +1,5 @@
 // IS_AVAILABLE: true
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package in file ambigousOverload.kt<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package in file ambigousOverload.kt
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
 
diff --git a/idea/testData/kdoc/multiModuleSamples/fqName/code/usage.kt b/idea/testData/kdoc/multiModuleSamples/fqName/code/usage.kt
index 59d5ed9a854..60860abe260 100644
--- a/idea/testData/kdoc/multiModuleSamples/fqName/code/usage.kt
+++ b/idea/testData/kdoc/multiModuleSamples/fqName/code/usage.kt
@@ -9,7 +9,7 @@ fun some<caret>() {
 }
 
 
-//INFO: <pre><b>public</b> <b>fun</b> some(): Unit <i>defined in</i> root package</pre><br/>
+//INFO: <pre><b>public</b> <b>fun</b> some(): Unit <i>defined in</i> root package <i>in file</i> usage.kt</pre><br/>
 //INFO: <dl><dt><b>Samples:</b></dt><dd><a href="psi_element://samples.SampleGroup.mySample"><code>samples.SampleGroup.mySample</code></a><pre><code>
 //INFO: println("Hello, world")
 //INFO: </code></pre></dd><dd><a href="psi_element://samples.megasamples.MegaSamplesGroup.megaSample"><code>samples.megasamples.MegaSamplesGroup.megaSample</code></a><pre><code>
diff --git a/idea/testData/kdoc/multiModuleSamples/simple/code/usage.kt b/idea/testData/kdoc/multiModuleSamples/simple/code/usage.kt
index 9f1d27c0caf..5d40b27fe2d 100644
--- a/idea/testData/kdoc/multiModuleSamples/simple/code/usage.kt
+++ b/idea/testData/kdoc/multiModuleSamples/simple/code/usage.kt
@@ -5,7 +5,7 @@ fun some<caret>() {
 
 }
 
-//INFO: <pre><b>public</b> <b>fun</b> some(): Unit <i>defined in</i> root package</pre><br/>
+//INFO: <pre><b>public</b> <b>fun</b> some(): Unit <i>defined in</i> root package <i>in file</i> usage.kt</pre><br/>
 //INFO: <dl><dt><b>Samples:</b></dt><dd><a href="psi_element://samples.sample"><code>samples.sample</code></a><pre><code>
 //INFO: println("Hello, world")
 //INFO: </code></pre></dd></dl>
diff --git a/idea/testData/quickfix/autoImports/minusOperator.after.kt b/idea/testData/quickfix/autoImports/minusOperator.after.kt
index da0e69bbc1a..7a95ae2fc57 100644
--- a/idea/testData/quickfix/autoImports/minusOperator.after.kt
+++ b/idea/testData/quickfix/autoImports/minusOperator.after.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h<br>public fun String.minus(str: String): String defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h in file minusOperator.before.Main.kt<br>public fun String.minus(str: String): String defined in h in file minusOperator.before.Main.kt
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt b/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
index 1fa15aff3ca..8dfd35db7f1 100644
--- a/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/minusOperator.before.Main.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h<br>public fun String.minus(str: String): String defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h in file minusOperator.before.Main.kt<br>public fun String.minus(str: String): String defined in h in file minusOperator.before.Main.kt
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt b/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
index 0fd5dee3e71..5b6e6d689a7 100644
--- a/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
+++ b/idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h in file unaryPlusOperator.before.Main.kt
 
 package h
 
diff --git a/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt b/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
index c292bf352fe..acbea171827 100644
--- a/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
+++ b/idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt
@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h in file unaryPlusOperator.before.Main.kt
 
 package h
 
diff --git a/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt b/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
index 274c7f96087..fa3f70ac901 100644
--- a/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterWithImport.after.kt
@@ -1,5 +1,5 @@
 // "Add parameter to function 'foo'" "true"
-// ERROR: Too many arguments for public fun foo(): Unit defined in b
+// ERROR: Too many arguments for public fun foo(): Unit defined in b in file addParameterWithImport.before.Dependency.kt
 package a
 
 import b.foo
diff --git a/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt b/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
index 2bf4b229d1e..9e058c15742 100644
--- a/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
+++ b/idea/testData/quickfix/changeSignature/addParameterWithImport.before.Main.kt
@@ -1,5 +1,5 @@
 // "Add parameter to function 'foo'" "true"
-// ERROR: Too many arguments for public fun foo(): Unit defined in b
+// ERROR: Too many arguments for public fun foo(): Unit defined in b in file addParameterWithImport.before.Dependency.kt
 package a
 
 import b.foo
diff --git a/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/missingArguments.kt b/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/missingArguments.kt
index 52a281f88b4..d830dc5d8a9 100644
--- a/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/missingArguments.kt
+++ b/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/missingArguments.kt
@@ -1,4 +1,4 @@
 // "Create type parameter in class 'X'" "false"
-// ERROR: 2 type arguments expected for class X<T, U> defined in root package
+// ERROR: 2 type arguments expected for class X<T, U> defined in root package in file missingArguments.kt
 class X<T, U>
 fun Y(x: X<<caret>String>) {}
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/notOnTypeArgumentList.kt b/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/notOnTypeArgumentList.kt
index 8347e0f0d3f..0e50ce084d2 100644
--- a/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/notOnTypeArgumentList.kt
+++ b/idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/notOnTypeArgumentList.kt
@@ -1,5 +1,5 @@
 // "Create type parameter in class 'X'" "false"
-// ERROR: No type arguments expected for class X defined in root package
+// ERROR: No type arguments expected for class X defined in root package in file notOnTypeArgumentList.kt
 
 class X
 
diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt b/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
index 3786681cb41..1277b293c45 100644
--- a/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
+++ b/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt
@@ -1,5 +1,5 @@
 // "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false"
-// ERROR: Too many arguments for @Deprecated public fun oldFun(): Unit defined in root package
+// ERROR: Too many arguments for @Deprecated public fun oldFun(): Unit defined in root package in file callWithError.kt
 
 @Deprecated("", ReplaceWith("newFun()"))
 fun oldFun() {
diff --git a/idea/testData/quickfix/modifiers/kt10409.kt b/idea/testData/quickfix/modifiers/kt10409.kt
index c13ba529054..92f115034ee 100644
--- a/idea/testData/quickfix/modifiers/kt10409.kt
+++ b/idea/testData/quickfix/modifiers/kt10409.kt
@@ -1,6 +1,6 @@
 // "Make 'IterablePipeline' abstract" "true"
 // ERROR: 'pipe' overrides nothing
-// ERROR: One type argument expected for interface Pipeline<TPipeline> defined in root package
+// ERROR: One type argument expected for interface Pipeline<TPipeline> defined in root package in file kt10409.kt
 
 // Actually this test is about getting rid of assertion happenning while creating quick fixes
 // See KT-10409
diff --git a/idea/testData/quickfix/modifiers/kt10409.kt.after b/idea/testData/quickfix/modifiers/kt10409.kt.after
index 7736c4f24b7..7b166d79eda 100644
--- a/idea/testData/quickfix/modifiers/kt10409.kt.after
+++ b/idea/testData/quickfix/modifiers/kt10409.kt.after
@@ -1,6 +1,6 @@
 // "Make 'IterablePipeline' abstract" "true"
 // ERROR: 'pipe' overrides nothing
-// ERROR: One type argument expected for interface Pipeline<TPipeline> defined in root package
+// ERROR: One type argument expected for interface Pipeline<TPipeline> defined in root package in file kt10409.kt
 
 // Actually this test is about getting rid of assertion happenning while creating quick fixes
 // See KT-10409
diff --git a/idea/testData/refactoring/changeSignature/TopLevelFunctionsConflictMessages.txt b/idea/testData/refactoring/changeSignature/TopLevelFunctionsConflictMessages.txt
index 5cd51a7f52c..9d10240809a 100644
--- a/idea/testData/refactoring/changeSignature/TopLevelFunctionsConflictMessages.txt
+++ b/idea/testData/refactoring/changeSignature/TopLevelFunctionsConflictMessages.txt
@@ -1 +1 @@
-Function already exists: 'public fun fun2(): Unit defined in root package'
\ No newline at end of file
+Function already exists: 'public fun fun2(): Unit defined in root package in file TopLevelFunctionsConflictBefore.kt'
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
index 1232eda632d..87d4bee23da 100644
--- a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
+++ b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Array<T>, kotlin.Any, kotlin.Cloneable, java.io.Serializable
-// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package in file extensionFunForArray.kt
 // SIBLING:
 fun <T> Array<T>.test() {
     <selection>this.isEmpty()</selection>
diff --git a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
index bec7278d3a8..bbf8a48826f 100644
--- a/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/extensionFunForArray.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Array<T>, kotlin.Any, kotlin.Cloneable, java.io.Serializable
-// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun <T> kotlin.Array<T>.test(): kotlin.Unit defined in root package in file extensionFunForArray.kt
 // SIBLING:
 fun <T> Array<T>.test() {
     __dummyTestFun__()
diff --git a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt
index 7a8e30c1954..bd4e98d096e 100644
--- a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt
@@ -1,6 +1,6 @@
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package
+// PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package in file topLevelValUnderSmartCast.kt
 val meters: Int? = 1
 
 fun test() {
diff --git a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after
index 5f017440127..55a4d83c3e0 100644
--- a/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/topLevelValUnderSmartCast.kt.after
@@ -1,6 +1,6 @@
 // SUGGESTED_NAMES: i, getKm
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package
+// PARAM_DESCRIPTOR: public val meters: kotlin.Int? defined in root package in file topLevelValUnderSmartCast.kt
 val meters: Int? = 1
 
 fun test() {
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt
index 02461dfbf99..a337ee41730 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package in file receiverCandidateTypes.kt
 // PARAM_TYPES: Bar, Foo, kotlin.Any
 // WITH_RUNTIME
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after
index b10aa01ba33..ca7327e91cc 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/receiverCandidateTypes.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun Bar.foo(): kotlin.Unit defined in root package in file receiverCandidateTypes.kt
 // PARAM_TYPES: Bar, Foo, kotlin.Any
 // WITH_RUNTIME
 
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt
index 7bb637af780..e05a7031b78 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file explicitLabeledThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
index cae3248e76a..e28bec45175 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file explicitLabeledThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
index 4609c205beb..964e0f7cbeb 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package in file explicitThisInExtension.kt
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
index d6124264ec6..7ce5ba8dfea 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package in file explicitThisInExtension.kt
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt
index 68d01ef1288..403e85a8c88 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file explicitThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
index 8e9466a4861..347b4092af1 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file explicitThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt
index 7dde79cffef..f5ac06c7f9c 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package in file explicitThisWithSmartCast.kt
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after
index 2be0fa66c91..222d607cf87 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisWithSmartCast.kt.after
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package in file explicitThisWithSmartCast.kt
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt
index 9545b785bb7..63b0478d4c5 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file implicitAndExplicitLabeledThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
index cae3248e76a..cac13661352 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file implicitAndExplicitLabeledThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
index 4f1aa6e4584..0af3d0e5751 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package in file implicitAndExplicitThisInExtension.kt
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
index 421e298ee65..b89e791a715 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package in file implicitAndExplicitThisInExtension.kt
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
index 672c7c07f1d..744a170742d 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package in file implicitThisInExtension.kt
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
index 6bbc3be5db3..8fc6f0e929f 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: Z
-// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package
+// PARAM_DESCRIPTOR: public fun Z.foo(): kotlin.Int defined in root package in file implicitThisInExtension.kt
 class Z(val a: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt
index 02a9913fee6..44f3fd11f03 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file implicitThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
index b3abbc638c0..ad4f4f725b5 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: A.B
-// PARAM_DESCRIPTOR: public final class A : Z defined in root package
+// PARAM_DESCRIPTOR: public final class A : Z defined in root package in file implicitThisInMember.kt
 // PARAM_DESCRIPTOR: public final inner class B : Z defined in A
 public open class Z {
     val z: Int = 0
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt
index be65f3a09ee..96679117272 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package in file implicitThisWithSmartCast.kt
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after
index 34238bd277d..ca336cad9c4 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisWithSmartCast.kt.after
@@ -1,5 +1,5 @@
 // SUGGESTED_NAMES: i, getB
-// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun A.ext(): kotlin.Unit defined in root package in file implicitThisWithSmartCast.kt
 // PARAM_TYPES: B
 fun main(args: Array<String>) {
     val a: A = B()
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt
index 2d15e00e4a2..9ad25a15f0f 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final class A defined in root package in file propertyWithExplicitInvoke.kt
 // PARAM_TYPES: A
 // SIBLING:
 class A {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt.after
index 4d893f94b57..ae4d1f5e3e4 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithExplicitInvoke.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final class A defined in root package in file propertyWithExplicitInvoke.kt
 // PARAM_TYPES: A
 // SIBLING:
 class A {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt
index 5b4382cdf16..bf2c1c8b3bf 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final class A defined in root package in file propertyWithImplicitInvoke.kt
 // PARAM_TYPES: A
 // SIBLING:
 class A {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt.after
index 67d690fff9d..8408fadcc52 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/propertyWithImplicitInvoke.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final class A defined in root package in file propertyWithImplicitInvoke.kt
 // PARAM_TYPES: A
 // SIBLING:
 class A {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
index ff659031042..e781f9839e0 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
-// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package in file qualifiedThis.kt
 fun String.foo(f: () -> Unit) {
     f()
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
index e66010ea5a6..84f66737a10 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThis.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
-// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package
+// PARAM_DESCRIPTOR: public fun kotlin.String.test(): kotlin.Unit defined in root package in file qualifiedThis.kt
 fun String.foo(f: () -> Unit) {
     f()
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
index 40dcb151bdc..222499e60b6 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: B
-// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final class A defined in root package in file qualifiedThisAsArgument.kt
 // PARAM_DESCRIPTOR: public final fun B.foo(): kotlin.Int defined in A
 // SIBLING:
 class A {
diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
index 8440c382cff..9338c3e6f35 100644
--- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A
 // PARAM_TYPES: B
-// PARAM_DESCRIPTOR: public final class A defined in root package
+// PARAM_DESCRIPTOR: public final class A defined in root package in file qualifiedThisAsArgument.kt
 // PARAM_DESCRIPTOR: public final fun B.foo(): kotlin.Int defined in A
 // SIBLING:
 class A {
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt
index 23aa02e86b7..de1a8691740 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: X
 // PARAM_TYPES: Y
 // PARAM_DESCRIPTOR: public final fun X.test(): kotlin.Unit defined in Y
-// PARAM_DESCRIPTOR: public final class Y defined in root package
+// PARAM_DESCRIPTOR: public final class Y defined in root package in file addPrefixToBackticks.kt
 class X(val x: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after
index 3e800ce1ab8..a27730a06b4 100644
--- a/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/misc/addPrefixToBackticks.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: X
 // PARAM_TYPES: Y
 // PARAM_DESCRIPTOR: public final fun X.test(): kotlin.Unit defined in Y
-// PARAM_DESCRIPTOR: public final class Y defined in root package
+// PARAM_DESCRIPTOR: public final class Y defined in root package in file addPrefixToBackticks.kt
 class X(val x: Int)
 
 // SIBLING:
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt
index 769a481b879..94a93bc3f4e 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // PARAM_TYPES: Foo<T>
 // PARAM_TYPES: kotlin.String
-// PARAM_DESCRIPTOR: internal final class Foo<T> defined in root package
+// PARAM_DESCRIPTOR: internal final class Foo<T> defined in root package in file typeParameterNotResolvableInTargetScope.kt
 // PARAM_DESCRIPTOR: value-parameter l: kotlin.String defined in Foo.test
 
 import java.util.*
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
index 4b9cc30a9bd..17a3d76eced 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterNotResolvableInTargetScope.kt.after
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // PARAM_TYPES: Foo<T>
 // PARAM_TYPES: kotlin.String
-// PARAM_DESCRIPTOR: internal final class Foo<T> defined in root package
+// PARAM_DESCRIPTOR: internal final class Foo<T> defined in root package in file typeParameterNotResolvableInTargetScope.kt
 // PARAM_DESCRIPTOR: value-parameter l: kotlin.String defined in Foo.test
 
 import java.util.*
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
index 0ee39ddb52a..1af3786e089 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A<T>.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package in file typeParametersAndConstraintsCombined1.kt
 // PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo
 open class Data(val x: Int)
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
index fd698087bf8..8a514fdf410 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A<T>.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package in file typeParametersAndConstraintsCombined1.kt
 // PARAM_DESCRIPTOR: public final inner class B<U : Data> where U : DataExEx defined in A
 // PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo
 open class Data(val x: Int)
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
index c1e05e70142..ffd7b2a8823 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A<T>.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package in file typeParametersCombined1.kt
 // PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
 // PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo
 open class Data(val x: Int)
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
index 7a45457212a..44ac19f3bd5 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: A<T>.B<U>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> defined in root package in file typeParametersCombined1.kt
 // PARAM_DESCRIPTOR: public final inner class B<U : Data> defined in A
 // PARAM_DESCRIPTOR: value-parameter v: V defined in A.B.foo
 open class Data(val x: Int)
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
index 3c90089d3a4..2138b4f1128 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package in file typeParametersCombinedAndThis.kt
 // PARAM_DESCRIPTOR: value-parameter v: V defined in A.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
index 2e5d6274a84..fa130cd8ef4 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
@@ -1,6 +1,6 @@
 // PARAM_TYPES: A<T>
 // PARAM_TYPES: V, Data
-// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package
+// PARAM_DESCRIPTOR: public final class A<T : Data> where T : DataEx defined in root package in file typeParametersCombinedAndThis.kt
 // PARAM_DESCRIPTOR: value-parameter v: V defined in A.foo
 open class Data(val x: Int)
 interface DataEx
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
index 47083313579..75079fd9213 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
@@ -13,7 +13,7 @@ Exit code: ABORT
 COMPILATION FAILED
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
     fun function(list: List<Any>): Unit defined in test
-    fun function(list: List<String>): Unit defined in test
+    fun function(list: List<String>): Unit defined in test in file fun2.kt
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
     fun function(list: List<Any>): Unit defined in test
-    fun function(list: List<String>): Unit defined in test
\ No newline at end of file
+    fun function(list: List<String>): Unit defined in test in file fun2.kt
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
index f79a79a7337..f22853c57fb 100644
--- a/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log
@@ -10,4 +10,4 @@ End of files
 Exit code: ABORT
 ------------------------------------------
 COMPILATION FAILED
-Conflicting overloads: public fun function(): Unit defined in test, public fun function(): Unit defined in test
\ No newline at end of file
+Conflicting overloads: public fun function(): Unit defined in test in file fun2.kt, public fun function(): Unit defined in test
\ No newline at end of file