[Test] Migrate FIR diagnostic spec tests to new infrastructure

This commit includes a lot of minor changes in testdata: new infrastructure
  requires that each test file in one testdata file in one module must
  have unique name, but a lot of existing spec tests didn't satisfy
  this requirement

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/AdditionalFilesDirectives.kt

@@ -37,4 +37,11 @@ object AdditionalFilesDirectives : SimpleDirectivesContainer() {
             See file ./compiler/testData/diagnostics/helpers/coroutines/TailCallOptimizationChecker.kt
         """.trimIndent()
     )
+
+    val SPEC_HELPERS by directive(
+        description = """
+            Adds util functions from `test-spec` modules
+            See directory ./compiler/tests-spec/helpers/
+        """.trimIndent()
+    )
 }

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractFirDiagnosticTestSpec.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.runners
+
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.directives.AdditionalFilesDirectives.SPEC_HELPERS
+import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_STDLIB
+import org.jetbrains.kotlin.test.frontend.fir.FirFailingTestSuppressor
+import org.jetbrains.kotlin.test.frontend.fir.handlers.FirIdenticalChecker
+import org.jetbrains.kotlin.test.services.fir.FirOldFrontendMetaConfigurator
+import org.jetbrains.kotlin.test.services.sourceProviders.SpecHelpersSourceFilesProvider
+
+abstract class AbstractFirDiagnosticTestSpec : AbstractFirDiagnosticTest() {
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        with(builder) {
+            defaultDirectives {
+                +SPEC_HELPERS
+                +WITH_STDLIB
+            }
+
+            useAdditionalSourceProviders(::SpecHelpersSourceFilesProvider)
+
+            useAfterAnalysisCheckers(
+                ::FirIdenticalChecker,
+                ::FirFailingTestSuppressor,
+            )
+
+            useMetaTestConfigurators(::FirOldFrontendMetaConfigurator)
+        }
+    }
+}

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/sourceProviders/SpecHelpersSourceFilesProvider.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.services.sourceProviders
+
+import org.jetbrains.kotlin.test.directives.AdditionalFilesDirectives
+import org.jetbrains.kotlin.test.directives.AdditionalFilesDirectives.SPEC_HELPERS
+import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
+import org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
+import org.jetbrains.kotlin.test.model.TestFile
+import org.jetbrains.kotlin.test.model.TestModule
+import org.jetbrains.kotlin.test.services.AdditionalSourceProvider
+import org.jetbrains.kotlin.test.services.TestServices
+import java.io.File
+
+class SpecHelpersSourceFilesProvider(testServices: TestServices) : AdditionalSourceProvider(testServices) {
+    companion object {
+        const val HELPERS_DIR_PATH = "compiler/tests-spec/testData/diagnostics/helpers"
+    }
+
+    override val directives: List<DirectivesContainer> =
+        listOf(AdditionalFilesDirectives)
+
+    override fun produceAdditionalFiles(globalDirectives: RegisteredDirectives, module: TestModule): List<TestFile> {
+        if (SPEC_HELPERS !in module.directives) return emptyList()
+        return File(HELPERS_DIR_PATH).walkTopDown().mapNotNull {
+            if (it.isDirectory) return@mapNotNull null
+            it.toTestFile()
+        }.toList()
+    }
+}

compiler/tests-spec/build.gradle.kts

@@ -5,6 +5,11 @@ plugins {
 
 dependencies {
     testCompile(projectTests(":compiler"))
+    testImplementation(projectTests(":compiler:test-infrastructure"))
+    testImplementation(projectTests(":compiler:tests-common-new"))
+    testRuntimeOnly(platform("org.junit:junit-bom:5.7.0"))
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter")
+
     testCompileOnly(intellijDep()) {
         includeJars("groovy", "groovy-xml", rootProject = rootProject)
     }

compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.fir.kt

@@ -59,7 +59,7 @@ val value_19 = <!ILLEGAL_UNDERSCORE!>9_______9______9_____9____9___9__9_9.0E__<!
 val value_20 = <!ILLEGAL_UNDERSCORE!>0_0_0_0_0_0_0_0_0_0.12345678e+__90F<!>
 
 // TESTCASE NUMBER: 21
-val value_21 = <!ILLEGAL_UNDERSCORE!>1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9e_<!><!AMBIGUITY!>-<!><!UNRESOLVED_REFERENCE!>_0<!>
+val value_21 = <!ILLEGAL_UNDERSCORE!>1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9e_<!>-<!UNRESOLVED_REFERENCE!>_0<!>
 
 // TESTCASE NUMBER: 22
 val value_22 = <!ILLEGAL_UNDERSCORE!>.345______________6e_____7_______8f<!>

compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.fir.kt

@@ -38,7 +38,7 @@ val value_12 = <!ILLEGAL_UNDERSCORE!>33__3.0_e_10__0<!>
 val value_13 = <!ILLEGAL_UNDERSCORE!>.0_E_0______00F<!>
 
 // TESTCASE NUMBER: 14
-val value_14 = <!ILLEGAL_UNDERSCORE!>5_________555_________5.0____e____<!><!AMBIGUITY!>-<!><!UNRESOLVED_REFERENCE!>____9<!>
+val value_14 = <!ILLEGAL_UNDERSCORE!>5_________555_________5.0____e____<!>-<!UNRESOLVED_REFERENCE!>____9<!>
 
 // TESTCASE NUMBER: 15
 val value_15 = <!ILLEGAL_UNDERSCORE!>666_666.0__________________________________________________1_E+_2___________________________________________________________________0F<!>
@@ -50,7 +50,7 @@ val value_16 = <!ILLEGAL_UNDERSCORE!>9_______9______9_____9____9___9__9_9.0___E_
 val value_17 = <!ILLEGAL_UNDERSCORE!>0_0_0_0_0_0_0_0_0_0.12345678___e+__90F<!>
 
 // TESTCASE NUMBER: 18
-val value_18 = <!ILLEGAL_UNDERSCORE!>1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e_<!><!AMBIGUITY!>-<!><!UNRESOLVED_REFERENCE!>_0<!>
+val value_18 = <!ILLEGAL_UNDERSCORE!>1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e_<!>-<!UNRESOLVED_REFERENCE!>_0<!>
 
 // TESTCASE NUMBER: 19
 val value_19 = <!ILLEGAL_UNDERSCORE!>.45_6_E_7f<!>

compiler/tests-spec/testData/diagnostics/linked/expressions/type-checking-and-containment-checking-expressions/containment-checking-expression/p-5/pos/2.1.kt

@@ -14,7 +14,7 @@
  */
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 import checkType
@@ -41,7 +41,7 @@ fun case1() {
     a checkType { check<Boolean>() }
 }
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import checkType
@@ -67,7 +67,7 @@ fun case2() {
     a checkType { check<Boolean>() }
 }
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testPackCase3
 import checkType
@@ -94,7 +94,7 @@ fun case3() {
     a checkType { check<Boolean>() }
 }
 
-// FILE: TestCase.kt
+// FILE: TestCase4.kt
 // TESTCASE NUMBER: 4
 package testPackCase4
 import checkType
@@ -118,4 +118,4 @@ fun case4(nothing: Nothing) {
     val b = A(mutableSetOf(1, C(), 3, false, 2, "azaza"))
     val a = (nothing in b)
     a checkType { check<Boolean>() }
-}
+}

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.10.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver:  Top-level non-extension functions: Callables star-imported into the current file;
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -23,12 +23,12 @@ import libPackageCase1.*
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1.listOf; typeCall: function")!>listOf(elements = arrayOf(1))<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 fun <T> listOf(vararg elements: T): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -42,7 +42,7 @@ class A {
     operator fun <T> invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -50,7 +50,7 @@ fun <T> listOf(vararg elements: T): List<T> = TODO()
 val listOf: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -64,11 +64,11 @@ class A {
     operator fun <T> invoke(vararg elements: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 import testsCase3.*
 
 private fun <T> listOf(vararg elements: T): List<T> = TODO()
 
 val listOf: A
-    get() = A()
+    get() = A()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.11.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver:  Top-level non-extension functions: Implicitly imported callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.* //nothing to import
@@ -22,12 +22,12 @@ import libPackageCase1.* //nothing to import
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: kotlin.collections.listOf; typeCall: function")!>listOf(elements = *arrayOf(1))<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 private fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testscase2
 
@@ -44,7 +44,7 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackagecase2
 import testscase2.*
 private fun <T> listOf(vararg elements1: T): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.12.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver:  The overload candidate sets for each pair of implicit receivers: Local extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -29,14 +29,14 @@ class Case1(){
         <!DEBUG_INFO_CALL("fqName: testsCase1.Case1.listOf; typeCall: function")!>listOf(elements1= arrayOf(1))<!>
     }
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -44,7 +44,7 @@ fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
@@ -53,7 +53,7 @@ public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -74,7 +74,7 @@ class Case2(){
 class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -83,7 +83,7 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -93,7 +93,7 @@ fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 val Case2.listOf: A
     get() = A()
@@ -105,7 +105,7 @@ public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -126,7 +126,7 @@ class Case3(){
 class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3
@@ -137,7 +137,7 @@ val Case3.listOf: A
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -149,7 +149,7 @@ fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.13.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver: The overload candidate sets for each pair of implicit receivers: Local extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -35,14 +35,14 @@ class Case1(){
 
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -50,14 +50,14 @@ fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 
 /*
  * TESTCASE NUMBER: 2
@@ -94,7 +94,7 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 // TESTCASE NUMBER: 2
 package libPackageCase2
 import testsCase2.*
@@ -103,7 +103,7 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 // TESTCASE NUMBER: 2
 
 package libPackageCase2Explicit
@@ -113,7 +113,7 @@ fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -122,7 +122,7 @@ fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 
 /*
  * TESTCASE NUMBER: 3
@@ -159,7 +159,7 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 package libPackageCase3
 import testsCase3.*
@@ -168,7 +168,7 @@ val Case3.listOf: A
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -178,7 +178,7 @@ fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.14.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver: The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 
 package testsCase1
@@ -28,14 +28,14 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -43,14 +43,14 @@ fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -68,14 +68,14 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -86,7 +86,7 @@ fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
@@ -94,7 +94,7 @@ public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3
@@ -112,14 +112,14 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -130,7 +130,7 @@ private fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.15.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver: The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -27,19 +27,19 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
@@ -47,7 +47,7 @@ public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -63,7 +63,7 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -73,12 +73,12 @@ val Case2.listOf: A
 fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
@@ -86,7 +86,7 @@ public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 val Case2.listOf: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -102,19 +102,19 @@ class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 val Case3.listOf: A

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.16.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver: The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -27,25 +27,25 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -62,7 +62,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -72,18 +72,18 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -100,7 +100,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
@@ -110,12 +110,12 @@ val Case3.listOf: A
 fun <T> listOf(vararg elements1: T): List<T> = TODO()
 private fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.3.kt

@@ -13,12 +13,12 @@
  * DESCRIPTION: Implicit receiver: sets of explicitly imported, declared in the package scope and star-imported extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackageExplicit
 
 public fun String.padEnd(lengthParam: Int, padChar: Char = ' '): String = TODO()
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 package libPackage
 
 public fun String.padEnd(lengthParam: Int, padChar: Char = ' '): String = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.8.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver:  Top-level non-extension functions: Callables explicitly imported into the current file
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -24,23 +24,23 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1Explicit.listOf; typeCall: function")!>listOf(elements1= arrayOf(1))<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -52,12 +52,12 @@ fun case2() {
 class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -66,14 +66,14 @@ val listOf: A
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -85,12 +85,12 @@ fun case3() {
 class A {
     operator fun <T>invoke(vararg elements1: T): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -99,7 +99,7 @@ val listOf: A
 
 private fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-1/pos/2.9.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: Explicit receiver:  Top-level non-extension functions: Callables declared in the same package
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -23,17 +23,17 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: testsCase1.listOf; typeCall: function")!>listOf(elements1= arrayOf(1))<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -42,12 +42,12 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: testsCase2.listOf; typeCall: function")!>listOf(elements1= arrayOf(1))<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 import testsCase2.*
 
@@ -61,7 +61,7 @@ class A {
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -70,12 +70,12 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: testsCase3.A.invoke; typeCall: variable&invoke")!>listOf(elements1= arrayOf(1))<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 import testsCase3.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-named-parameters/p-5/pos/1.1.fir.kt

@@ -4,7 +4,7 @@
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -17,25 +17,25 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -52,7 +52,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -62,18 +62,18 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -90,7 +90,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
@@ -100,12 +100,12 @@ val Case3.listOf: A
 fun <T> listOf(vararg elements1: T): List<T> = TODO()
 private fun <T> Case3.listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.10.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -12,12 +12,12 @@ import libPackageCase1.*
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1.listOf; typeCall: function")!>listOf(elements = arrayOf(1), body = { "" })<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 fun <T> listOf(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -31,7 +31,7 @@ class A {
     operator fun <T> invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -39,7 +39,7 @@ fun <T> listOf(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T>
 val listOf: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -53,7 +53,7 @@ class A {
     operator fun <T> invoke(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 import testsCase3.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.10.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Callables star-imported into the current file;
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -22,12 +22,12 @@ import libPackageCase1.*
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1.listOf; typeCall: function")!>listOf(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>elements = arrayOf(1)<!>, body = { "" })<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 fun <T> listOf(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -41,7 +41,7 @@ class A {
     operator fun <T> invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -49,7 +49,7 @@ fun <T> listOf(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T>
 val listOf: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -63,11 +63,11 @@ class A {
     operator fun <T> invoke(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 import testsCase3.*
 
 private fun <T> listOf(vararg elements: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 val listOf: A
-    get() = A()
+    get() = A()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.11.kt

@@ -14,7 +14,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Implicitly imported callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -23,12 +23,12 @@ import libPackageCase1.* //nothing to import
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: kotlin.run; typeCall: inline function")!>run(block = { "ss" })<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 private fun <R> run(vararg elements: R = TODO(), block: () -> R): R = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testscase2
 
@@ -45,7 +45,7 @@ class A {
     fun <R> run(vararg elements: R = TODO(), block: () -> R): R = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackagecase2
 import testscase2.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.12.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -19,14 +19,14 @@ class Case1() {
         <!DEBUG_INFO_CALL("fqName: testsCase1.Case1.listOf; typeCall: function")!>listOf(elements1 = arrayOf(1), body = { "" })<!>
     }
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -34,14 +34,14 @@ fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -63,7 +63,7 @@ class Case2() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -73,7 +73,7 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -84,7 +84,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 val Case2.listOf: A
     get() = A()
@@ -94,7 +94,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -117,7 +117,7 @@ class Case3() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3
@@ -129,7 +129,7 @@ val Case3.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -142,7 +142,7 @@ fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.12.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver:  The overload candidate sets for each pair of implicit receivers: Local extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -29,14 +29,14 @@ class Case1() {
         <!DEBUG_INFO_CALL("fqName: testsCase1.Case1.listOf; typeCall: function")!>listOf(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>elements1 = arrayOf(1)<!>, body = { "" })<!>
     }
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -44,14 +44,14 @@ fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -73,7 +73,7 @@ class Case2() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -83,7 +83,7 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -94,7 +94,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 val Case2.listOf: A
     get() = A()
@@ -104,7 +104,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -127,7 +127,7 @@ class Case3() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3
@@ -139,7 +139,7 @@ val Case3.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -152,7 +152,7 @@ fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.13.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -25,14 +25,14 @@ class Case1() {
 
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -40,14 +40,14 @@ fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 
 /*
  * TESTCASE NUMBER: 2
@@ -86,7 +86,7 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 // TESTCASE NUMBER: 2
 package libPackageCase2
 import testsCase2.*
@@ -97,7 +97,7 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 // TESTCASE NUMBER: 2
 
 package libPackageCase2Explicit
@@ -107,7 +107,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -116,7 +116,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 
 /*
  * TESTCASE NUMBER: 3
@@ -154,7 +154,7 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 package libPackageCase3
 import testsCase3.*
@@ -165,7 +165,7 @@ val Case3.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -175,7 +175,7 @@ fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.13.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: Local extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -35,14 +35,14 @@ class Case1() {
 
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -50,14 +50,14 @@ fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 
 /*
  * TESTCASE NUMBER: 2
@@ -96,7 +96,7 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 // TESTCASE NUMBER: 2
 package libPackageCase2
 import testsCase2.*
@@ -107,7 +107,7 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 // TESTCASE NUMBER: 2
 
 package libPackageCase2Explicit
@@ -117,7 +117,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -126,7 +126,7 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 
 /*
  * TESTCASE NUMBER: 3
@@ -164,7 +164,7 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 package libPackageCase3
 import testsCase3.*
@@ -175,7 +175,7 @@ val Case3.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -185,7 +185,7 @@ fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.14.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 
 package testsCase1
@@ -18,14 +18,14 @@ class Case1() {
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -33,14 +33,14 @@ fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -58,14 +58,14 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -76,14 +76,14 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3
@@ -101,14 +101,14 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -119,7 +119,7 @@ private fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TOD
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.14.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 
 package testsCase1
@@ -28,14 +28,14 @@ class Case1() {
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -43,14 +43,14 @@ fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -68,14 +68,14 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -86,14 +86,14 @@ fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3
@@ -111,14 +111,14 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -129,7 +129,7 @@ private fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TOD
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.15.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -17,26 +17,26 @@ class Case1() {
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -53,7 +53,7 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -63,12 +63,12 @@ val Case2.listOf: A
 fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
@@ -76,7 +76,7 @@ public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 val Case2.listOf: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -93,19 +93,19 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 val Case3.listOf: A

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.15.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -27,26 +27,26 @@ class Case1() {
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -63,7 +63,7 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -73,12 +73,12 @@ val Case2.listOf: A
 fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
@@ -86,7 +86,7 @@ public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }):
 val Case2.listOf: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -103,19 +103,19 @@ class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 val Case3.listOf: A

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.16.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -17,25 +17,25 @@ class Case1() {
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -53,7 +53,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -63,18 +63,18 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -92,7 +92,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
@@ -102,12 +102,12 @@ val Case3.listOf: A
 fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 private fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.16.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver: The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -27,25 +27,25 @@ class Case1() {
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case1.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -63,7 +63,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -73,18 +73,18 @@ val Case2.listOf: A
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 fun <T> Case2.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -102,7 +102,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
@@ -112,12 +112,12 @@ val Case3.listOf: A
 fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 private fun <T> Case3.listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.17.fir.kt

@@ -3,14 +3,14 @@
 // SKIP_TXT
 
 // TESTCASE NUMBER: 0, 1, 2, 3, 4
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 class A() {
     infix fun foo(x: ()->Int) = "member fun foo"
 }
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 // TESTCASE NUMBER: 0
 
 package sentence3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.17.kt

@@ -15,14 +15,14 @@
  */
 
 // TESTCASE NUMBER: 0, 1, 2, 3, 4
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 class A() {
     infix fun foo(x: ()->Int) = "member fun foo"
 }
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 // TESTCASE NUMBER: 0
 
 package sentence3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.18.kt

@@ -16,11 +16,11 @@
  * DESCRIPTION: Infix fun: Local extension infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix fun CharSequence.trim(predicate: (Char) -> Boolean): CharSequence = TODO()
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.19.kt

@@ -16,12 +16,12 @@
  * DESCRIPTION: infix fun: Explicitly imported infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix fun CharSequence.trim(predicate: (Char) -> Boolean): CharSequence = TODO()
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.20.kt

@@ -16,12 +16,12 @@
  * DESCRIPTION: infix fun: Star-imported infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix fun CharSequence.trim(predicate: (Char) -> Boolean): CharSequence = TODO()
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.3.kt

@@ -14,12 +14,12 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Implicit receiver: sets of explicitly imported, declared in the package scope and star-imported extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackageExplicit
 
 public fun <T, R> T.let(block: (T) -> R): R = TODO()
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 package libPackage
 
 public fun <T, R> T.let(block: (T) -> R): R = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.8.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -14,23 +14,23 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1Explicit.listOf; typeCall: function")!>listOf(elements1 = arrayOf(1), body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -43,12 +43,12 @@ fun case2() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -57,13 +57,13 @@ val listOf: A
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -76,12 +76,12 @@ fun case3() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -90,7 +90,7 @@ val listOf: A
 
 private fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.8.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Callables explicitly imported into the current file
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -24,23 +24,23 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1Explicit.listOf; typeCall: function")!>listOf(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>elements1 = arrayOf(1)<!>, body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -53,12 +53,12 @@ fun case2() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -67,13 +67,13 @@ val listOf: A
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -86,12 +86,12 @@ fun case3() {
 class A {
     operator fun <T> invoke(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -100,7 +100,7 @@ val listOf: A
 
 private fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.9.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -13,17 +13,17 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: testsCase1.listOf; typeCall: function")!>listOf(elements1 = arrayOf(1), body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -32,12 +32,12 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: testsCase2.listOf; typeCall: function")!>listOf(elements1 = arrayOf(1), body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 import testsCase2.*
 
@@ -51,7 +51,7 @@ class A {
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -60,12 +60,12 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: testsCase3.A.invoke; typeCall: variable&invoke")!>listOf(elements1 = arrayOf(1), body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 import testsCase3.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-with-trailing-lambda-expressions/p-1/pos/2.9.kt

@@ -13,7 +13,7 @@
  * DESCRIPTION: call-with-trailing-lambda-expressions,Explicit receiver:  Top-level non-extension functions: Callables declared in the same package
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -23,17 +23,17 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: testsCase1.listOf; typeCall: function")!>listOf(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>elements1 = arrayOf(1)<!>, body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -42,12 +42,12 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: testsCase2.listOf; typeCall: function")!>listOf(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>elements1 = arrayOf(1)<!>, body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 import testsCase2.*
 
@@ -61,7 +61,7 @@ class A {
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -70,12 +70,12 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: testsCase3.A.invoke; typeCall: variable&invoke")!>listOf(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>elements1 = arrayOf(1)<!>, body = { "" })<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 
 public fun <T> listOf(vararg elements1: T = TODO(), body: () -> T = { TODO() }): List<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 import testsCase3.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.3.fir.kt

@@ -2,21 +2,21 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -NOTHING_TO_INLINE
 // SKIP_TXT
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase1ExplicitDuplicate
 import testsCase1.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.3.kt

@@ -16,21 +16,21 @@
  */
 
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase1ExplicitDuplicate
 import testsCase1.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.4.fir.kt

@@ -2,7 +2,7 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -NOTHING_TO_INLINE
 // SKIP_TXT
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -18,19 +18,19 @@ class Case1(){
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 fun <T> Case1.emptyArray(): Array<T> = TODO()
@@ -40,7 +40,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -62,19 +62,19 @@ class A {
     operator fun invoke(): Unit = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 fun <T> Case2.emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.4.kt

@@ -18,7 +18,7 @@
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -34,19 +34,19 @@ class Case1(){
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 <!CONFLICTING_OVERLOADS!>fun <T> Case1.emptyArray(): Array<T><!> = TODO()
@@ -56,7 +56,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -78,19 +78,19 @@ class A {
     operator fun invoke(): Unit = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 <!CONFLICTING_OVERLOADS!>fun <T> Case2.emptyArray(): Array<T><!> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.5.fir.kt

@@ -2,20 +2,20 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -NOTHING_TO_INLINE
 // SKIP_TXT
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Duplicate
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/2.5.kt

@@ -16,20 +16,20 @@
  */
 
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Duplicate
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/6.1.fir.kt

@@ -16,7 +16,7 @@ fun case1() {
     <!AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1
 fun Regex(pattern: String) {}
 
@@ -36,11 +36,11 @@ fun case2() {
     <!AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libCase2.a
 fun Regex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase2.b
 fun Regex(pattern: String) {}
 
@@ -60,11 +60,11 @@ fun case4() {
     <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!AMBIGUITY!>Regex<!>("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase4.a
 fun Regex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libCase4.b
 class Regex(pattern: String) {}
 
@@ -83,11 +83,11 @@ fun case5() {
     <!AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libCase5.a
 fun Regex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib7.kt
 package libCase5.b
 class Regex(pattern: String) {}
 
@@ -104,10 +104,10 @@ fun case6() {
     <!AMBIGUITY!>MyRegex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib8.kt
 package libCase6.a
 fun MyRegex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib9.kt
 package libCase6.b
 class MyRegex(pattern: String) {}

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/6.1.kt

@@ -24,7 +24,7 @@ fun case1() {
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1
 fun Regex(pattern: String) {}
 
@@ -44,11 +44,11 @@ fun case2() {
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libCase2.a
 fun Regex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase2.b
 fun Regex(pattern: String) {}
 
@@ -68,11 +68,11 @@ fun case4() {
     <!DEBUG_INFO_CALL("fqName: libCase4.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase4.a
 fun Regex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libCase4.b
 class Regex(pattern: String) {}
 
@@ -91,11 +91,11 @@ fun case5() {
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libCase5.a
 fun Regex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib7.kt
 package libCase5.b
 class Regex(pattern: String) {}
 
@@ -112,11 +112,11 @@ fun case6() {
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>MyRegex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib8.kt
 package libCase6.a
 fun MyRegex(pattern: String) {}
 
-// FILE: Lib.kt
+// FILE: Lib9.kt
 package libCase6.b
 class MyRegex(pattern: String) {}
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/6.4.fir.kt

@@ -2,6 +2,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-401
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, call-without-an-explicit-receiver -> paragraph 5 -> sentence 6
+ * NUMBER: 4
+ * DESCRIPTION:
+ */
 
 
 
@@ -20,7 +28,7 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libCase1.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1.a
 fun Regex(pattern: String) {}
 
@@ -28,7 +36,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib1_1.kt
 package libCase1.b
 
 enum class Regex{
@@ -56,7 +64,7 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: libCase2.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libCase2.a
 fun Regex(pattern: String) {}
 
@@ -64,7 +72,7 @@ fun Regex(pattern: String) {}
 //    operator fun invoke(s: String) {}
 //}
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 package libCase2.b
 
 enum class Regex{
@@ -91,7 +99,7 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: libCase3.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase3.a
 fun Regex(pattern: String) {}
 
@@ -99,7 +107,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib1_3.kt
 package libCase3.b
 
 class Regex(val s: String)
@@ -117,7 +125,7 @@ fun case4() {
     <!AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase4.a
 fun Regex(pattern: String) {}
 
@@ -125,7 +133,7 @@ fun Regex(pattern: String) {}
 //    operator fun invoke(s: String) {}
 //}
 
-// FILE: Lib1.kt
+// FILE: Lib14.kt
 package libCase4.b
 
 class Regex(val s: String)
@@ -143,14 +151,14 @@ fun case(){
     <!AMBIGUITY!>A<!>()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libCase5.a
 fun A() {} //(1)
 //object A{
 //    operator fun invoke(){}
 //}
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libCase5.b
 class A()
 
@@ -169,13 +177,13 @@ fun case(){
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>A()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib7.kt
 package libCase6.a
 fun A() : String = " " //(1)
 object A{
     //operator fun invoke(){}
 }
-// FILE: Lib.kt
+// FILE: Lib8.kt
 package libCase6.b
 class A()
 
@@ -193,11 +201,11 @@ fun case7(){
 object A{
     //operator fun invoke(){}
 }
-// FILE: Lib.kt
+// FILE: Lib9.kt
 package libCase7.a
 fun A() : String = " " //(1)
 
-// FILE: Lib.kt
+// FILE: Lib10.kt
 package libCase7.b
 class A()
 
@@ -217,14 +225,14 @@ fun case8(){
     <!AMBIGUITY!>A<!>()
 }
 
-// FILE: Lib.kt
+// FILE: Lib11.kt
 package libCase8.a
 fun A() : String = " " //(1)
 
-// FILE: Lib.kt
+// FILE: Lib1_2.kt
 package libCase8.b
 class A()
-// FILE: Lib.kt
+// FILE: Lib13.kt
 package libCase8.c
 object A{
     //operator fun invoke(){}
@@ -244,14 +252,14 @@ fun case9(){
     <!AMBIGUITY!>A<!>()
 }
 
-// FILE: Lib.kt
+// FILE: Lib1_4.kt
 package libCase9.a
 fun A() : String = " " //(1)
 
-// FILE: Lib.kt
+// FILE: Lib15.kt
 package libCase9.b
 class A()
-// FILE: Lib.kt
+// FILE: Lib16.kt
 package libCase9.c
 object A{
     //operator fun invoke(){}

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/neg/6.4.kt

@@ -28,7 +28,7 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libCase1.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1.a
 fun Regex(pattern: String) {}
 
@@ -36,7 +36,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib1_1.kt
 package libCase1.b
 
 enum class Regex{
@@ -64,7 +64,7 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: libCase2.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libCase2.a
 fun Regex(pattern: String) {}
 
@@ -72,7 +72,7 @@ fun Regex(pattern: String) {}
 //    operator fun invoke(s: String) {}
 //}
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 package libCase2.b
 
 enum class Regex{
@@ -99,7 +99,7 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: libCase3.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase3.a
 fun Regex(pattern: String) {}
 
@@ -107,7 +107,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib1_3.kt
 package libCase3.b
 
 class Regex(val s: String)
@@ -125,7 +125,7 @@ fun case4() {
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>Regex<!>("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase4.a
 fun Regex(pattern: String) {}
 
@@ -133,7 +133,7 @@ fun Regex(pattern: String) {}
 //    operator fun invoke(s: String) {}
 //}
 
-// FILE: Lib1.kt
+// FILE: Lib14.kt
 package libCase4.b
 
 class Regex(val s: String)
@@ -151,14 +151,14 @@ fun case(){
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>A<!>()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libCase5.a
 fun A() {} //(1)
 //object A{
 //    operator fun invoke(){}
 //}
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libCase5.b
 class A()
 
@@ -177,13 +177,13 @@ fun case(){
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>A()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib7.kt
 package libCase6.a
 fun A() : String = " " //(1)
 object A{
     //operator fun invoke(){}
 }
-// FILE: Lib.kt
+// FILE: Lib8.kt
 package libCase6.b
 class A()
 
@@ -201,11 +201,11 @@ fun case7(){
 object A{
     //operator fun invoke(){}
 }
-// FILE: Lib.kt
+// FILE: Lib9.kt
 package libCase7.a
 fun A() : String = " " //(1)
 
-// FILE: Lib.kt
+// FILE: Lib10.kt
 package libCase7.b
 class A()
 
@@ -225,14 +225,14 @@ fun case8(){
     A()
 }
 
-// FILE: Lib.kt
+// FILE: Lib11.kt
 package libCase8.a
 fun A() : String = " " //(1)
 
-// FILE: Lib.kt
+// FILE: Lib1_2.kt
 package libCase8.b
 class A()
-// FILE: Lib.kt
+// FILE: Lib13.kt
 package libCase8.c
 object A{
     //operator fun invoke(){}
@@ -252,14 +252,14 @@ fun case9(){
     <!OVERLOAD_RESOLUTION_AMBIGUITY!>A<!>()
 }
 
-// FILE: Lib.kt
+// FILE: Lib1_4.kt
 package libCase9.a
 fun A() : String = " " //(1)
 
-// FILE: Lib.kt
+// FILE: Lib15.kt
 package libCase9.b
 class A()
-// FILE: Lib.kt
+// FILE: Lib16.kt
 package libCase9.c
 object A{
     //operator fun invoke(){}
@@ -290,4 +290,4 @@ package libCase10.b
 class A()
 // FILE: Libc.kt
 package libCase10.c
-interface A
+interface A

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.1.kt

@@ -17,7 +17,7 @@
  * DESCRIPTION: The overload candidate sets for each pair of implicit receivers: Local extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -32,14 +32,14 @@ class Case1(){
         <!DEBUG_INFO_CALL("fqName: testsCase1.Case1.emptyArray; typeCall: function")!>emptyArray<Int>()<!>
     }
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -47,7 +47,7 @@ fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
@@ -56,7 +56,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -77,7 +77,7 @@ class Case2(){
 class A {
     operator fun <T>invoke(): T = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -86,7 +86,7 @@ val Case2.emptyArray: A
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -96,7 +96,7 @@ fun <T> Case2.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 val Case2.emptyArray: A
     get() = A()
@@ -108,7 +108,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -129,7 +129,7 @@ class Case3(){
 class A {
     operator fun <T>invoke(): T = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3
@@ -140,7 +140,7 @@ val Case3.emptyArray: A
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case3.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -152,7 +152,7 @@ fun <T> Case3.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.2.kt

@@ -17,7 +17,7 @@
  * DESCRIPTION: The overload candidate sets for each pair of implicit receivers: Local extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -38,14 +38,14 @@ class Case1(){
 
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -53,14 +53,14 @@ fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 
 /*
  * TESTCASE NUMBER: 2
@@ -97,7 +97,7 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 // TESTCASE NUMBER: 2
 package libPackageCase2
 import testsCase2.*
@@ -106,7 +106,7 @@ val Case2.emptyArray: A
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 // TESTCASE NUMBER: 2
 
 package libPackageCase2Explicit
@@ -116,7 +116,7 @@ fun <T> Case2.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -125,7 +125,7 @@ fun <T> Case2.emptyArray(): Array<T> = TODO()
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 
 /*
  * TESTCASE NUMBER: 3
@@ -162,7 +162,7 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 // TESTCASE NUMBER: 3
 package libPackageCase3
 import testsCase3.*
@@ -171,7 +171,7 @@ val Case3.emptyArray: A
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case3.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 // TESTCASE NUMBER: 3
 
 package libPackageCase3Explicit
@@ -181,7 +181,7 @@ fun <T> Case3.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 fun <T> Case3.emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.3.kt

@@ -17,7 +17,7 @@
  * DESCRIPTION: The overload candidate sets for each pair of implicit receivers: Explicitly imported extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 
 package testsCase1
@@ -31,14 +31,14 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 import testsCase1.*
 
@@ -46,14 +46,14 @@ fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 
 package testsCase2
@@ -71,14 +71,14 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -89,7 +89,7 @@ fun <T> Case2.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
@@ -97,7 +97,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 
 package testsCase3
@@ -115,14 +115,14 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case3.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -133,7 +133,7 @@ private fun <T> Case3.emptyArray(): Array<T> = TODO()
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 fun <T> Case3.emptyArray(): Array<T> = TODO()
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.4.kt

@@ -17,7 +17,7 @@
  * DESCRIPTION: The overload candidate sets for each pair of implicit receivers: declared in the package scope extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -30,19 +30,19 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
@@ -50,7 +50,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -66,7 +66,7 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -76,12 +76,12 @@ val Case2.emptyArray: A
 fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
@@ -89,7 +89,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 val Case2.emptyArray: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -105,19 +105,19 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
 fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case3.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 val Case3.emptyArray: A

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/2.5.kt

@@ -17,7 +17,7 @@
  * DESCRIPTION: The overload candidate sets for each pair of implicit receivers: Implicitly imported extension callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -30,25 +30,25 @@ class Case1(){
     }
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 import testsCase1.*
 
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case1.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -65,7 +65,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -75,18 +75,18 @@ val Case2.emptyArray: A
 public fun <T> emptyArray(): Array<T> = TODO()
 fun <T> Case2.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -103,7 +103,7 @@ class A {
 }
 
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 import testsCase3.*
 
@@ -113,12 +113,12 @@ val Case3.emptyArray: A
 fun <T> emptyArray(): Array<T> = TODO()
 private fun <T> Case3.emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.1.kt

@@ -16,7 +16,7 @@
  * DESCRIPTION: Top-level non-extension functions: Callables explicitly imported into the current file
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -26,23 +26,23 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1Explicit.emptyArray; typeCall: function")!>emptyArray<Int>()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase1Explicit
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -54,12 +54,12 @@ fun case2() {
 class A {
     operator fun <T>invoke(): T = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase2
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libPackageCase2Explicit
 import testsCase2.*
 
@@ -68,14 +68,14 @@ val emptyArray: A
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -87,12 +87,12 @@ fun case3() {
 class A {
     operator fun <T>invoke(): T = TODO()
 }
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libPackageCase3
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package libPackageCase3Explicit
 import testsCase3.*
 
@@ -101,7 +101,7 @@ val emptyArray: A
 
 private fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 
 public fun <T> emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.2.fir.kt

@@ -22,7 +22,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun A() : String = ""
@@ -50,7 +50,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun A() : String = ""
@@ -81,7 +81,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun A() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.2.kt

@@ -31,7 +31,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun A() : String = ""
@@ -59,7 +59,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun A() : String = ""
@@ -90,7 +90,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun A() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.3.fir.kt

@@ -22,7 +22,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun A() : String = ""
@@ -50,7 +50,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun A() : String = ""
@@ -78,7 +78,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun A() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.3.kt

@@ -31,7 +31,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun A() : String = ""
@@ -59,7 +59,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun A() : String = ""
@@ -87,7 +87,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun A() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.4.fir.kt

@@ -22,7 +22,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun A() : String = ""
@@ -50,7 +50,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun A() : String = ""
@@ -79,7 +79,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun A() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.4.kt

@@ -31,7 +31,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun A() : String = ""
@@ -59,7 +59,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun A() : String = ""
@@ -88,7 +88,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun A() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.5.fir.kt

@@ -22,7 +22,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun B() : String = ""
@@ -50,7 +50,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun B() : String = ""
@@ -81,7 +81,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.B; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun B() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.5.kt

@@ -32,7 +32,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: tests.case1.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1
 
 fun B() : String = ""
@@ -60,7 +60,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: tests.case2.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case2
 
 //fun B() : String = ""
@@ -91,7 +91,7 @@ fun case3(){
     <!DEBUG_INFO_CALL("fqName: tests.case3.B.<init>; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case3
 
 //fun B() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.6.fir.kt

@@ -23,7 +23,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: lib.case1.b.C; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1.a
 
 fun C() : String = ""
@@ -32,7 +32,7 @@ object C {
     operator fun invoke() : Int = 1
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case1.b
 
 fun C() : String = ""
@@ -61,7 +61,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: lib.case2.b.C.invoke; typeCall: variable&invoke")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case2.a
 
 //fun C() : String = ""
@@ -69,7 +69,7 @@ package lib.case2.a
 object C {
     operator fun invoke() : Int = 1
 }
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package lib.case2.b
 
 //fun C() : String = ""
@@ -104,7 +104,7 @@ fun case3(){
     B.<!DEBUG_INFO_CALL("fqName: lib.case3.b.C.invoke; typeCall: function")!>invoke()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package lib.case3.a
 
 //fun B() : String = ""
@@ -112,7 +112,7 @@ package lib.case3.a
 object C {
     /*operator*/ fun invoke() : Int = 1
 }
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package lib.case3.b
 
 //fun C() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/4.6.kt

@@ -33,7 +33,7 @@ fun case1(){
     <!DEBUG_INFO_CALL("fqName: lib.case1.b.C; typeCall: function")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package lib.case1.a
 
 fun C() : String = ""
@@ -42,7 +42,7 @@ object C {
     operator fun invoke() : Int = 1
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package lib.case1.b
 
 fun C() : String = ""
@@ -71,7 +71,7 @@ fun case2(){
     <!DEBUG_INFO_CALL("fqName: lib.case2.b.C.invoke; typeCall: variable&invoke")!>B()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package lib.case2.a
 
 //fun C() : String = ""
@@ -79,7 +79,7 @@ package lib.case2.a
 object C {
     operator fun invoke() : Int = 1
 }
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package lib.case2.b
 
 //fun C() : String = ""
@@ -114,7 +114,7 @@ fun case3(){
     B.<!DEBUG_INFO_CALL("fqName: lib.case3.b.C.invoke; typeCall: function")!>invoke()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package lib.case3.a
 
 //fun B() : String = ""
@@ -122,7 +122,7 @@ package lib.case3.a
 object C {
     /*operator*/ fun invoke() : Int = 1
 }
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package lib.case3.b
 
 //fun C() : String = ""

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/5.1.kt

@@ -16,7 +16,7 @@
  * DESCRIPTION: Top-level non-extension functions: Callables declared in the same package
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.*
@@ -25,17 +25,17 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: testsCase1.emptyArray; typeCall: function")!>emptyArray<Int>()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack1.kt
 package testsCase1
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -44,12 +44,12 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: testsCase2.emptyArray; typeCall: function")!>emptyArray<Int>()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack2.kt
 package testsCase2
 import testsCase2.*
 
@@ -63,7 +63,7 @@ class A {
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -72,12 +72,12 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: testsCase3.A.invoke; typeCall: variable&invoke")!>emptyArray<Int>()<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: LibtestsPack.kt
+// FILE: LibtestsPack3.kt
 package testsCase3
 import testsCase3.*
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.1.kt

@@ -16,7 +16,7 @@
  * DESCRIPTION: Top-level non-extension functions: Callables star-imported into the current file;
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 
@@ -25,13 +25,13 @@ import libPackageCase1.*
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: libPackageCase1.emptyArray; typeCall: function")!>emptyArray<Int>()<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 public fun <T> emptyArray(): Array<T> = TODO()
 
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testsCase2
 import libPackageCase2.*
@@ -45,7 +45,7 @@ class A {
     operator fun <T> invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackageCase2
 import testsCase2.*
 
@@ -54,7 +54,7 @@ public fun <T> emptyArray(): Array<T> = TODO()
 val emptyArray: A
     get() = A()
 
-// FILE: TestCase.kt
+// FILE: TestCase3.kt
 // TESTCASE NUMBER: 3
 package testsCase3
 import libPackageCase3.*
@@ -68,11 +68,11 @@ class A {
     operator fun <T> invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libPackageCase3
 import testsCase3.*
 
 private fun <T> emptyArray(): Array<T> = TODO()
 
 val emptyArray: A
-    get() = A()
+    get() = A()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.2.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 /*
  * TESTCASE NUMBER: 1
  * UNEXPECTED BEHAVIOUR
@@ -16,12 +16,12 @@ fun case1() {
     Regex("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1
 fun Regex(pattern: String) {}
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 /*
  * TESTCASE NUMBER: 1
  * UNEXPECTED BEHAVIOUR
@@ -33,7 +33,7 @@ fun case() {
     <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package testPackCase1
 class Regex(pattern: String) {}
 
@@ -53,7 +53,7 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: libCase2.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase2.a
 fun Regex(pattern: String) {}
 
@@ -61,7 +61,7 @@ fun Regex(pattern: String) {}
 //    operator fun invoke(s: String) {}
 //}
 
-// FILE: Lib1.kt
+// FILE: Lib11.kt
 package libCase2.b
 
 enum class Regex{
@@ -87,7 +87,7 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: libCase3.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase3
 fun Regex(pattern: String) {}
 
@@ -110,7 +110,7 @@ fun case4() {
     <!DEBUG_INFO_CALL("fqName: libCase4.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libCase4.a
 fun Regex(pattern: String) {}
 
@@ -118,7 +118,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 package libCase4.b
 
 enum class Regex{
@@ -141,7 +141,7 @@ fun case() {
    <!DEBUG_INFO_CALL("fqName: testPackCase5.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package testPackCase5
 fun Regex(pattern: String) {}
 
@@ -158,7 +158,7 @@ fun case() {
    <!DEBUG_INFO_CALL("fqName: testPackCase6.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib7.kt
 package testPackCase6
 fun Regex(pattern: String) {}
 
@@ -175,7 +175,7 @@ fun case() {
    <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib8.kt
 package testPackCase7
 class Regex(pattern: String) {}
 
@@ -192,7 +192,7 @@ fun case() {
     <!DEBUG_INFO_CALL("fqName: testPackCase8.Regex.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib9.kt
 package testPackCase8
 class Regex(pattern: String) {}
 
@@ -209,6 +209,6 @@ fun case() {
     <!DEBUG_INFO_CALL("fqName: testPackCase9.Regex.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib10.kt
 package testPackCase9
 class Regex(pattern: String) {}

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.2.kt

@@ -11,7 +11,7 @@
  * DESCRIPTION:
  */
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 /*
  * TESTCASE NUMBER: 1
  * UNEXPECTED BEHAVIOUR
@@ -24,12 +24,12 @@ fun case1() {
     Regex("")
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1
 fun Regex(pattern: String) {}
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 /*
  * TESTCASE NUMBER: 1
  * UNEXPECTED BEHAVIOUR
@@ -41,7 +41,7 @@ fun case() {
     <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package testPackCase1
 class Regex(pattern: String) {}
 
@@ -61,7 +61,7 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: libCase2.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase2.a
 fun Regex(pattern: String) {}
 
@@ -69,7 +69,7 @@ fun Regex(pattern: String) {}
 //    operator fun invoke(s: String) {}
 //}
 
-// FILE: Lib1.kt
+// FILE: Lib11.kt
 package libCase2.b
 
 enum class Regex{
@@ -95,7 +95,7 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: libCase3.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase3
 fun Regex(pattern: String) {}
 
@@ -118,7 +118,7 @@ fun case4() {
     <!DEBUG_INFO_CALL("fqName: libCase4.a.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib5.kt
 package libCase4.a
 fun Regex(pattern: String) {}
 
@@ -126,7 +126,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 package libCase4.b
 
 enum class Regex{
@@ -149,7 +149,7 @@ fun case() {
    <!DEBUG_INFO_CALL("fqName: testPackCase5.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib6.kt
 package testPackCase5
 fun Regex(pattern: String) {}
 
@@ -166,7 +166,7 @@ fun case() {
    <!DEBUG_INFO_CALL("fqName: testPackCase6.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib7.kt
 package testPackCase6
 fun Regex(pattern: String) {}
 
@@ -183,7 +183,7 @@ fun case() {
    <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib8.kt
 package testPackCase7
 class Regex(pattern: String) {}
 
@@ -200,7 +200,7 @@ fun case() {
     <!DEBUG_INFO_CALL("fqName: testPackCase8.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib9.kt
 package testPackCase8
 class Regex(pattern: String) {}
 
@@ -217,7 +217,7 @@ fun case() {
     <!DEBUG_INFO_CALL("fqName: testPackCase9.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib10.kt
 package testPackCase9
 class Regex(pattern: String) {}
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.3.fir.kt

@@ -18,7 +18,7 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: libCase1.Regex.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1
 class Regex(pattern: String)
 
@@ -38,7 +38,7 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!><!AMBIGUITY!>Regex<!>("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libCase2
 //fun Regex(pattern: String) {}
 
@@ -46,7 +46,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib11.kt
 package lib1Case2
 
 enum class Regex{
@@ -71,7 +71,7 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: libCase3.Regex.Companion.invoke; typeCall: variable&invoke")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase3
 
 enum class Regex{
@@ -98,11 +98,11 @@ fun case4() {
     <!DEBUG_INFO_CALL("fqName: libCase4.Regex.Regex; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase4
 class Regex(pattern: String) {}
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 package lib1Case4
 
 enum class Regex{

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/6.3.kt

@@ -26,7 +26,7 @@ fun case1() {
     <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libCase1
 class Regex(pattern: String)
 
@@ -46,7 +46,7 @@ fun case2() {
     <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libCase2
 //fun Regex(pattern: String) {}
 
@@ -54,7 +54,7 @@ object Regex {
     operator fun invoke(s: String) {}
 }
 
-// FILE: Lib1.kt
+// FILE: Lib11.kt
 package lib1Case2
 
 enum class Regex{
@@ -79,7 +79,7 @@ fun case3() {
     <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib3.kt
 package libCase3
 
 enum class Regex{
@@ -106,11 +106,11 @@ fun case4() {
     <!DEBUG_INFO_CALL("fqName: kotlin.text.Regex.<init>; typeCall: function")!>Regex("")<!>
 }
 
-// FILE: Lib.kt
+// FILE: Lib4.kt
 package libCase4
 class Regex(pattern: String) {}
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 package lib1Case4
 
 enum class Regex{

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/call-without-an-explicit-receiver/p-5/pos/7.1.kt

@@ -16,7 +16,7 @@
  * DESCRIPTION: Top-level non-extension functions: Implicitly imported callables
  */
 
-// FILE: TestCase.kt
+// FILE: TestCase1.kt
 // TESTCASE NUMBER: 1
 package testsCase1
 import libPackageCase1.* //nothing to import, function emptyArray is private
@@ -24,12 +24,12 @@ import libPackageCase1.* //nothing to import, function emptyArray is private
 fun case1() {
     <!DEBUG_INFO_CALL("fqName: kotlin.emptyArray; typeCall: inline function")!>emptyArray<Int>()<!>
 }
-// FILE: Lib.kt
+// FILE: Lib1.kt
 package libPackageCase1
 
 private fun <T> emptyArray(): Array<T> = TODO()
 
-// FILE: TestCase.kt
+// FILE: TestCase2.kt
 // TESTCASE NUMBER: 2
 package testscase2
 
@@ -46,7 +46,7 @@ class A {
     operator fun <T>invoke(): T = TODO()
 }
 
-// FILE: Lib.kt
+// FILE: Lib2.kt
 package libPackagecase2
 import testscase2.*
 private fun <T> emptyArray(): Array<T> = TODO()

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.1.fir.kt

@@ -2,14 +2,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -EXTENSION_SHADOWED_BY_MEMBER
 // SKIP_TXT
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 class A() {
      fun foo(x: Int) = "member fun foo"
 }
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 // TESTCASE NUMBER: 1, 2, 3, 4
 
 package sentence3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.1.kt

@@ -13,14 +13,14 @@
  * DESCRIPTION: Implicitly imported extension callable without infix modifier
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 class A() {
      fun foo(x: Int) = "member fun foo"
 }
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 // TESTCASE NUMBER: 1, 2, 3, 4
 
 package sentence3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.fir.kt

@@ -2,14 +2,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.2.kt

@@ -15,14 +15,14 @@
  * DESCRIPTION: Local extension infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.fir.kt

@@ -2,14 +2,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.3.kt

@@ -15,14 +15,14 @@
  * DESCRIPTION: Explicitly imported infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.4.fir.kt

@@ -2,14 +2,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
  operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/neg/1.4.kt

@@ -14,14 +14,14 @@
  * DESCRIPTION: Star-imported infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
  operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.1.fir.kt

@@ -3,14 +3,14 @@
 // SKIP_TXT
 
 // TESTCASE NUMBER: 0, 1, 2, 3, 4
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 class A() {
     infix fun foo(x: Int) = "member fun foo"
 }
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 // TESTCASE NUMBER: 0
 
 package sentence3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.1.kt

@@ -15,14 +15,14 @@
  */
 
 // TESTCASE NUMBER: 0, 1, 2, 3, 4
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 class A() {
     infix fun foo(x: Int) = "member fun foo"
 }
 
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 // TESTCASE NUMBER: 0
 
 package sentence3

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.2.kt

@@ -16,14 +16,14 @@
  * DESCRIPTION: Local extension infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.3.fir.kt

@@ -2,14 +2,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.3.kt

@@ -15,14 +15,14 @@
  * DESCRIPTION: Explicitly imported infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/infix-function-call/p-2/pos/4.4.kt

@@ -16,14 +16,14 @@
  * DESCRIPTION: Star-imported infix extension callables
  */
 
-// FILE: Extensions.kt
+// FILE: Extensions1.kt
 package libPackage
 
 infix operator fun CharSequence.contains(regex: Regex): Boolean {
     println("my contains")
     return true
 }
-// FILE: Extensions.kt
+// FILE: Extensions2.kt
 
 package sentence3
 

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-1/neg/2.4.fir.kt

@@ -2,6 +2,17 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-448
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 1 -> sentence 2
+ * PRIMARY LINKS: overload-resolution, choosing-the-most-specific-candidate-from-the-overload-candidate-set, algorithm-of-msc-selection -> paragraph 3 -> sentence 1
+ * NUMBER: 4
+ * DESCRIPTION: without inline plusAssign functions
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-39819
+ */
 
 
 // FILE: TestCase1.kt
@@ -22,11 +33,11 @@ fun case1 (){
 
 class B {
     private  operator fun plusAssign(c: () -> C) {}
-    private  operator fun plus(c: () -> C): C = c()
+    private  operator fun plus(c: () -> C): C = c() //(3)
 }
 class C
 
-// FILE: LibCase1.kt
+// FILE: LibCase1b.kt
 package LibPackCase1.b
 import LibPackCase1.a.*
 import testPackCase1.B
@@ -35,8 +46,45 @@ import testPackCase1.C
 operator fun B?.plusAssign( c: ()->C) {} //(2)
 
 
-// FILE: LibCase1.kt
+// FILE: LibCase1a.kt
 package LibPackCase1.a
 import testPackCase1.B
 
 operator fun B?.plusAssign( c: ()->Int) {} //(1)
+
+// FILE: TestCase2.kt
+/*
+ * TESTCASE NUMBER: 2
+ * NOTE:
+ */
+package testPackCase2
+import LibPackCase2.a.*
+import LibPackCase2.b.*
+
+fun case2 (){
+    var b: B = B()
+    <!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += { C() }<!>
+
+    <!AMBIGUITY, DEBUG_INFO_CALL("fqName: fqName is unknown; typeCall: unresolved")!>b += {1}<!>
+}
+
+class B {
+    private  operator fun plusAssign(c: () -> C) {}
+    private  operator fun plus(c: () -> C): C = c() //(3)
+}
+class C
+
+// FILE: LibCase2b.kt
+package LibPackCase2.b
+import LibPackCase2.a.*
+import testPackCase2.B
+import testPackCase2.C
+
+operator fun B.plusAssign( c: ()->C) {} //(2)
+
+
+// FILE: LibCase2a.kt
+package LibPackCase2.a
+import testPackCase2.B
+
+operator fun B.plusAssign( c: ()->Int) {} //(1)

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.2.fir.kt

@@ -1,10 +1,25 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -EXTENSION_SHADOWED_BY_MEMBER
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-268
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 2 -> sentence 3
+ * PRIMARY LINKS: overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 1
+ * overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 4 -> sentence 1
+ * NUMBER: 1
+ * DESCRIPTION: Non-extension member callables
+ */
+
+
 // FILE: LibCase1.kt
-// TESTCASE NUMBER: 1
+// TESTCASE NUMBER: 1, 2
+// TESTCASE NUMBER: 1, 2
 package libPackage
+
 import testPackCase1.Case
 import testPackCase1.Case.Inv
 import testPackCase1.Case.E
@@ -15,60 +30,60 @@ operator fun Case.Inv.invoke(i: Int) = 1
 
 
 // FILE: TestCase1.kt
-// TESTCASE NUMBER: 1
+// TESTCASE NUMBER: 1, 2
 package testPackCase1
 import libPackage.plus
 import libPackage.*
 import libPackage.invoke
+
 class Case() {
 
     class E(val plus: Inv? = null) {
-        /*operator*/ fun plus(value: Int) = Case()
+        operator fun plus(value: Int) = Case()
     }
 
     class Inv() {
-        /*operator*/ fun invoke(value: Int) = Case()
+        operator fun invoke(value: Int) = Case()
     }
 
     fun foo(e: E) {
         operator fun E.plus(value: Int) = Case()
 
         run {
-            <!DEBUG_INFO_CALL("fqName: testPackCase1.Case.E.plus; typeCall: function")!>e + 1<!>
+            <!DEBUG_INFO_CALL("fqName: testPackCase1.Case.E.plus; typeCall: operator function")!>e+1<!>
         }
-        <!DEBUG_INFO_CALL("fqName: testPackCase1.Case.E.plus; typeCall: function")!>e + 1<!>
+        <!DEBUG_INFO_CALL("fqName: testPackCase1.Case.E.plus; typeCall: operator function")!>e+1<!>
-
+        e.<!DEBUG_INFO_CALL("fqName: testPackCase1.Case.E.plus; typeCall: operator function")!>plus(1)<!>
+        e.plus?.<!DEBUG_INFO_CALL("fqName: testPackCase1.Case.Inv.invoke; typeCall: operator function")!>invoke(1)<!> //ok
     }
 }
 
-// FILE: LibCase1.kt
+// FILE: LibCase3.kt
-// TESTCASE NUMBER: 2
+// TESTCASE NUMBER: 3, 4
 package libPackage
-import testPackCase2.Case
+import testPackCase3.Case
-import testPackCase2.Case.Inv
+import testPackCase3.Case.Inv
-import testPackCase2.Case.E
+import testPackCase3.Case.E
 
-operator fun Case.E.plus(value: Int) =  Inv()
+operator fun Case.E.plus(value: Int) = Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase3.kt
-// TESTCASE NUMBER: 2
+// TESTCASE NUMBER: 3, 4
-package testPackCase2
+package testPackCase3
 import libPackage.plus
 import libPackage.*
 import libPackage.invoke
 
-operator fun Case.E.plus(value: Int) = Case()
-
 class Case() {
 
     class E(val plus: Inv? = null) {
-        /*operator*/ fun plus(value: Int) = Case()
+        operator fun plus(value: Int) = Case()
     }
 
     class Inv() {
-        /*operator*/ fun invoke(value: Int) = Case()
+        operator fun invoke(value: Int) = Case()
     }
 
     fun foo(e: E) {
@@ -77,79 +92,89 @@ class Case() {
         run {
             operator fun E.plus(value: Int) = Case()
 
-            <!DEBUG_INFO_CALL("fqName: testPackCase2.Case.E.plus; typeCall: function")!>e + 1<!>
+            <!DEBUG_INFO_CALL("fqName: testPackCase3.Case.E.plus; typeCall: operator function")!>e+1<!>
         }
-        <!DEBUG_INFO_CALL("fqName: testPackCase2.Case.E.plus; typeCall: function")!>e + 1<!>
+        <!DEBUG_INFO_CALL("fqName: testPackCase3.Case.E.plus; typeCall: operator function")!>e+1<!>
+    }
+    fun boo(e: E) {
+        /*operator*/ fun E.plus(value: Int) = Case()
+
+        run {
+            /*operator*/ fun E.plus(value: Int) = Case()
+
+            <!DEBUG_INFO_CALL("fqName: testPackCase3.Case.E.plus; typeCall: operator function")!>e+1<!>
+        }
+        <!DEBUG_INFO_CALL("fqName: testPackCase3.Case.E.plus; typeCall: operator function")!>e+1<!>
     }
 }
 
-// FILE: LibCase3.kt
+// FILE: LibCase5.kt
-// TESTCASE NUMBER: 3
+// TESTCASE NUMBER: 5, 6
 package libPackage
-import testPackCase3.Case
+
-import testPackCase3.Case.Inv
+import testPackCase5.Case
-import testPackCase3.Case.E
+import testPackCase5.Case.Inv
+import testPackCase5.Case.E
 
 operator fun Case.E.plusAssign(value: Int) {}
 operator fun Case.Inv.invoke(i: Int) {}
 
 
-// FILE: TestCase3.kt
+// FILE: TestCase6.kt
-// TESTCASE NUMBER:  3
+// TESTCASE NUMBER: 5, 6
-package testPackCase3
+package testPackCase5
 import libPackage.plusAssign
-import libPackage.invoke
 import libPackage.*
+import libPackage.invoke
+
 class Case() {
 
     class E(val plusAssign: Inv? = null) {
-        /*operator*/ fun plusAssign(value: Int) {}
+        operator fun plusAssign(value: Int) {}
     }
 
     class Inv() {
-        /*operator*/ fun invoke(value: Int) {}
+        operator fun invoke(value: Int) {}
     }
 
     fun foo(e: E) {
-        operator fun E.plusAssign(value: Int) {}
+        operator fun Case.E.plusAssign(value: Int) {}
 
         run {
-            <!DEBUG_INFO_CALL("fqName: testPackCase3.Case.E.plusAssign; typeCall: function")!>e += 1<!>
+            <!DEBUG_INFO_CALL("fqName: testPackCase5.Case.E.plusAssign; typeCall: operator function")!>e+=1<!>
         }
-        <!DEBUG_INFO_CALL("fqName: testPackCase3.Case.E.plusAssign; typeCall: function")!>e += 1<!>
+        <!DEBUG_INFO_CALL("fqName: testPackCase5.Case.E.plusAssign; typeCall: operator function")!>e+=1<!>
-
+        e.<!DEBUG_INFO_CALL("fqName: testPackCase5.Case.E.plusAssign; typeCall: operator function")!>plusAssign(1)<!>
+        e.plusAssign?.<!DEBUG_INFO_CALL("fqName: testPackCase5.Case.Inv.invoke; typeCall: operator function")!>invoke(1)<!> //ok
     }
 }
 
 
-// FILE: LibCase4.kt
+// FILE: LibCase7.kt
-// TESTCASE NUMBER: 4
+// TESTCASE NUMBER: 7, 8
 package libPackage
-import testPackCase4.Case
+import testPackCase8.Case
-import testPackCase4.Case.Inv
+import testPackCase8.Case.Inv
-import testPackCase4.Case.E
+import testPackCase8.Case.E
 
 operator fun Case.E.plusAssign(value: Int) {}
 operator fun Case.Inv.invoke(i: Int) {}
 
-
+// FILE: TestCase8.kt
-// FILE: TestCase4.kt
+// TESTCASE NUMBER: 7, 8
-// TESTCASE NUMBER: 4
+package testPackCase8
-package testPackCase4
 import libPackage.plusAssign
 import libPackage.*
 import libPackage.invoke
 
-operator fun Case.E.plusAssign(value: Int) {}
-
 class Case() {
 
     class E(val plusAssign: Inv? = null) {
-        /*operator*/ fun plusAssign(value: Int) {}
+        operator fun plusAssign(value: Int) {}
     }
 
     class Inv() {
-        /*operator*/ fun invoke(value: Int) {}
+        operator fun invoke(value: Int) {}
     }
 
     fun foo(e: E) {
@@ -158,48 +183,60 @@ class Case() {
         run {
             operator fun E.plusAssign(value: Int) {}
 
-            <!DEBUG_INFO_CALL("fqName: testPackCase4.Case.E.plusAssign; typeCall: function")!>e += 1<!>
+            <!DEBUG_INFO_CALL("fqName: testPackCase8.Case.E.plusAssign; typeCall: operator function")!>e+=1<!>
         }
-        <!DEBUG_INFO_CALL("fqName: testPackCase4.Case.E.plusAssign; typeCall: function")!>e += 1<!>
+        <!DEBUG_INFO_CALL("fqName: testPackCase8.Case.E.plusAssign; typeCall: operator function")!>e+=1<!>
     }
-}
+    fun boo(e: E) {
+        /*operator*/ fun E.plusAssign(value: Int) {}
 
+        run {
+            /*operator*/ fun E.plusAssign(value: Int) {}
 
-// FILE: TestCase5.kt
+            <!DEBUG_INFO_CALL("fqName: testPackCase8.Case.E.plusAssign; typeCall: operator function")!>e+=1<!>
-/*
- * TESTCASE NUMBER: 5
- * UNEXPECTED BEHAVIOUR
- * ISSUES: KT-36996
- */
-package testPackCase5
-import kotlin.reflect.KProperty
-
-class Delegate {
-    /*operator*/ fun getValue(thisRef: Any?, property: KProperty<*>): String {
-        return ""
-    }
-
-    /*operator*/ fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {
-    }
-}
-
-operator fun Delegate.getValue(thisRef: Any?, property: KProperty<*>): String {
-    return ""
-}
-operator fun Delegate.setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
-
-fun case() {
-    class Test {
-        var p: String by Delegate()
-
-        operator fun Delegate.getValue(thisRef: Any?, property: KProperty<*>): String {
-            return ""
         }
-        operator fun Delegate.setValue(thisRef: Any?, property: KProperty<*>, value: String) {
+        <!DEBUG_INFO_CALL("fqName: testPackCase8.Case.E.plusAssign; typeCall: operator function")!>e+=1<!>
+    }
+}
+
+
+// FILE: LibCase9.kt
+// TESTCASE NUMBER: 9, 10
+package libPackage
+import testPackCase10.Iterable
+import testPackCase10.Inv
+
+operator fun Iterable.iterator() : CharIterator = TODO()
+operator fun Inv.invoke() {}
+
+// FILE: TestCase10.kt
+// TESTCASE NUMBER: 9, 10
+package testPackCase10
+import libPackage.iterator
+import libPackage.invoke
+
+class Iterable(iterator: Inv) {
+    operator fun iterator() : CharIterator = TODO()
+}
+
+class Inv(val c: Char) {
+    operator fun invoke(): CharIterator = TODO()
+}
+
+operator fun Iterable.iterator() : CharIterator = TODO()
+
+fun case(){
+    operator fun Iterable.iterator() : CharIterator = TODO()
+    val iterable: Iterable = Iterable(Inv('c'))
+
+    fun foo(){
+        iterable.<!DEBUG_INFO_CALL("fqName: testPackCase10.Iterable.iterator; typeCall: operator function")!>iterator()<!>
+        for (i in iterable) {
+            println(i)
         }
     }
-    val test = Test()
+    iterable.<!DEBUG_INFO_CALL("fqName: testPackCase10.Iterable.iterator; typeCall: operator function")!>iterator()<!>
-    test.p = "NEW"
+    for (i in iterable) {
-    val x = test.p
+        println(i)
-
+    }
 }

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.2.kt

@@ -14,7 +14,7 @@
  */
 
 
-// FILE: LibCase1.kt
+// FILE: LibCase11.kt
 // TESTCASE NUMBER: 1
 package libPackage
 import testPackCase1.Case
@@ -26,7 +26,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 import libPackage.plus
@@ -53,7 +53,7 @@ class Case() {
     }
 }
 
-// FILE: LibCase1.kt
+// FILE: LibCase12.kt
 // TESTCASE NUMBER: 2
 package libPackage
 import testPackCase2.Case
@@ -64,7 +64,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import libPackage.plus

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.3.fir.kt

@@ -1,8 +1,20 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -EXTENSION_SHADOWED_BY_MEMBER
 // SKIP_TXT
 
-// FILE: LibCase1.kt
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-268
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 2 -> sentence 3
+ * PRIMARY LINKS: overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 3
+ * overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 4 -> sentence 1
+ * NUMBER: 3
+ * DESCRIPTION: Explicitly imported extension callables
+ */
+
+
+// FILE: LibCase11.kt
 // TESTCASE NUMBER: 1
 package libPackage1
 import testPackCase1.Case
@@ -12,7 +24,7 @@ import testPackCase1.Case.E
 operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
-// FILE: LibCase1.kt
+// FILE: LibCase12.kt
 // TESTCASE NUMBER: 1
 package libPackage2
 import testPackCase1.Case
@@ -50,7 +62,7 @@ class Case() {
     }
 }
 
-// FILE: LibCase2.kt
+// FILE: LibCase21.kt
 // TESTCASE NUMBER: 2
 package libPackage1
 import testPackCase2.Case
@@ -60,7 +72,7 @@ import testPackCase2.Case.E
 operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
-// FILE: LibCase2.kt
+// FILE: LibCase22.kt
 // TESTCASE NUMBER: 2
 package libPackage2
 import testPackCase2.Case

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.3.kt

@@ -14,7 +14,7 @@
  */
 
 
-// FILE: LibCase1.kt
+// FILE: LibCase11.kt
 // TESTCASE NUMBER: 1
 package libPackage1
 import testPackCase1.Case
@@ -24,7 +24,7 @@ import testPackCase1.Case.E
 operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
-// FILE: LibCase1.kt
+// FILE: LibCase12.kt
 // TESTCASE NUMBER: 1
 package libPackage2
 import testPackCase1.Case
@@ -62,7 +62,7 @@ class Case() {
     }
 }
 
-// FILE: LibCase2.kt
+// FILE: LibCase21.kt
 // TESTCASE NUMBER: 2
 package libPackage1
 import testPackCase2.Case
@@ -72,7 +72,7 @@ import testPackCase2.Case.E
 operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
-// FILE: LibCase2.kt
+// FILE: LibCase22.kt
 // TESTCASE NUMBER: 2
 package libPackage2
 import testPackCase2.Case

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.4.fir.kt

@@ -1,7 +1,19 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -EXTENSION_SHADOWED_BY_MEMBER
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-268
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 2 -> sentence 3
+ * PRIMARY LINKS: overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 4
+ * overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 4 -> sentence 1
+ * NUMBER: 4
+ * DESCRIPTION: Extension callables declared in the package scope
+ */
+
+
 // FILE: LibCase1.kt
 // TESTCASE NUMBER: 1
 package libPackage
@@ -13,7 +25,7 @@ operator fun Case.E.plus(value: Int) =  Case().Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 import libPackage.*
@@ -41,7 +53,7 @@ class Case() {
     }
 }
 
-// FILE: Lib1.kt
+// FILE: Lib11.kt
 // TESTCASE NUMBER: 2
 package libPackage1
 import testPackCase2.Case
@@ -52,7 +64,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: Lib2.kt
+// FILE: Lib21.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import testPackCase2.Case
@@ -63,7 +75,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import libPackage1.*
@@ -131,7 +143,7 @@ class Case() {
     }
 }
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 // TESTCASE NUMBER: 4
 package libPackage1
 import testPackCase4.Case
@@ -142,7 +154,7 @@ operator fun Case.E.plusAssign(value: Int) {}
 operator fun Case.Inv.invoke(i: Int) {}
 
 
-// FILE: Lib2.kt
+// FILE: Lib22.kt
 // TESTCASE NUMBER: 4
 package testPackCase4
 import testPackCase4.Case

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.4.kt

@@ -25,7 +25,7 @@ operator fun Case.E.plus(value: Int) =  Case().Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 import libPackage.*
@@ -53,7 +53,7 @@ class Case() {
     }
 }
 
-// FILE: Lib1.kt
+// FILE: Lib11.kt
 // TESTCASE NUMBER: 2
 package libPackage1
 import testPackCase2.Case
@@ -64,7 +64,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: Lib2.kt
+// FILE: Lib21.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import testPackCase2.Case
@@ -75,7 +75,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import libPackage1.*
@@ -143,7 +143,7 @@ class Case() {
     }
 }
 
-// FILE: Lib1.kt
+// FILE: Lib12.kt
 // TESTCASE NUMBER: 4
 package libPackage1
 import testPackCase4.Case
@@ -154,7 +154,7 @@ operator fun Case.E.plusAssign(value: Int) {}
 operator fun Case.Inv.invoke(i: Int) {}
 
 
-// FILE: Lib2.kt
+// FILE: Lib22.kt
 // TESTCASE NUMBER: 4
 package testPackCase4
 import testPackCase4.Case

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.5.fir.kt

@@ -1,7 +1,19 @@
 // !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION -EXTENSION_SHADOWED_BY_MEMBER
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-268
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 2 -> sentence 3
+ * PRIMARY LINKS: overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 5
+ * overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 4 -> sentence 1
+ * NUMBER: 5
+ * DESCRIPTION: Star-imported extension callables
+ */
+
+
 // FILE: LibCase1.kt
 // TESTCASE NUMBER: 1
 package libPackage
@@ -13,7 +25,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 import libPackage.*
@@ -44,7 +56,7 @@ package libPackage1
 
 public inline operator fun CharSequence.contains(regex: Regex): Boolean = regex.containsMatchIn(this)
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import libPackage1.*

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.5.kt

@@ -25,7 +25,7 @@ operator fun Case.E.plus(value: Int) =  Inv()
 operator fun Case.Inv.invoke(i: Int) = 1
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 import libPackage.*
@@ -56,7 +56,7 @@ package libPackage1
 
 public <!NOTHING_TO_INLINE!>inline<!> operator fun CharSequence.contains(regex: Regex): Boolean = regex.containsMatchIn(this)
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import libPackage1.*

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/building-the-overload-candidate-set-ocs/operator-call/p-2/pos/3.6.fir.kt

@@ -2,6 +2,18 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-268
+ * MAIN LINK: overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 2 -> sentence 3
+ * PRIMARY LINKS: overload-resolution, building-the-overload-candidate-set-ocs, call-with-an-explicit-receiver -> paragraph 6 -> sentence 5
+ * overload-resolution, building-the-overload-candidate-set-ocs, operator-call -> paragraph 4 -> sentence 1
+ * NUMBER: 6
+ * DESCRIPTION: Star-imported extension callables
+ */
+
+
 // FILE: LibCase1.kt
 // TESTCASE NUMBER: 1
 package libPackage

compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-11/pos/4.2.fir.kt

@@ -3,7 +3,7 @@
 // SKIP_TXT
 
 
-// FILE: TestCase1.kt
+// FILE: TestCase11.kt
 // TESTCASE NUMBER: 1
 package testPackCase1
 
@@ -28,7 +28,7 @@ private fun Short.boo(x: Short, a: Any = ""): Unit = TODO() //(1.3)
 private fun Byte.boo(x: Byte, a: Any = "", b: Any = 1): Unit = TODO() //(1.4)
 private fun Byte.boo(x: Byte, a: Any = ""): Unit = TODO() //(1.4)
 
-// FILE: TestCase1.kt
+// FILE: TestCase12.kt
 // TESTCASE NUMBER: 2
 package testPackCase2
 import testPackCase2.Case2.Companion.boo
@@ -76,7 +76,7 @@ fun case2(case: Case2) {
     case.run { 1.boo(1, 1) }
 }
 
-// FILE: TestCase1.kt
+// FILE: TestCase13.kt
 // TESTCASE NUMBER: 3
 package testPackCase3
 import testPackCase3.Case3.Companion.get