From 1467e743fdfee37ad712ca0f676f212d5e1ab94d Mon Sep 17 00:00:00 2001
From: Nikolay Lunyak <nikolay.lunyak@jetbrains.com>
Date: Mon, 4 Sep 2023 15:40:50 +0300
Subject: [PATCH] [FIR] Fix incorrect Java code in the test data

There's no point in eliminating K2 differences
between red code.

^KT-59915
---
 .../coroutines/suspendCovarianJavaOverride.fir.kt          | 7 +++++--
 .../coroutines/suspendCovarianJavaOverride.kt              | 5 ++++-
 .../testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt | 5 ++++-
 .../testsWithStdLib/coroutines/suspendJavaOverrides.kt     | 5 ++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt
index 769fbcd6523..4c42b3270cb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.fir.kt
@@ -5,9 +5,12 @@ interface I {
 }
 
 // FILE: JavaClass.java
+import kotlin.coroutines.Continuation;
+import org.jetbrains.annotations.NotNull;
+
 public class JavaClass implements I {
     @Override
-    public String foo(int x, kotlin.coroutines.Continuation<String> continuation) {
+    public Object foo(int x, @NotNull Continuation<? super String> continuation) {
         return null;
     }
 }
@@ -22,7 +25,7 @@ class K2 : JavaClass() {
 }
 
 class K3 : JavaClass() {
-    override fun foo(x: Int, y: Continuation<String>): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE!>Any?<!> = null
+    override fun foo(x: Int, y: Continuation<String>): Any? = null
 }
 
 fun builder(block: suspend () -> Unit) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt
index 25be3a644e5..57f098269d1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCovarianJavaOverride.kt
@@ -5,9 +5,12 @@ interface I {
 }
 
 // FILE: JavaClass.java
+import kotlin.coroutines.Continuation;
+import org.jetbrains.annotations.NotNull;
+
 public class JavaClass implements I {
     @Override
-    public String foo(int x, kotlin.coroutines.Continuation<String> continuation) {
+    public Object foo(int x, @NotNull Continuation<? super String> continuation) {
         return null;
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt
index 2ffcd3ef844..4c42b3270cb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.fir.kt
@@ -5,9 +5,12 @@ interface I {
 }
 
 // FILE: JavaClass.java
+import kotlin.coroutines.Continuation;
+import org.jetbrains.annotations.NotNull;
+
 public class JavaClass implements I {
     @Override
-    public Object foo(int x, kotlin.coroutines.Continuation<String> continuation) {
+    public Object foo(int x, @NotNull Continuation<? super String> continuation) {
         return null;
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt
index ba4ed507369..57f098269d1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendJavaOverrides.kt
@@ -5,9 +5,12 @@ interface I {
 }
 
 // FILE: JavaClass.java
+import kotlin.coroutines.Continuation;
+import org.jetbrains.annotations.NotNull;
+
 public class JavaClass implements I {
     @Override
-    public Object foo(int x, kotlin.coroutines.Continuation<String> continuation) {
+    public Object foo(int x, @NotNull Continuation<? super String> continuation) {
         return null;
     }
 }