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 80aea7bdea1..c8de0cf8425 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 @@ -21960,12 +21960,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); } - @Test - @TestMetadata("kjkPropertyAndExtensionProperty.kt") - public void testKjkPropertyAndExtensionProperty() { - runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt"); - } - @Test @TestMetadata("kjkRawTypeWithKotlinUpperBound.kt") public void testKjkRawTypeWithKotlinUpperBound() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java index 6807904e89a..1de488a41e5 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirBlackBoxCodegenBasedTestGenerated.java @@ -33552,6 +33552,12 @@ public class LLFirBlackBoxCodegenBasedTestGenerated extends AbstractLLFirBlackBo runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { 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 ea2e92395b5..79b3c0c4d2e 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 @@ -21960,12 +21960,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); } - @Test - @TestMetadata("kjkPropertyAndExtensionProperty.kt") - public void testKjkPropertyAndExtensionProperty() { - runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt"); - } - @Test @TestMetadata("kjkRawTypeWithKotlinUpperBound.kt") public void testKjkRawTypeWithKotlinUpperBound() { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java index b819db29be6..c4e14a344cf 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirReversedBlackBoxCodegenBasedTestGenerated.java @@ -33552,6 +33552,12 @@ public class LLFirReversedBlackBoxCodegenBasedTestGenerated extends AbstractLLFi runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { 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 37e5612df7b..a57e9f6ec71 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 @@ -21954,12 +21954,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); } - @Test - @TestMetadata("kjkPropertyAndExtensionProperty.kt") - public void testKjkPropertyAndExtensionProperty() { - runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt"); - } - @Test @TestMetadata("kjkRawTypeWithKotlinUpperBound.kt") public void testKjkRawTypeWithKotlinUpperBound() { 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 1a52d0cfb32..7afef91eac9 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 @@ -21960,12 +21960,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); } - @Test - @TestMetadata("kjkPropertyAndExtensionProperty.kt") - public void testKjkPropertyAndExtensionProperty() { - runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt"); - } - @Test @TestMetadata("kjkRawTypeWithKotlinUpperBound.kt") public void testKjkRawTypeWithKotlinUpperBound() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java index 3b75dd8840c..437a7936f7f 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java @@ -544,6 +544,12 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/inheritFromJavaCollectionSubclassWithContainsOverload.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java index 0a393a64336..ede7c58b984 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java @@ -544,6 +544,12 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/inheritFromJavaCollectionSubclassWithContainsOverload.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java index de3427b9176..e7647e9221c 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java @@ -33421,6 +33421,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java index aa8789e7645..07d4e6bc9f7 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGenerated.java @@ -33421,6 +33421,12 @@ public class FirLightTreeBlackBoxCodegenWithFir2IrFakeOverrideGeneratorTestGener runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java index c74cfd2c232..add6036d0a8 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java @@ -33421,6 +33421,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt b/compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt new file mode 100644 index 00000000000..20ff3e96040 --- /dev/null +++ b/compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt @@ -0,0 +1,79 @@ +// TARGET_BACKEND: JVM +// IGNORE_BACKEND_K1: JVM, JVM_IR + +// FILE: J.java +public class J extends D {} + +// FILE: JOverridesRegular.java +public class JOverridesRegular extends D { + @Override + public int getA() { + return 1; + } +} + +// FILE: JOverridesExtension.java +public class JOverridesExtension extends D { + @Override + public int getA(String $this) { + return 1; + } +} + +// FILE: JOVerridesBoth.java +public class JOVerridesBoth extends D { + @Override + public int getA() { + return 1; + } + + @Override + public int getA(String $this) { + return 1; + } +} + +// FILE: 1.kt +open class D { + open val a: Int + get() = 2 + + open val String.a: Int + get() = 1 +} + +class F : J() { + fun test() { + a + "".a + } +} + +class F2 : JOverridesRegular() { + fun test() { + a + "".a + } +} + +class F3 : JOverridesExtension() { + fun test() { + a + "".a + } +} + +class F4 : JOVerridesBoth() { + fun test() { + a + "".a + } +} + +fun box(): String { + F().test() + F2().test() + F3().test() + F4().test() + return "OK" +} diff --git a/compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.fir.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.fir.kt similarity index 100% rename from compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.fir.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.fir.kt diff --git a/compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt similarity index 85% rename from compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt index 947a47e52a3..5ed53036294 100644 --- a/compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt +++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt @@ -55,16 +55,16 @@ class F2 : JOverridesRegular() { } } -class F3 : JOverridesExtension() { +class F3 : JOverridesExtension() { fun test() { a "".a } -} +} -class F4 : JOVerridesBoth() { +class F4 : JOVerridesBoth() { fun test() { a "".a } -} +} 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 55b09d24f0d..081c99a41f7 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 @@ -21960,12 +21960,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/j+k/kjkImplicitReturnType.kt"); } - @Test - @TestMetadata("kjkPropertyAndExtensionProperty.kt") - public void testKjkPropertyAndExtensionProperty() { - runTest("compiler/testData/diagnostics/tests/j+k/kjkPropertyAndExtensionProperty.kt"); - } - @Test @TestMetadata("kjkRawTypeWithKotlinUpperBound.kt") public void testKjkRawTypeWithKotlinUpperBound() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java index 5e7aaf96b84..782d2540c0b 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java @@ -545,6 +545,12 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/inheritFromJavaCollectionSubclassWithContainsOverload.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("supertypeDifferentParameterNullability.kt") public void testSupertypeDifferentParameterNullability() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java index cf266d887cf..809b76538a9 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/JvmAbiConsistencyTestBoxGenerated.java @@ -33421,6 +33421,12 @@ public class JvmAbiConsistencyTestBoxGenerated extends AbstractJvmAbiConsistency runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java index 75b0993c26a..9cffa39b9c3 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java @@ -31543,6 +31543,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { runTest("compiler/testData/codegen/box/javaInterop/javaOuterClassDependsOnInner.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kt43217.kt") public void testKt43217() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java index 5388f50a5fe..d2549a9919f 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java @@ -33421,6 +33421,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java index 58f0a63b8d3..42e49d053e8 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java @@ -33421,6 +33421,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java index 61ee0b2e239..89244900275 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/inlineScopes/FirBlackBoxCodegenTestWithInlineScopesGenerated.java @@ -33421,6 +33421,12 @@ public class FirBlackBoxCodegenTestWithInlineScopesGenerated extends AbstractFir runTest("compiler/testData/codegen/box/javaInterop/javaTypeFromSameModuleWithRawTypedWildcardBound.kt"); } + @Test + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void testKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + @Test @TestMetadata("kjkWithRawTypes.kt") public void testKjkWithRawTypes() { diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java index 72e55b2727e..ef22cddb347 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java @@ -28241,6 +28241,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes runTest("compiler/testData/codegen/box/javaInterop/invisibleFake2.kt"); } + @TestMetadata("kjkPropertyAndExtensionProperty.kt") + public void ignoreKjkPropertyAndExtensionProperty() { + runTest("compiler/testData/codegen/box/javaInterop/kjkPropertyAndExtensionProperty.kt"); + } + private void runTest(String testDataFilePath) { KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); }