From a0fa2cc275a1f90e639f13e28ea047b038a11b31 Mon Sep 17 00:00:00 2001 From: pyos Date: Tue, 13 Sep 2022 14:24:16 +0200 Subject: [PATCH] FIR: regenerate LL API tests --- ...CompilerTestFE10TestdataTestGenerated.java | 24 ++++++++++++++++ .../typeUse/nonTypeUseAnnotationOnType.fir.kt | 22 --------------- .../typeUse/nonTypeUseAnnotationOnType.kt | 1 + .../type-annotations/neg/11.fir.kt | 26 ----------------- .../annotations/type-annotations/neg/11.kt | 2 +- .../annotations/type-annotations/neg/7.fir.kt | 28 ------------------- .../annotations/type-annotations/neg/7.kt | 1 + 7 files changed, 27 insertions(+), 77 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.fir.kt delete mode 100644 compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt delete mode 100644 compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java index f5b0410e5d7..4ecd1ba591a 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java @@ -16973,12 +16973,36 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag runTest("compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.kt"); } + @Test + @TestMetadata("hideFlexibleLocalTypeInPublicPosition.kt") + public void testHideFlexibleLocalTypeInPublicPosition() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/substitutions/hideFlexibleLocalTypeInPublicPosition.kt"); + } + + @Test + @TestMetadata("hideFlexibleLocalTypeInPublicPosition_before.kt") + public void testHideFlexibleLocalTypeInPublicPosition_before() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/substitutions/hideFlexibleLocalTypeInPublicPosition_before.kt"); + } + @Test @TestMetadata("hideLocalTypeForReturnTypeOfSingleExpressionFunction.kt") public void testHideLocalTypeForReturnTypeOfSingleExpressionFunction() throws Exception { runTest("compiler/testData/diagnostics/tests/inference/substitutions/hideLocalTypeForReturnTypeOfSingleExpressionFunction.kt"); } + @Test + @TestMetadata("hideNullableLocalTypeInPublicPosition.kt") + public void testHideNullableLocalTypeInPublicPosition() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/substitutions/hideNullableLocalTypeInPublicPosition.kt"); + } + + @Test + @TestMetadata("hideNullableLocalTypeInPublicPosition_before.kt") + public void testHideNullableLocalTypeInPublicPosition_before() throws Exception { + runTest("compiler/testData/diagnostics/tests/inference/substitutions/hideNullableLocalTypeInPublicPosition_before.kt"); + } + @Test @TestMetadata("kt32189returnTypeWithTypealiasSubtitution.kt") public void testKt32189returnTypeWithTypealiasSubtitution() throws Exception { diff --git a/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.fir.kt b/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.fir.kt deleted file mode 100644 index 0a8c92fb27d..00000000000 --- a/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.fir.kt +++ /dev/null @@ -1,22 +0,0 @@ -// !LANGUAGE: +ProperCheckAnnotationsTargetInTypeUsePositions -// ISSUE: KT-28449 - -@Target(AnnotationTarget.PROPERTY_GETTER) -annotation class Ann - -abstract class Foo : @Ann Any() - -abstract class Bar@Ann Any> - -fun test_1(a: Any) { - if (a is @Ann String) return -} - -open class TypeToken -val test_2 = object : TypeToken<@Ann String>() {} - -fun test_3(a: Any) { - a as @Ann Int -} - -fun test_4() where T : @Ann Any, T : @Ann CharSequence {} diff --git a/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.kt b/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.kt index 9420a410dbb..b0deecb09f1 100644 --- a/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.kt +++ b/compiler/testData/diagnostics/tests/annotations/typeUse/nonTypeUseAnnotationOnType.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +ProperCheckAnnotationsTargetInTypeUsePositions // ISSUE: KT-28449 diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt deleted file mode 100644 index c88a68bdf2c..00000000000 --- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt +++ /dev/null @@ -1,26 +0,0 @@ - -// TESTCASE NUMBER: 1, 2, 3, 4, 5 -@Retention(AnnotationRetention.RUNTIME) -@Target(AnnotationTarget.PROPERTY_GETTER) -annotation class Ann(val x: Int) - -// TESTCASE NUMBER: 1 -abstract class Foo : @Ann(10) Any() - -// TESTCASE NUMBER: 2 -abstract class Bar@Ann(10) Any> - -// TESTCASE NUMBER: 3 -fun case_3(a: Any) { - if (a is @Ann(10) String) return -} - -// TESTCASE NUMBER: 4 -open class TypeToken - -val case_4 = object : TypeToken<@Ann(10) String>() {} - -// TESTCASE NUMBER: 5 -fun case_5(a: Any) { - a as @Ann(10) Int -} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt index 179091faeed..3610225e968 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt @@ -1,4 +1,4 @@ - +// FIR_IDENTICAL /* * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE) * diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt deleted file mode 100644 index cd09afb8f68..00000000000 --- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt +++ /dev/null @@ -1,28 +0,0 @@ -/* - * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE) - * - * SECTIONS: annotations, type-annotations - * NUMBER: 7 - * DESCRIPTION: Type annotations on a type in an anonymous object expression, with unresolved reference in parameters. - * ISSUES: KT-28424 - */ - -// TESTCASE NUMBER: 1, 2 -@Target(AnnotationTarget.TYPE) -annotation class Ann - -/* - * TESTCASE NUMBER: 1 - * UNEXPECTED BEHAVIOUR - */ -open class TypeToken - -val case_1 = object : TypeToken<@Ann(unresolved_reference) String>() {} - -/* - * TESTCASE NUMBER: 2 - * UNEXPECTED BEHAVIOUR - */ -interface A - -val case_2 = object: @Ann(unresolved_reference) A {} diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt index 1f66becb6ce..96481d956bf 100644 --- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt +++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL /* * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE) *