From daa6e03e3b4ea9541b848df7df6e08a685e7b927 Mon Sep 17 00:00:00 2001 From: Nikolay Lunyak Date: Wed, 6 Mar 2024 12:40:06 +0200 Subject: [PATCH] [FIR] Reproduce KT-66046 ^KT-66046 --- ...CompilerTestFE10TestdataTestGenerated.java | 12 ++++++++++ ...sticCompilerFE10TestDataTestGenerated.java | 12 ++++++++++ ...eeOldFrontendDiagnosticsTestGenerated.java | 12 ++++++++++ ...siOldFrontendDiagnosticsTestGenerated.java | 12 ++++++++++ ...ilitiesForAbstractPropertyAccessors.fir.kt | 22 +++++++++++++++++++ ...isibilitiesForAbstractPropertyAccessors.kt | 22 +++++++++++++++++++ ...tiesForNonAbstractPropertyAccessors.fir.kt | 22 +++++++++++++++++++ ...bilitiesForNonAbstractPropertyAccessors.kt | 22 +++++++++++++++++++ .../test/runners/DiagnosticTestGenerated.java | 12 ++++++++++ 9 files changed, 148 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.fir.kt create mode 100644 compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt create mode 100644 compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.fir.kt create mode 100644 compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.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 8463b71bbda..41e7c0511ae 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 @@ -645,6 +645,18 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectedVisibilitiesForAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt"); + } + + @Test + @TestMetadata("intersectedVisibilitiesForNonAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForNonAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt"); + } + @Test @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") public void testIntersectionWithMultipleDefaultsInJava() { 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 4c40467515d..434279a9680 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 @@ -645,6 +645,18 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectedVisibilitiesForAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt"); + } + + @Test + @TestMetadata("intersectedVisibilitiesForNonAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForNonAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt"); + } + @Test @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") public void testIntersectionWithMultipleDefaultsInJava() { 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 a4daa463346..dd62db15604 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 @@ -645,6 +645,18 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectedVisibilitiesForAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt"); + } + + @Test + @TestMetadata("intersectedVisibilitiesForNonAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForNonAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt"); + } + @Test @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") public void testIntersectionWithMultipleDefaultsInJava() { 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 8d09afc54ce..9c5f13a5df0 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 @@ -645,6 +645,18 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectedVisibilitiesForAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt"); + } + + @Test + @TestMetadata("intersectedVisibilitiesForNonAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForNonAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt"); + } + @Test @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") public void testIntersectionWithMultipleDefaultsInJava() { diff --git a/compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.fir.kt b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.fir.kt new file mode 100644 index 00000000000..98ef7cf7958 --- /dev/null +++ b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.fir.kt @@ -0,0 +1,22 @@ +// ISSUE: KT-66046 + +abstract class I1 { + abstract var a: Int + protected set +} + +interface I2 { + var a: Int +} + +abstract class C : I1(), I2 + +abstract class I3 { + protected abstract fun foo(): Int +} + +interface I4 { + fun foo(): Int +} + +abstract class B : I3(), I4 diff --git a/compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt new file mode 100644 index 00000000000..e97e43cb835 --- /dev/null +++ b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt @@ -0,0 +1,22 @@ +// ISSUE: KT-66046 + +abstract class I1 { + abstract var a: Int + protected set +} + +interface I2 { + var a: Int +} + +abstract class C : I1(), I2 + +abstract class I3 { + protected abstract fun foo(): Int +} + +interface I4 { + fun foo(): Int +} + +abstract class B : I3(), I4 diff --git a/compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.fir.kt b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.fir.kt new file mode 100644 index 00000000000..606870786d5 --- /dev/null +++ b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.fir.kt @@ -0,0 +1,22 @@ +// ISSUE: KT-66046 + +open class A1 { + var a: Int = 10 + protected set +} + +interface I1 { + var a: Int +} + +abstract class B1 : A1(), I1 + +open class A2 { + protected fun foo(): Int = 10 +} + +interface I2 { + fun foo(): Int +} + +abstract class B2 : A2(), I2 diff --git a/compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt new file mode 100644 index 00000000000..f4f9b4b0d1d --- /dev/null +++ b/compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt @@ -0,0 +1,22 @@ +// ISSUE: KT-66046 + +open class A1 { + var a: Int = 10 + protected set +} + +interface I1 { + var a: Int +} + +abstract class B1 : A1(), I1 + +open class A2 { + protected fun foo(): Int = 10 +} + +interface I2 { + fun foo(): Int +} + +abstract class B2 : A2(), I2 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 a9ae207643c..7fa5d12c01d 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 @@ -645,6 +645,18 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/inlineDeprecationsOnImplicitCalls.kt"); } + @Test + @TestMetadata("intersectedVisibilitiesForAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForAbstractPropertyAccessors.kt"); + } + + @Test + @TestMetadata("intersectedVisibilitiesForNonAbstractPropertyAccessors.kt") + public void testIntersectedVisibilitiesForNonAbstractPropertyAccessors() { + runTest("compiler/testData/diagnostics/tests/intersectedVisibilitiesForNonAbstractPropertyAccessors.kt"); + } + @Test @TestMetadata("intersectionWithMultipleDefaultsInJava.kt") public void testIntersectionWithMultipleDefaultsInJava() {