From 888cac6fc0474eb2a9a7acf84e65088ff7c01b93 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Tue, 27 Feb 2024 16:42:24 +0100 Subject: [PATCH] [Tests] Reproduce #KT-66048 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 ++ ...sticCompilerFE10TestDataTestGenerated.java | 6 ++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 ++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 ++ .../tests/j+k/kjkImplicitReturnType.fir.kt | 63 +++++++++++++++++++ .../tests/j+k/kjkImplicitReturnType.kt | 63 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 ++ 7 files changed, 156 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.fir.kt create mode 100644 compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java index ad9ead2af65..9540d77e01f 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java @@ -22492,6 +22492,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); } + @Test + @TestMetadata("kjkImplicitReturnType.kt") + public void testKjkImplicitReturnType() { + runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); + } + @Test @TestMetadata("kjkPropertyAndExtensionProperty.kt") public void testKjkPropertyAndExtensionProperty() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java index bd5982f0265..fa305daeaae 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java @@ -22492,6 +22492,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); } + @Test + @TestMetadata("kjkImplicitReturnType.kt") + public void testKjkImplicitReturnType() { + runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); + } + @Test @TestMetadata("kjkPropertyAndExtensionProperty.kt") public void testKjkPropertyAndExtensionProperty() { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java index dcfad9f239d..8ce970caac5 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java @@ -22486,6 +22486,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); } + @Test + @TestMetadata("kjkImplicitReturnType.kt") + public void testKjkImplicitReturnType() { + runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); + } + @Test @TestMetadata("kjkPropertyAndExtensionProperty.kt") public void testKjkPropertyAndExtensionProperty() { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java index c7e80ad95f0..142795a8ae5 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java @@ -22492,6 +22492,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); } + @Test + @TestMetadata("kjkImplicitReturnType.kt") + public void testKjkImplicitReturnType() { + runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); + } + @Test @TestMetadata("kjkPropertyAndExtensionProperty.kt") public void testKjkPropertyAndExtensionProperty() { diff --git a/compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.fir.kt b/compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.fir.kt new file mode 100644 index 00000000000..30495c6d037 --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.fir.kt @@ -0,0 +1,63 @@ +// ISSUE: KT-66048 +// IGNORE_REVERSED_RESOLVE +// ^KT-66392 + +// FILE: Java1.java +public class Java1 extends KotlinClass { + @Override + public String a() { + return "2"; + } + + @Override + public String getB() { + return "2"; + } + + @Override + public String getC() { + return "2"; + } + + @Override + public void setC(String value) { + } + + @Override + public String getD() { + return "2"; + } + + @Override + public void setD(String value) { + } + + @Override + public String getE() { + return "2"; + } + + @Override + public String getF() { + return "2"; + } +} + +// FILE: test.kt +open class KotlinClass { + open fun a() = "1" + open val b = "1" + open var c = "1" + open var d: String = "1" + open var e = "1" + open var f: String = "1" +} + +class B : Java1() { + override fun a(): String? = super.a() + override val b: String? = super.b + override var c: String? = super.c + override var d: String? = super.d + override var e: String? = super.e + override var f: String? = super.f +} diff --git a/compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt b/compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt new file mode 100644 index 00000000000..8e7b9f79ffb --- /dev/null +++ b/compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt @@ -0,0 +1,63 @@ +// ISSUE: KT-66048 +// IGNORE_REVERSED_RESOLVE +// ^KT-66392 + +// FILE: Java1.java +public class Java1 extends KotlinClass { + @Override + public String a() { + return "2"; + } + + @Override + public String getB() { + return "2"; + } + + @Override + public String getC() { + return "2"; + } + + @Override + public void setC(String value) { + } + + @Override + public String getD() { + return "2"; + } + + @Override + public void setD(String value) { + } + + @Override + public String getE() { + return "2"; + } + + @Override + public String getF() { + return "2"; + } +} + +// FILE: test.kt +open class KotlinClass { + open fun a() = "1" + open val b = "1" + open var c = "1" + open var d: String = "1" + open var e = "1" + open var f: String = "1" +} + +class B : Java1() { + override fun a(): String? = super.a() + override val b: String? = super.b + override var c: String? = super.c + override var d: String? = super.d + override var e: String? = super.e + override var f: String? = super.f +} diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index 163d7a91772..e80e1b423f0 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -22492,6 +22492,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt"); } + @Test + @TestMetadata("kjkImplicitReturnType.kt") + public void testKjkImplicitReturnType() { + runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); + } + @Test @TestMetadata("kjkPropertyAndExtensionProperty.kt") public void testKjkPropertyAndExtensionProperty() {