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 a2614de59c2..fbd95874318 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 @@ -291,6 +291,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/DeferredTypes.kt"); } + @Test + @TestMetadata("delegatedMemberHidesSupertypeOverride.kt") + public void testDelegatedMemberHidesSupertypeOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt"); + } + @Test @TestMetadata("delegationTypeMismatch.kt") public void testDelegationTypeMismatch() 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 ab6409a4f29..45d6f4de525 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 @@ -291,6 +291,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/DeferredTypes.kt"); } + @Test + @TestMetadata("delegatedMemberHidesSupertypeOverride.kt") + public void testDelegatedMemberHidesSupertypeOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt"); + } + @Test @TestMetadata("delegationTypeMismatch.kt") public void testDelegationTypeMismatch() throws Exception { 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 e0d76916cee..2c228f43df0 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 @@ -291,6 +291,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/DeferredTypes.kt"); } + @Test + @TestMetadata("delegatedMemberHidesSupertypeOverride.kt") + public void testDelegatedMemberHidesSupertypeOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt"); + } + @Test @TestMetadata("delegationTypeMismatch.kt") public void testDelegationTypeMismatch() throws Exception { 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 660f5704e6e..2065ea96187 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 @@ -291,6 +291,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/DeferredTypes.kt"); } + @Test + @TestMetadata("delegatedMemberHidesSupertypeOverride.kt") + public void testDelegatedMemberHidesSupertypeOverride() throws Exception { + runTest("compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt"); + } + @Test @TestMetadata("delegationTypeMismatch.kt") public void testDelegationTypeMismatch() throws Exception { diff --git a/compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt b/compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt new file mode 100644 index 00000000000..8736be6927f --- /dev/null +++ b/compiler/testData/diagnostics/tests/delegatedMemberHidesSupertypeOverride.kt @@ -0,0 +1,18 @@ +// FIR_IDENTICAL +// ISSUE: KT-63578 + +abstract class Nav { + val name: String = "" +} + +object VerticalPortalTransitionProvider : SimplePortalTransitionProvider { + override val enterTransition: String = "" +} + +interface SimplePortalTransitionProvider { + val enterTransition: String +} + +internal abstract class BaseFeaturePortal : SimplePortalTransitionProvider by VerticalPortalTransitionProvider + +internal class FeaturePortal : BaseFeaturePortal