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 27b68b44d70..b526ee0aee6 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 @@ -26551,6 +26551,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideInJava.kt"); } + @Test + @TestMetadata("propertyAgainstFakeOverrideOfJavaField.kt") + public void testPropertyAgainstFakeOverrideOfJavaField() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt"); + } + @Test @TestMetadata("propertyAgainstJavaMethod.kt") public void testPropertyAgainstJavaMethod() throws Exception { 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 750355fe8a8..574c0378584 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 @@ -26551,6 +26551,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideInJava.kt"); } + @Test + @TestMetadata("propertyAgainstFakeOverrideOfJavaField.kt") + public void testPropertyAgainstFakeOverrideOfJavaField() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt"); + } + @Test @TestMetadata("propertyAgainstJavaMethod.kt") public void testPropertyAgainstJavaMethod() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java index 0e304792c2b..8bdccfc5878 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated.java @@ -1978,6 +1978,12 @@ public class FirOldFrontendMPPDiagnosticsWithLightTreeTestGenerated extends Abst runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideInJava.kt"); } + @Test + @TestMetadata("propertyAgainstFakeOverrideOfJavaField.kt") + public void testPropertyAgainstFakeOverrideOfJavaField() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt"); + } + @Test @TestMetadata("propertyAgainstJavaMethod.kt") public void testPropertyAgainstJavaMethod() throws Exception { diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java index 2d2b6fa8a7e..b73a7e63b01 100644 --- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java +++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendMPPDiagnosticsWithPsiTestGenerated.java @@ -1978,6 +1978,12 @@ public class FirOldFrontendMPPDiagnosticsWithPsiTestGenerated extends AbstractFi runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideInJava.kt"); } + @Test + @TestMetadata("propertyAgainstFakeOverrideOfJavaField.kt") + public void testPropertyAgainstFakeOverrideOfJavaField() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt"); + } + @Test @TestMetadata("propertyAgainstJavaMethod.kt") public void testPropertyAgainstJavaMethod() throws Exception { diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.fir.kt new file mode 100644 index 00000000000..63b9f30e40a --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.fir.kt @@ -0,0 +1,28 @@ +// MODULE: m1-common +// FILE: common.kt +expect class MyHashMap { + val values: Collection +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +interface MyMap { + val values: Collection +} + +actual typealias MyHashMap = MyHashMapJava + +// FILE: MyHashMapJava.java +import java.util.Collection; + +public final class MyHashMapJava extends AbstractMyHashMap { + // fake override of field AbstractMyHashMap.values +} +abstract class AbstractMyHashMap implements MyMap { + protected Collection values; + + @Override + public Collection getValues() { + return values; + } +} diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt b/compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt new file mode 100644 index 00000000000..9621063a284 --- /dev/null +++ b/compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt @@ -0,0 +1,28 @@ +// MODULE: m1-common +// FILE: common.kt +expect class MyHashMap { + val values: Collection +} + +// MODULE: m2-jvm()()(m1-common) +// FILE: jvm.kt +interface MyMap { + val values: Collection +} + +actual typealias MyHashMap = MyHashMapJava + +// FILE: MyHashMapJava.java +import java.util.Collection; + +public final class MyHashMapJava extends AbstractMyHashMap { + // fake override of field AbstractMyHashMap.values +} +abstract class AbstractMyHashMap implements MyMap { + protected Collection values; + + @Override + public Collection getValues() { + return values; + } +} 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 3784ae31f25..ecc5d70d408 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 @@ -26551,6 +26551,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideInJava.kt"); } + @Test + @TestMetadata("propertyAgainstFakeOverrideOfJavaField.kt") + public void testPropertyAgainstFakeOverrideOfJavaField() throws Exception { + runTest("compiler/testData/diagnostics/tests/multiplatform/java/propertyAgainstFakeOverrideOfJavaField.kt"); + } + @Test @TestMetadata("propertyAgainstJavaMethod.kt") public void testPropertyAgainstJavaMethod() throws Exception {