From 19fe605a3eb19afa82620d32ee1ee9bd9c5cc1e9 Mon Sep 17 00:00:00 2001 From: "Anastasia.Nekrasova" Date: Thu, 21 Dec 2023 11:28:10 +0200 Subject: [PATCH] K1/K2: add tests for KT-58767 --- .../DiagnosticCompilerTestFE10TestdataTestGenerated.java | 6 ++++++ ...ersedDiagnosticCompilerFE10TestDataTestGenerated.java | 6 ++++++ .../FirLightTreeOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../FirPsiOldFrontendDiagnosticsTestGenerated.java | 6 ++++++ .../annotations/subclassOptInRequired/Typealias.fir.kt | 9 +++++++++ .../annotations/subclassOptInRequired/Typealias.kt | 9 +++++++++ .../kotlin/test/runners/DiagnosticTestGenerated.java | 6 ++++++ 7 files changed, 48 insertions(+) create mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.fir.kt create mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.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 d2e4579888a..4b7ff3e564f 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 @@ -41919,6 +41919,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt"); } + @Test + @TestMetadata("Typealias.kt") + public void testTypealias() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt"); + } + @Test @TestMetadata("UsageOptInIsNotImplied.kt") public void testUsageOptInIsNotImplied() 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 d21af13d874..79542609bcb 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 @@ -41919,6 +41919,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt"); } + @Test + @TestMetadata("Typealias.kt") + public void testTypealias() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt"); + } + @Test @TestMetadata("UsageOptInIsNotImplied.kt") public void testUsageOptInIsNotImplied() 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 5d53f4b82a8..06b71551413 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 @@ -39645,6 +39645,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt"); } + @Test + @TestMetadata("Typealias.kt") + public void testTypealias() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt"); + } + @Test @TestMetadata("UsageOptInIsNotImplied.kt") public void testUsageOptInIsNotImplied() 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 c9e7d8f88ba..71b93b4f106 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 @@ -39765,6 +39765,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt"); } + @Test + @TestMetadata("Typealias.kt") + public void testTypealias() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt"); + } + @Test @TestMetadata("UsageOptInIsNotImplied.kt") public void testUsageOptInIsNotImplied() throws Exception { diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.fir.kt new file mode 100644 index 00000000000..b7498fbf0da --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.fir.kt @@ -0,0 +1,9 @@ +@RequiresOptIn +annotation class ApiMarker + +@SubclassOptInRequired(ApiMarker::class) +interface Interface + +typealias TypeAlias = Interface + +class InterfaceInheritorB: TypeAlias diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt new file mode 100644 index 00000000000..4914ededa5b --- /dev/null +++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt @@ -0,0 +1,9 @@ +@RequiresOptIn +annotation class ApiMarker + +@SubclassOptInRequired(ApiMarker::class) +interface Interface + +typealias TypeAlias = Interface + +class InterfaceInheritorB: TypeAlias \ No newline at end of file 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 87de1da48eb..8cf1218b19e 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 @@ -41919,6 +41919,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/NotApiMarkerAsArgument.kt"); } + @Test + @TestMetadata("Typealias.kt") + public void testTypealias() throws Exception { + runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/subclassOptInRequired/Typealias.kt"); + } + @Test @TestMetadata("UsageOptInIsNotImplied.kt") public void testUsageOptInIsNotImplied() throws Exception {