From 5abab2197bc45f5fe489aef4494c7dee74bd049a Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@jetbrains.com>
Date: Fri, 23 Jun 2023 13:05:49 +0200
Subject: [PATCH] [FIR] Adapt positioning of NO_VALUE_FOR_PARAMETER to match K1

---
 .../testData/resolve/arguments/default.kt     |  2 +-
 .../resolve/arguments/defaultFromOverrides.kt |  2 +-
 .../testData/resolve/arguments/lambda.kt      |  2 +-
 .../testData/resolve/arguments/simple.kt      |  2 +-
 .../LightTreePositioningStrategies.kt         |  3 +-
 .../diagnostics/PositioningStrategies.kt      |  3 +-
 .../tests/FunctionCalleeExpressions.fir.kt    |  9 ++---
 .../tests/FunctionCalleeExpressions.kt        |  1 -
 .../tests/annotations/ConstructorCall.fir.kt  | 36 ------------------
 .../tests/annotations/ConstructorCall.kt      |  1 +
 .../property/memberFromTopLevel.fir.kt        |  2 +-
 .../tests/delegation/kt44843.fir.kt           |  4 +-
 .../extensions/ExtensionFunctions.fir.kt      |  2 +-
 .../extensions/ExtensionsCalledOnSuper.fir.kt |  2 +-
 .../fromKEEP/autoCloseScope.fir.kt            | 34 -----------------
 .../fromKEEP/autoCloseScope.kt                |  1 +
 .../higherOrderCallMissingParameters.fir.kt   | 16 --------
 .../higherOrderCallMissingParameters.kt       |  1 +
 .../inference/invokeLambdaAsFunction.fir.kt   |  2 +-
 .../specialCallsWithCallableReferences.fir.kt | 38 +++++++++----------
 ...omQualifiersWithIrrelevantCandidate.fir.kt |  6 +--
 .../j+k/genericConstructor/recursive.fir.kt   | 11 ------
 .../tests/j+k/genericConstructor/recursive.kt |  1 +
 .../testData/diagnostics/tests/kt435.fir.kt   |  8 ----
 compiler/testData/diagnostics/tests/kt435.kt  |  2 +-
 .../namedArgumentsAndDefaultValues.fir.kt     |  2 +-
 .../receiverPresenceErrorForInvoke.fir.kt     |  4 +-
 .../wrongReceiverForInvokeOnExpression.fir.kt |  2 +-
 .../resolve/invoke/invokeAndSmartCast.fir.kt  |  4 +-
 ...OnVariableWithExtensionFunctionType.fir.kt |  8 ++--
 .../tests/resolve/invoke/kt9805.fir.kt        | 17 ---------
 .../tests/resolve/invoke/kt9805.kt            |  1 +
 .../tests/resolve/newLineLambda.fir.kt        |  6 +--
 ...izerOfDestructuringDeclarationOnce.fir.kts |  2 +-
 .../errorsOnEmptyDelegationCall.fir.kt        |  2 +-
 .../noPrimaryConstructor.fir.kt               |  6 ---
 .../noPrimaryConstructor.kt                   |  1 +
 .../typealiasesAsConstructors.fir.kt          |  4 +-
 .../testsWithStdLib/inference/kt11266.fir.kt  |  3 --
 .../testsWithStdLib/inference/kt11266.kt      |  1 +
 .../testsWithStdLib/inference/kt1558.fir.kt   |  8 ++--
 .../regression/ea70880_illegalJvmName.fir.kt  |  2 +-
 42 files changed, 70 insertions(+), 194 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/kt435.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/kt9805.fir.kt
 delete mode 100644 compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.fir.kt
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt

diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt
index 8c66abec707..ac097bd9833 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/default.kt
@@ -8,7 +8,7 @@ fun test() {
     foo(1, 2.0, true)
     foo(1, third = true)
 
-    <!NO_VALUE_FOR_PARAMETER!>foo()<!>
+    foo<!NO_VALUE_FOR_PARAMETER!>()<!>
     foo(0, 0.0, false, <!TOO_MANY_ARGUMENTS!>""<!>)
 
     bar(1, third = true)
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.kt
index f8766fe9b1f..62317659dc7 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.kt
@@ -15,7 +15,7 @@ fun foo(a: A) {
     a.foo()
     a.foo(1)
 
-    a.<!NO_VALUE_FOR_PARAMETER!>bar()<!>
+    a.bar<!NO_VALUE_FOR_PARAMETER!>()<!>
     a.bar(<!NO_VALUE_FOR_PARAMETER!>"")<!>
     a.bar(y = 1)
     a.bar("", 2)
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt
index 1079808b0de..a6e28c278e9 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.kt
@@ -29,6 +29,6 @@ fun test() {
 
     // Bad
     <!NO_VALUE_FOR_PARAMETER!>baz<!> {}
-    <!NO_VALUE_FOR_PARAMETER!>baz()<!> {}
+    baz<!NO_VALUE_FOR_PARAMETER!>()<!> {}
     baz(<!NO_VALUE_FOR_PARAMETER!>other = false)<!> <!TOO_MANY_ARGUMENTS!>{}<!>
 }
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.kt b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.kt
index c425dce5d72..0415cdb74be 100644
--- a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.kt
@@ -7,7 +7,7 @@ fun test() {
     foo(1, second = 3.14, third = false, fourth = "!?")
     foo(third = false, second = 2.71, fourth = "?!", first = 0)
 
-    <!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>foo()<!>
+    foo<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>()<!>
     foo(<!ARGUMENT_TYPE_MISMATCH!>0.0<!>, <!ARGUMENT_TYPE_MISMATCH!>false<!>, <!ARGUMENT_TYPE_MISMATCH!>0<!>, "")
     foo(1, 2.0, third = true, "")
     foo(second = 0.0, first = 0, <!NO_VALUE_FOR_PARAMETER!>fourth = "")<!>
diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt
index e61842b03dc..3e1361e5d2b 100644
--- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt
+++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt
@@ -590,7 +590,8 @@ object LightTreePositioningStrategies {
                     if (lastArgument != null) {
                         markRange(lastArgument, rightParenthesis, startOffset, endOffset, tree, node)
                     } else {
-                        markRange(nodeToStart, rightParenthesis, startOffset, endOffset, tree, node)
+                        val leftParenthesis = tree.findLastChildByType(argumentList, LPAR)
+                        markRange(leftParenthesis?: nodeToStart, rightParenthesis, startOffset, endOffset, tree, node)
                     }
                 }
 
diff --git a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
index 2ab47fbcb2a..60b5b80144d 100644
--- a/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+++ b/compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
@@ -693,7 +693,8 @@ object PositioningStrategies {
                     if (lastArgument != null) {
                         markRange(lastArgument, rightParenthesis)
                     } else {
-                        markRange(qualifiedAccess, rightParenthesis)
+                        val leftParenthesis = argumentList.leftParenthesis
+                        markRange(leftParenthesis ?: qualifiedAccess, rightParenthesis)
                     }
                 }
 
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
index aefedb622d4..2f9e8397e46 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
@@ -1,4 +1,3 @@
-// COMPARE_WITH_LIGHT_TREE
 // !CHECK_TYPE
 
 package foo
@@ -28,8 +27,8 @@ fun <T> fooT2() : (t : T) -> T {
 
 fun main(args : Array<String>) {
     args.foo()()
-    <!NO_VALUE_FOR_PARAMETER!>args.foo1()()<!>
-    <!NO_VALUE_FOR_PARAMETER!><!UNRESOLVED_REFERENCE!>a<!>.foo1()()<!>
+    args.foo1()<!NO_VALUE_FOR_PARAMETER!>()<!>
+    <!UNRESOLVED_REFERENCE!>a<!>.foo1()<!NO_VALUE_FOR_PARAMETER!>()<!>
     <!UNRESOLVED_REFERENCE!>a<!>.foo1()(<!UNRESOLVED_REFERENCE!>a<!>)
 
     args.foo1()(1)
@@ -76,8 +75,8 @@ fun main1() {
 }
 
 fun test() {
-    <!NO_VALUE_FOR_PARAMETER!>{x : Int -> 1}()<!>;
-    <!NO_VALUE_FOR_PARAMETER!>(fun Int.() = 1)()<!>
+    {x : Int -> 1}<!NO_VALUE_FOR_PARAMETER!>()<!>;
+    (fun Int.() = 1)<!NO_VALUE_FOR_PARAMETER!>()<!>
     <!ARGUMENT_TYPE_MISMATCH!>"sd"<!>.(fun Int.() = 1)()
     val i : Int? = null
     <!ARGUMENT_TYPE_MISMATCH!>i<!>.(fun Int.() = 1)();
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
index 85869a9e79e..1e3d1ca92f1 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
@@ -1,4 +1,3 @@
-// COMPARE_WITH_LIGHT_TREE
 // !CHECK_TYPE
 
 package foo
diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt
deleted file mode 100644
index 9f87b899c84..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.fir.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// !LANGUAGE: -InstantiationOfAnnotationClasses
-annotation class Ann
-annotation class Ann1(val a: Int)
-annotation class Ann2(val a: Ann1)
-
-annotation class Ann3(val a: Ann1 = Ann1(1))
-
-annotation class Ann4(val value: String)
-
-@Ann2(Ann1(1)) val a = 1
-
-@Ann2(a = Ann1(1)) val c = 2
-
-@Ann4("a") class MyClass
-
-fun foo() {
-    <!ANNOTATION_CLASS_CONSTRUCTOR_CALL!>Ann()<!>
-    val a = <!ANNOTATION_CLASS_CONSTRUCTOR_CALL!>Ann()<!>
-
-    <!ANNOTATION_CLASS_CONSTRUCTOR_CALL, NO_VALUE_FOR_PARAMETER!>Ann1()<!>
-    <!ANNOTATION_CLASS_CONSTRUCTOR_CALL!>Ann1(1)<!>
-    bar(<!ANNOTATION_CLASS_CONSTRUCTOR_CALL!>Ann()<!>)
-    bar(a = <!ANNOTATION_CLASS_CONSTRUCTOR_CALL!>Ann()<!>)
-
-    val ann = javaClass<MyClass>().getAnnotation(javaClass<Ann4>())
-    ann!!.value()
-}
-
-fun bar(a: Ann = <!ANNOTATION_CLASS_CONSTRUCTOR_CALL!>Ann()<!>) {
-    if (<!USELESS_IS_CHECK!>a is Ann<!>) {}
-}
-
-operator fun String.invoke() {}
-
-// from stdlib
-fun <T> javaClass() : Class<T> = null <!CAST_NEVER_SUCCEEDS!>as<!> Class<T>
diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt
index f1585e0c5cc..9c14a65b739 100644
--- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt
+++ b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: -InstantiationOfAnnotationClasses
 annotation class Ann
 annotation class Ann1(val a: Int)
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.fir.kt b/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.fir.kt
index 13c4963dc2d..f27ef0b964f 100644
--- a/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/memberFromTopLevel.fir.kt
@@ -13,7 +13,7 @@ fun test() {
     checkSubtype<KProperty1<A, Int>>(p)
     checkSubtype<KMutableProperty1<A, Int>>(<!ARGUMENT_TYPE_MISMATCH!>p<!>)
     checkSubtype<Int>(p.get(A()))
-    p.<!NO_VALUE_FOR_PARAMETER!>get()<!>
+    p.get<!NO_VALUE_FOR_PARAMETER!>()<!>
     p.<!UNRESOLVED_REFERENCE!>set<!>(A(), 239)
 
     val q = A::bar
diff --git a/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt b/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt
index 153b3c1f2df..b0aaa61274f 100644
--- a/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegation/kt44843.fir.kt
@@ -1,13 +1,13 @@
 // WITH_STDLIB
 
 // FILE: test.kt
-val bar2 by <!NO_VALUE_FOR_PARAMETER!>bar2()<!>
+val bar2 by bar2<!NO_VALUE_FOR_PARAMETER!>()<!>
 
 // FILE: lt/neworld/compiler/Foo.kt
 package lt.neworld.compiler
 
 class Foo {
-    val bar by <!NO_VALUE_FOR_PARAMETER!>bar()<!>
+    val bar by bar<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 // FILE: lt/neworld/compiler/bar/Bar.kt
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
index 8db9d5de988..6ad3f2a1280 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
@@ -19,7 +19,7 @@ class A
 infix operator fun A.plus(a : Any) {
 
   1.foo()
-  true.<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>foo()<!>
+  true.foo<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>()<!>
 
   1
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.fir.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.fir.kt
index 65048ca9df0..fafd0e63b37 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.fir.kt
@@ -16,7 +16,7 @@ class C : T {
         super.foo() // OK
         super.<!UNRESOLVED_REFERENCE!>bar<!>() // Error
         super.buzz() // OK, resolved to a member
-        super.<!NO_VALUE_FOR_PARAMETER!>buzz1()<!> // Resolved to an extension
+        super.buzz1<!NO_VALUE_FOR_PARAMETER!>()<!> // Resolved to an extension
         super.buzz1(<!ARGUMENT_TYPE_MISMATCH!>""<!>) // Resolved to a member
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt
deleted file mode 100644
index e22fd6dfc14..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.fir.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// !LANGUAGE: +ContextReceivers
-
-class File(name: String)
-interface InputStream
-
-interface AutoCloseScope {
-    fun defer(closeBlock: () -> Unit)
-    fun close()
-}
-class AutoCloseScopeImpl : AutoCloseScope {
-    override fun defer(closeBlock: () -> Unit) = TODO()
-    override fun close() = TODO()
-}
-
-context(AutoCloseScope)
-fun File.open(): InputStream = TODO()
-
-fun withAutoClose(block: context(AutoCloseScope) () -> Unit) {
-    val scope = AutoCloseScopeImpl() // Not shown here
-    try {
-        with(scope) { <!NO_VALUE_FOR_PARAMETER!>block()<!> }
-    } finally {
-        scope.close()
-    }
-}
-
-fun test() {
-    withAutoClose {
-        val input = File("input.txt").open()
-        val config = File("config.txt").open()
-        // Work
-        // All files are closed at the end
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt
index 45b6e5e7243..aae97cbba02 100644
--- a/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt
+++ b/compiler/testData/diagnostics/tests/extensions/contextReceivers/fromKEEP/autoCloseScope.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +ContextReceivers
 
 class File(name: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.fir.kt
deleted file mode 100644
index cac4dd0e83b..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.fir.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// See KT-7813: Call to functional parameter with missing argument: no error detected but compiler crashes
-
-fun foo(p: (Int, () -> Int) -> Unit) {
-    // Errors except last call
-    <!NO_VALUE_FOR_PARAMETER!>p<!> { 1 }
-    <!NO_VALUE_FOR_PARAMETER!>p()<!> { 2 }
-    p(3) { 4 }
-}
-
-fun bar(p: (String, Any, () -> String) -> Unit) {
-    // Errors except last call
-    <!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>p<!> { "" }
-    <!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>p()<!> { "x" }
-    p(<!NO_VALUE_FOR_PARAMETER!>"y")<!> { "z" }
-    p("v", Any()) { "w" }
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.kt b/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.kt
index 319480596d2..126bcadda2f 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/higherOrderCallMissingParameters.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // See KT-7813: Call to functional parameter with missing argument: no error detected but compiler crashes
 
 fun foo(p: (Int, () -> Int) -> Unit) {
diff --git a/compiler/testData/diagnostics/tests/inference/invokeLambdaAsFunction.fir.kt b/compiler/testData/diagnostics/tests/inference/invokeLambdaAsFunction.fir.kt
index 7a426fba8fc..07047a5c1eb 100644
--- a/compiler/testData/diagnostics/tests/inference/invokeLambdaAsFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/invokeLambdaAsFunction.fir.kt
@@ -2,6 +2,6 @@ fun test1(i: Int) = { i ->
     i
 }(i)
 
-fun test2() = <!NO_VALUE_FOR_PARAMETER!>{ i -> i }()<!>
+fun test2() = { i -> i }<!NO_VALUE_FOR_PARAMETER!>()<!>
 
 fun test3() = { i -> i }(1)
diff --git a/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt b/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt
index 44263d33920..26e6c6552ad 100644
--- a/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/specialCallsWithCallableReferences.fir.kt
@@ -35,7 +35,7 @@ fun poll11(flag: Boolean) {
 
 fun poll12(flag: Boolean) {
     val inv = if (flag) { ::<!UNRESOLVED_REFERENCE!>bar3<!> } else { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll13(flag: Boolean) {
@@ -45,12 +45,12 @@ fun poll13(flag: Boolean) {
 
 fun poll14(flag: Boolean) {
     val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>if (flag) { ::bar4 } else { ::foo4 }<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll15(flag: Boolean) {
     val inv = if (flag) { ::<!UNRESOLVED_REFERENCE!>bar5<!> } else { ::<!UNRESOLVED_REFERENCE!>foo5<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll16(flag: Boolean) {
@@ -65,7 +65,7 @@ fun poll17(flag: Boolean) {
 
 fun poll2(flag: Boolean) {
     val inv = when (flag) { true -> ::<!UNRESOLVED_REFERENCE!>bar<!> else -> ::<!UNRESOLVED_REFERENCE!>foo<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll21(flag: Boolean) {
@@ -75,12 +75,12 @@ fun poll21(flag: Boolean) {
 
 fun poll22(flag: Boolean) {
     val inv = when (flag) { true -> ::<!UNRESOLVED_REFERENCE!>bar3<!> else -> ::<!UNRESOLVED_REFERENCE!>foo3<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll23(flag: Boolean) {
     val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>when (flag) { true -> ::bar4 else -> ::foo4 }<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll24(flag: Boolean) {
@@ -100,7 +100,7 @@ fun poll26(flag: Boolean) {
 
 fun poll3(flag: Boolean) {
     val inv = when (flag) { true -> ::<!UNRESOLVED_REFERENCE!>bar<!> false -> ::<!UNRESOLVED_REFERENCE!>foo<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll31(flag: Boolean) {
@@ -110,12 +110,12 @@ fun poll31(flag: Boolean) {
 
 fun poll32(flag: Boolean) {
     val inv = when (flag) { true -> ::<!UNRESOLVED_REFERENCE!>bar3<!> false -> ::<!UNRESOLVED_REFERENCE!>foo3<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll33(flag: Boolean) {
     val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>when (flag) { true -> ::bar4 false -> ::foo4 }<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll34(flag: Boolean) {
@@ -135,7 +135,7 @@ fun poll36(flag: Boolean) {
 
 fun poll4() {
     val inv = try { ::<!UNRESOLVED_REFERENCE!>bar<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll41() {
@@ -145,17 +145,17 @@ fun poll41() {
 
 fun poll42() {
     val inv = try { ::<!UNRESOLVED_REFERENCE!>bar3<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll43() {
     val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>try { ::bar4 } finally { ::foo4 }<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll44() {
     val inv = try { ::<!UNRESOLVED_REFERENCE!>bar5<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo5<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll45() {
@@ -170,7 +170,7 @@ fun poll46() {
 
 fun poll5() {
     val inv = try { ::<!UNRESOLVED_REFERENCE!>bar<!> } catch (e: Exception) { ::<!UNRESOLVED_REFERENCE!>foo<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll51() {
@@ -180,17 +180,17 @@ fun poll51() {
 
 fun poll52() {
     val inv = try { ::<!UNRESOLVED_REFERENCE!>bar3<!> } catch (e: Exception) { ::<!UNRESOLVED_REFERENCE!>foo3<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo3<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll53() {
     val inv = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>try { ::bar4 } catch (e: Exception) { ::foo4 } finally { ::foo4 }<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll54() {
     val inv = try { ::<!UNRESOLVED_REFERENCE!>bar5<!> } catch (e: Exception) { ::<!UNRESOLVED_REFERENCE!>foo5<!> } finally { ::<!UNRESOLVED_REFERENCE!>foo5<!> }
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll55() {
@@ -240,7 +240,7 @@ fun poll66() {
 
 fun poll7() {
     val inv = ::<!UNRESOLVED_REFERENCE!>bar<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll71() {
@@ -250,7 +250,7 @@ fun poll71() {
 
 fun poll72() {
     val inv = ::<!UNRESOLVED_REFERENCE!>bar3<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
-    <!NO_VALUE_FOR_PARAMETER!>inv()<!>
+    inv<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun poll73() {
diff --git a/compiler/testData/diagnostics/tests/inner/innerConstructorsFromQualifiersWithIrrelevantCandidate.fir.kt b/compiler/testData/diagnostics/tests/inner/innerConstructorsFromQualifiersWithIrrelevantCandidate.fir.kt
index 2adf29dd94d..e187e9e7b76 100644
--- a/compiler/testData/diagnostics/tests/inner/innerConstructorsFromQualifiersWithIrrelevantCandidate.fir.kt
+++ b/compiler/testData/diagnostics/tests/inner/innerConstructorsFromQualifiersWithIrrelevantCandidate.fir.kt
@@ -12,7 +12,7 @@ class Outer {
 
         fun baz() {
             // Diagnostic here could be better (why can't I call the constructor above?)
-            <!NO_VALUE_FOR_PARAMETER!>Inner()<!>
+            Inner<!NO_VALUE_FOR_PARAMETER!>()<!>
             Inner(<!ARGUMENT_TYPE_MISMATCH!>1<!>)
             Inner("")
         }
@@ -20,7 +20,7 @@ class Outer {
 }
 
 fun foo() {
-    Outer.<!NO_VALUE_FOR_PARAMETER!>Inner()<!>
+    Outer.Inner<!NO_VALUE_FOR_PARAMETER!>()<!>
     Outer.Inner(<!ARGUMENT_TYPE_MISMATCH!>1<!>)
     Outer.Inner("")
 }
@@ -31,7 +31,7 @@ import abc.Outer.Inner
 import abc.Outer.Companion.Inner
 
 fun bar() {
-    <!NO_VALUE_FOR_PARAMETER!>Inner()<!>
+    Inner<!NO_VALUE_FOR_PARAMETER!>()<!>
     Inner(<!ARGUMENT_TYPE_MISMATCH!>1<!>)
     Inner("")
 
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt
deleted file mode 100644
index ca052faecd4..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// FILE: C.java
-
-// See KT-10410
-public class C {
-    public <T extends T> C(T t) {
-    }
-}
-
-// FILE: main.kt
-
-fun foo() = <!NO_VALUE_FOR_PARAMETER!>C()<!>
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
index 65a22ee4dfd..2cc639a16bb 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: C.java
 
 // See KT-10410
diff --git a/compiler/testData/diagnostics/tests/kt435.fir.kt b/compiler/testData/diagnostics/tests/kt435.fir.kt
deleted file mode 100644
index e61c2300bd7..00000000000
--- a/compiler/testData/diagnostics/tests/kt435.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// COMPARE_WITH_LIGHT_TREE
-fun Any.foo1() : (i : Int) -> Unit {
-    return {}
-}
-
-fun test(a : Any) {
-    <!NO_VALUE_FOR_PARAMETER!>a.foo1()()<!>
-}
diff --git a/compiler/testData/diagnostics/tests/kt435.kt b/compiler/testData/diagnostics/tests/kt435.kt
index be3b10e2332..e90ab963d71 100644
--- a/compiler/testData/diagnostics/tests/kt435.kt
+++ b/compiler/testData/diagnostics/tests/kt435.kt
@@ -1,4 +1,4 @@
-// COMPARE_WITH_LIGHT_TREE
+// FIR_IDENTICAL
 fun Any.foo1() : (i : Int) -> Unit {
     return {}
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt
index 4dca2c8100e..762d18f3200 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.fir.kt
@@ -14,7 +14,7 @@ fun test() {
     foo(1, "", <!TOO_MANY_ARGUMENTS!>""<!>)
 
     bar(z = "")
-    <!NO_VALUE_FOR_PARAMETER!>bar()<!>
+    bar<!NO_VALUE_FOR_PARAMETER!>()<!>
     bar(<!NO_VALUE_FOR_PARAMETER!>"")<!>
     bar(1, 1, "")
     bar(1, 1, "")
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.fir.kt
index 7f7f7dc821b..df552565076 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.fir.kt
@@ -1,7 +1,7 @@
 fun test1(f: String.() -> Unit) {
-    <!NO_VALUE_FOR_PARAMETER!>(f)()<!>
+    (f)<!NO_VALUE_FOR_PARAMETER!>()<!>
 
-    <!NO_VALUE_FOR_PARAMETER!>f()<!>
+    f<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun test2(f: (Int) -> Int) {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
index 9b3fb216876..d944dd6727f 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
@@ -6,7 +6,7 @@ fun test1() {
 
 fun test2(f: String.(Int) -> Unit) {
     <!ARGUMENT_TYPE_MISMATCH!>11<!>.(f)(1)
-    11.<!NO_VALUE_FOR_PARAMETER!>(f)()<!>
+    11.(f)<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 fun test3() {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAndSmartCast.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAndSmartCast.fir.kt
index 2517643820b..75f6a803bde 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAndSmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAndSmartCast.fir.kt
@@ -11,10 +11,10 @@ fun test(a: A) {
     <!UNSAFE_IMPLICIT_INVOKE_CALL!>(a.x)<!>("")
 
     with("") {
-        a.<!NO_VALUE_FOR_PARAMETER!>x()<!>
+        a.x<!NO_VALUE_FOR_PARAMETER!>()<!>
         <!UNSAFE_IMPLICIT_INVOKE_CALL!>(a.x)<!>()
         if (a.x != null) {
-            a.<!NO_VALUE_FOR_PARAMETER!>x()<!> // todo
+            a.x<!NO_VALUE_FOR_PARAMETER!>()<!> // todo
             (a.x)()
         }
     }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
index 1be2418d663..87a1cfc5754 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
@@ -23,8 +23,8 @@ fun test(a: A, b: B) {
     }
 
     with(b) {
-        a.<!NO_VALUE_FOR_PARAMETER!>foo()<!>
-        a.<!NO_VALUE_FOR_PARAMETER!>(foo)()<!>
+        a.foo<!NO_VALUE_FOR_PARAMETER!>()<!>
+        a.(foo)<!NO_VALUE_FOR_PARAMETER!>()<!>
 
         (a.foo)()
 
@@ -65,8 +65,8 @@ fun test(a: A, b: B) {
     }
 
     with(b) {
-        a.<!NO_VALUE_FOR_PARAMETER!>foo()<!>
-        a.<!NO_VALUE_FOR_PARAMETER!>(foo)()<!>
+        a.foo<!NO_VALUE_FOR_PARAMETER!>()<!>
+        a.(foo)<!NO_VALUE_FOR_PARAMETER!>()<!>
 
         (a.foo)()
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.fir.kt
deleted file mode 100644
index 26d45e3534e..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.fir.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-class A {
-    val foo: B.() -> Unit get() = null!!
-}
-
-class B
-
-fun test(a: A, b: B) {
-    with(b) {
-        a.<!NO_VALUE_FOR_PARAMETER!>foo()<!> // here must be error, because a is not extension receiver
-
-        a.foo(this)
-
-        (a.foo)()
-
-        (a.foo)(this)
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.kt b/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.kt
index dc797a1979d..fb308602a77 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt9805.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class A {
     val foo: B.() -> Unit get() = null!!
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt b/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
index 3bf1d920507..aa778e14fa5 100644
--- a/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
@@ -28,7 +28,7 @@ fun testNoArgs() {
 }
 
 fun testLambdaArg() {
-    <!NO_VALUE_FOR_PARAMETER!>oneLambdaArg()<!>
+    oneLambdaArg<!NO_VALUE_FOR_PARAMETER!>()<!>
     oneLambdaArg {}
     oneLambdaArg()
     {}
@@ -40,7 +40,7 @@ fun testLambdaArg() {
         <!TOO_MANY_ARGUMENTS!>{}<!>
     )
     oneLambdaArg() {}
-    <!NO_VALUE_FOR_PARAMETER!>oneLambdaArg()<!> // {}
+    oneLambdaArg<!NO_VALUE_FOR_PARAMETER!>()<!> // {}
     oneLambdaArg() /* */ {}
     oneLambdaArg() /*
         block
@@ -95,7 +95,7 @@ fun testTwoLambdas() {
     )
 
     fun bar(): () -> Unit {
-        <!NO_VALUE_FOR_PARAMETER!>twoLambdaArgs()<!>
+        twoLambdaArgs<!NO_VALUE_FOR_PARAMETER!>()<!>
         {}
         <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
 
diff --git a/compiler/testData/diagnostics/tests/script/resolveInitializerOfDestructuringDeclarationOnce.fir.kts b/compiler/testData/diagnostics/tests/script/resolveInitializerOfDestructuringDeclarationOnce.fir.kts
index e06ef9ad611..2cfe812862a 100644
--- a/compiler/testData/diagnostics/tests/script/resolveInitializerOfDestructuringDeclarationOnce.fir.kts
+++ b/compiler/testData/diagnostics/tests/script/resolveInitializerOfDestructuringDeclarationOnce.fir.kts
@@ -1,4 +1,4 @@
-val (a, b, c) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING, NO_VALUE_FOR_PARAMETER!>A()<!>
+val (a, b, c) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING!>A<!NO_VALUE_FOR_PARAMETER!>()<!><!>
 
 class A(val a: Int) {
     operator fun component1() {}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt
index 4dd23ce1c53..1d56331f954 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.fir.kt
@@ -3,7 +3,7 @@ open class B0(x: Int)
 
 class A0 : B0 {
     <!EXPLICIT_DELEGATION_CALL_REQUIRED!>constructor()<!>
-    constructor(x: Int) : <!NO_VALUE_FOR_PARAMETER!>super()<!>
+    constructor(x: Int) : super<!NO_VALUE_FOR_PARAMETER!>()<!>
 }
 
 // --------------------------
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.fir.kt
deleted file mode 100644
index 9f373b0777b..00000000000
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.fir.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-class A {
-    constructor(x: Int)
-}
-
-val x = <!NO_VALUE_FOR_PARAMETER!>A()<!>
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.kt
index 4c2fc25be5d..abbec8adefa 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/noPrimaryConstructor.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class A {
     constructor(x: Int)
diff --git a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.fir.kt b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.fir.kt
index 33ffd91af68..648832fdbb6 100644
--- a/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.fir.kt
+++ b/compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/typealiasesAsConstructors.fir.kt
@@ -13,8 +13,8 @@ open class C2(val x: Int) {
 typealias C2_Alias = C2
 
 val test1 = <!API_NOT_AVAILABLE!>C1_Alias<!>()
-val test2 = <!NO_VALUE_FOR_PARAMETER!>C2_Alias()<!>
+val test2 = C2_Alias<!NO_VALUE_FOR_PARAMETER!>()<!>
 
 class Test3 : <!API_NOT_AVAILABLE!>C1_Alias<!>()
 
-class Test4 : <!NO_VALUE_FOR_PARAMETER!>C2_Alias()<!>
+class Test4 : C2_Alias<!NO_VALUE_FOR_PARAMETER!>()<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt
deleted file mode 100644
index 2d5a4b2302c..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.fir.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-// NI_EXPECTED_FILE
-
-fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.<!NO_VALUE_FOR_PARAMETER!>toCollection()<!>, second.<!NO_VALUE_FOR_PARAMETER!>toCollection()<!>)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
index a2baf8bed8f..bb047305099 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // NI_EXPECTED_FILE
 
 fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.toCollection<!NO_VALUE_FOR_PARAMETER!>()<!>, second.toCollection<!NO_VALUE_FOR_PARAMETER!>()<!>)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
index 2f97dc0bc23..f3d6aecd3a1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt
@@ -12,13 +12,13 @@ fun <E> List<*>.toArray(ar: Array<E>): Array<E> = ar
 fun testArrays(ci: List<Int?>, cii: List<Int?>?) {
     val c1: Array<Int?> = cii.sure().toArray(<!ARGUMENT_TYPE_MISMATCH, NO_COMPANION_OBJECT!>Array<Int?><!>)
 
-    val c2: Array<Int?> = ci.toArray(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>Array<Int?>()<!>)
+    val c2: Array<Int?> = ci.toArray(Array<Int?><!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>()<!>)
 
-    val c3 = <!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>Array<Int?>()<!>
+    val c3 = Array<Int?><!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>()<!>
 
-    val c4 = ci.toArray<Int?>(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>Array<Int?>()<!>)
+    val c4 = ci.toArray<Int?>(Array<Int?><!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>()<!>)
 
-    val c5 = ci.toArray(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>Array<Int?>()<!>)
+    val c5 = ci.toArray(Array<Int?><!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>()<!>)
 
     checkSubtype<Array<Int?>>(c1)
     checkSubtype<Array<Int?>>(c2)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.fir.kt
index ad0fde54de0..020e8632f24 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/ea70880_illegalJvmName.fir.kt
@@ -1,4 +1,4 @@
-<!NO_VALUE_FOR_PARAMETER!>@JvmName()<!>
+@JvmName<!NO_VALUE_FOR_PARAMETER!>()<!>
 fun foo() {}
 
 @JvmName(<!ARGUMENT_TYPE_MISMATCH!>42<!>)