FIR: Update test data (repeated diagnostics)

They are a bit redundant, but it needs additional work to be done
to avoid them

compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.kt

@@ -57,7 +57,7 @@ open class J() : S() {
 }
 
 open class Base<T : X, Z : T> {
-    open fun kek(): Z = <!RETURN_TYPE_MISMATCH!>Z()<!>
+    open fun kek(): Z = <!RETURN_TYPE_MISMATCH, TYPE_MISMATCH!>Z()<!>
 }
 
 open class GoodDerrived : Base<Y, W>() {

compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.kt

@@ -21,9 +21,9 @@ fun main() {
         x.toInt().toString()
     }
 
-    JavaUsage.foo2 { x: Int ->
-        <!ARGUMENT_TYPE_MISMATCH!>x.toString()<!>
-    }
+    JavaUsage.foo2 <!ARGUMENT_TYPE_MISMATCH!>{ x: Int ->
+        x.toString()
+    }<!>
 
     JavaUsage.foo3(
         { x ->

compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.kt

@@ -29,10 +29,10 @@ fun main() {
     foo1 { x -> x > 1 }
     foo1(f)
 
-    foo2 { x -> <!ARGUMENT_TYPE_MISMATCH!><!ARGUMENT_TYPE_MISMATCH!>x<!> <!UNRESOLVED_REFERENCE!>><!> 1<!> }
+    foo2 <!ARGUMENT_TYPE_MISMATCH!>{ x -> x <!UNRESOLVED_REFERENCE!>><!> 1 }<!>
     foo2(<!ARGUMENT_TYPE_MISMATCH!>f<!>)
 
-    foo3 { x -> <!ARGUMENT_TYPE_MISMATCH!><!ARGUMENT_TYPE_MISMATCH!>x<!> <!UNRESOLVED_REFERENCE!>><!> 1<!> }
+    foo3 <!ARGUMENT_TYPE_MISMATCH!>{ x -> x <!UNRESOLVED_REFERENCE!>><!> 1 }<!>
     foo3(<!ARGUMENT_TYPE_MISMATCH!>f<!>)
 
     foo4 { x -> x > 1 }

compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.kt

@@ -18,12 +18,11 @@ public class JavaUsage {
 fun foo(m: MyRunnable) {}
 
 fun main() {
-    JavaUsage.foo {
-            x ->
-        <!ARGUMENT_TYPE_MISMATCH!><!ARGUMENT_TYPE_MISMATCH!>x<!> <!UNRESOLVED_REFERENCE!>><!> 1<!>
-    }
+    JavaUsage.foo <!ARGUMENT_TYPE_MISMATCH!>{
+            x -> x <!UNRESOLVED_REFERENCE!>><!> 1
+    }<!>
 
-    JavaUsage.foo({ <!ARGUMENT_TYPE_MISMATCH!><!UNRESOLVED_REFERENCE!>it<!> > 1<!> })
+    JavaUsage.foo(<!ARGUMENT_TYPE_MISMATCH!>{ <!UNRESOLVED_REFERENCE!>it<!> > 1 }<!>)
 
     val x = { x: Int -> x > 1 }
 

compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.kt

@@ -12,7 +12,7 @@ fun ok(): Int {
 }
 
 fun okOneLineFunction(): Int = 10 + 1
-fun errorOneLineFunction(): String = <!RETURN_TYPE_MISMATCH!>10 + 1<!>
+fun errorOneLineFunction(): String = <!RETURN_TYPE_MISMATCH, TYPE_MISMATCH!>10 + 1<!>
 
 class A {
     fun bar() {}
@@ -52,4 +52,4 @@ fun blockReturnValueTypeMatch2() : Int {
     if (1 > 2)
     else return <!RETURN_TYPE_MISMATCH!>1.0<!>
     return <!RETURN_TYPE_MISMATCH!>2.0<!>
-}
+}