Update testData after changes in diagnostics

2017-05-26 10:26:30 +03:00
parent 2c83718452
commit c83b764c73
89 changed files with 91 additions and 91 deletions
@@ -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() {}
    }
@@ -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
    }

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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()
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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){}

@@ -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){}

@@ -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

@@ -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

@@ -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>
@@ -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>
@@ -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

@@ -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

@@ -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

@@ -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

@@ -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
@@ -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
@@ -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>) {}
@@ -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

@@ -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() {
@@ -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
@@ -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
@@ -1 +1 @@
-Function already exists: 'public fun fun2(): Unit defined in root package'
+Function already exists: 'public fun fun2(): Unit defined in root package in file TopLevelFunctionsConflictBefore.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>
@@ -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__()
@@ -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() {
@@ -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() {
@@ -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

@@ -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

@@ -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
@@ -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
@@ -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:
@@ -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:
@@ -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
@@ -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
@@ -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()
@@ -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()
@@ -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
@@ -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
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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
@@ -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
@@ -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()
@@ -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()
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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()
 }
@@ -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()
 }
@@ -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 {
@@ -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 {
@@ -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:
@@ -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:
@@ -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.*
@@ -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.*
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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
@@ -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
@@ -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
+    fun function(list: List<String>): Unit defined in test in file fun2.kt
@@ -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
+Conflicting overloads: public fun function(): Unit defined in test in file fun2.kt, public fun function(): Unit defined in test