From e0b83def00b04994f7905bd538d96a17af41bed1 Mon Sep 17 00:00:00 2001 From: Stanislav Ruban Date: Fri, 1 Mar 2024 13:28:52 +0200 Subject: [PATCH] [tests] Add test data for KT-66260 --- ...CompilerTestFE10TestdataTestGenerated.java | 6 +++ ...sticCompilerFE10TestDataTestGenerated.java | 6 +++ ...eeOldFrontendDiagnosticsTestGenerated.java | 6 +++ ...siOldFrontendDiagnosticsTestGenerated.java | 6 +++ .../tests/modifiers/OpenInterface.fir.kt | 15 +++++++ .../tests/modifiers/OpenInterface.fir.txt | 39 +++++++++++++++++++ .../tests/modifiers/OpenInterface.kt | 15 +++++++ .../tests/modifiers/OpenInterface.txt | 18 +++++++++ .../test/runners/DiagnosticTestGenerated.java | 6 +++ 9 files changed, 117 insertions(+) create mode 100644 compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.kt create mode 100644 compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.txt create mode 100644 compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt create mode 100644 compiler/testData/diagnostics/tests/modifiers/OpenInterface.txt 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 1c7ce921cbb..454ab01c83f 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 @@ -24352,6 +24352,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt"); } + @Test + @TestMetadata("OpenInterface.kt") + public void testOpenInterface() { + runTest("compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt"); + } + @Test @TestMetadata("primaryConstructorMissingBrackets.kt") public void testPrimaryConstructorMissingBrackets() { 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 58cb0d03613..38528dfa600 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 @@ -24352,6 +24352,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt"); } + @Test + @TestMetadata("OpenInterface.kt") + public void testOpenInterface() { + runTest("compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt"); + } + @Test @TestMetadata("primaryConstructorMissingBrackets.kt") public void testPrimaryConstructorMissingBrackets() { 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 93a5bdb8592..455c81bc9f1 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 @@ -24346,6 +24346,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt"); } + @Test + @TestMetadata("OpenInterface.kt") + public void testOpenInterface() { + runTest("compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt"); + } + @Test @TestMetadata("primaryConstructorMissingBrackets.kt") public void testPrimaryConstructorMissingBrackets() { 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 76a5ff18383..40db665ccfc 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 @@ -24352,6 +24352,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt"); } + @Test + @TestMetadata("OpenInterface.kt") + public void testOpenInterface() { + runTest("compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt"); + } + @Test @TestMetadata("primaryConstructorMissingBrackets.kt") public void testPrimaryConstructorMissingBrackets() { diff --git a/compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.kt b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.kt new file mode 100644 index 00000000000..954d270a9fb --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.kt @@ -0,0 +1,15 @@ +// FIR_DUMP +open interface OpenInterface { + fun defaultModalityFuncWithoutBody() + fun defaultModalityFuncWithBody() {} + abstract fun abstractFunc() + open fun openFunc() {} + + val defaultModalityValWithoutGetter: Any + val defaultModalityValWithGetter: Any get() = 42 + abstract val abstractVal: Any + open val openVal: Any get() = 42 + + abstract val abstractValWithGetter: Any get() = 42 + abstract var abstractValWithSetter: Any set(value) {} +} diff --git a/compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.txt b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.txt new file mode 100644 index 00000000000..c4a46d68c19 --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.fir.txt @@ -0,0 +1,39 @@ +FILE: OpenInterface.fir.kt + public open interface OpenInterface : R|kotlin/Any| { + public abstract fun defaultModalityFuncWithoutBody(): R|kotlin/Unit| + + public open fun defaultModalityFuncWithBody(): R|kotlin/Unit| { + } + + public abstract fun abstractFunc(): R|kotlin/Unit| + + public open fun openFunc(): R|kotlin/Unit| { + } + + public abstract val defaultModalityValWithoutGetter: R|kotlin/Any| + public get(): R|kotlin/Any| + + public open val defaultModalityValWithGetter: R|kotlin/Any| + public get(): R|kotlin/Any| { + ^ Int(42) + } + + public abstract val abstractVal: R|kotlin/Any| + public get(): R|kotlin/Any| + + public open val openVal: R|kotlin/Any| + public get(): R|kotlin/Any| { + ^ Int(42) + } + + public abstract val abstractValWithGetter: R|kotlin/Any| + public get(): R|kotlin/Any| { + ^ Int(42) + } + + public abstract var abstractValWithSetter: R|kotlin/Any| + public get(): R|kotlin/Any| + public set(value: R|kotlin/Any|): R|kotlin/Unit| { + } + + } diff --git a/compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt new file mode 100644 index 00000000000..f6e7e321a6c --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt @@ -0,0 +1,15 @@ +// FIR_DUMP +open interface OpenInterface { + fun defaultModalityFuncWithoutBody() + fun defaultModalityFuncWithBody() {} + abstract fun abstractFunc() + open fun openFunc() {} + + val defaultModalityValWithoutGetter: Any + val defaultModalityValWithGetter: Any get() = 42 + abstract val abstractVal: Any + open val openVal: Any get() = 42 + + abstract val abstractValWithGetter: Any get() = 42 + abstract var abstractValWithSetter: Any set(value) {} +} diff --git a/compiler/testData/diagnostics/tests/modifiers/OpenInterface.txt b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.txt new file mode 100644 index 00000000000..bd0c3ba06c0 --- /dev/null +++ b/compiler/testData/diagnostics/tests/modifiers/OpenInterface.txt @@ -0,0 +1,18 @@ +package + +public interface OpenInterface { + public abstract val abstractVal: kotlin.Any + public abstract val abstractValWithGetter: kotlin.Any + public abstract var abstractValWithSetter: kotlin.Any + public open val defaultModalityValWithGetter: kotlin.Any + public abstract val defaultModalityValWithoutGetter: kotlin.Any + public open val openVal: kotlin.Any + public abstract fun abstractFunc(): kotlin.Unit + public open fun defaultModalityFuncWithBody(): kotlin.Unit + public abstract fun defaultModalityFuncWithoutBody(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int + public open fun openFunc(): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String +} + 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 ef09852d34d..89ce284fa01 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 @@ -24352,6 +24352,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/modifiers/openInInterface.kt"); } + @Test + @TestMetadata("OpenInterface.kt") + public void testOpenInterface() { + runTest("compiler/testData/diagnostics/tests/modifiers/OpenInterface.kt"); + } + @Test @TestMetadata("primaryConstructorMissingBrackets.kt") public void testPrimaryConstructorMissingBrackets() {