From 62c9a7888b137567bc19da0ea4c9e6af6ead778b Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 23 Dec 2021 16:17:07 +0300 Subject: [PATCH] Analysis: remove // FIR_COMPARISON form LC testdata as LC tests are moved from IJ --- .../testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt | 1 - .../asJava/lightClasses/DataClassWithCustomImplementedMembers.kt | 1 - compiler/testData/asJava/lightClasses/DelegatedNested.kt | 1 - compiler/testData/asJava/lightClasses/Delegation.kt | 1 - compiler/testData/asJava/lightClasses/LocalFunctions.kt | 1 - .../asJava/lightClasses/compilationErrors/ActualTypeAlias.kt | 1 - .../compilationErrors/ActualTypeAliasCustomJvmPackageName.kt | 1 - .../asJava/lightClasses/compilationErrors/AnnotationModifiers.kt | 1 - .../asJava/lightClasses/compilationErrors/ExpectClass.kt | 1 - .../asJava/lightClasses/compilationErrors/ExpectObject.kt | 1 - .../asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt | 1 - .../compilationErrors/ExpectedNestedClassInObject.kt | 1 - .../asJava/lightClasses/compilationErrors/JvmPackageName.kt | 1 - .../asJava/lightClasses/compilationErrors/LocalInAnnotation.kt | 1 - .../testData/asJava/lightClasses/facades/SingleJvmClassName.kt | 1 - .../ideRegression/ImplementingCharSequenceAndNumber.kt | 1 - .../asJava/lightClasses/ideRegression/OverridingProtected.kt | 1 - .../testData/asJava/lightClasses/nullabilityAnnotations/Class.kt | 1 - .../asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt | 1 - compiler/testData/asJava/ultraLightClasses/coroutines.kt | 1 - compiler/testData/asJava/ultraLightClasses/dataClasses.kt | 1 - .../ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt | 1 - .../defaultMethodInKotlinWithSettingAllCompatibility.kt | 1 - compiler/testData/asJava/ultraLightClasses/inlineClasses.kt | 1 - compiler/testData/asJava/ultraLightClasses/inlineReified.kt | 1 - compiler/testData/asJava/ultraLightClasses/jvmName.kt | 1 - compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt | 1 - .../testData/asJava/ultraLightClasses/wildcardOptimization.kt | 1 - compiler/testData/asJava/ultraLightFacades/coroutines.kt | 1 - compiler/testData/asJava/ultraLightFacades/importAliases.kt | 1 - compiler/testData/asJava/ultraLightFacades/jvmField.kt | 1 - compiler/testData/asJava/ultraLightFacades/jvmName.kt | 1 - 32 files changed, 32 deletions(-) diff --git a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt index ffe3619f4d9..2e8f6eda2c6 100644 --- a/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt +++ b/compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt @@ -16,6 +16,5 @@ class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @propert set(value) {} } -// FIR_COMPARISON // SKIP_SANITY_TEST // SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt b/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt index 2a9ddeb4c2f..363cd9f4631 100644 --- a/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt +++ b/compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt @@ -18,4 +18,3 @@ class Wrapper { class G // LAZINESS:NoLaziness -// FIR_COMPARISON diff --git a/compiler/testData/asJava/lightClasses/DelegatedNested.kt b/compiler/testData/asJava/lightClasses/DelegatedNested.kt index 88fc0bc630a..495bc455188 100644 --- a/compiler/testData/asJava/lightClasses/DelegatedNested.kt +++ b/compiler/testData/asJava/lightClasses/DelegatedNested.kt @@ -13,4 +13,3 @@ interface I { } // LAZINESS:NoLaziness -// FIR_COMPARISON diff --git a/compiler/testData/asJava/lightClasses/Delegation.kt b/compiler/testData/asJava/lightClasses/Delegation.kt index c3d4b65bbef..71ff47b2af0 100644 --- a/compiler/testData/asJava/lightClasses/Delegation.kt +++ b/compiler/testData/asJava/lightClasses/Delegation.kt @@ -11,4 +11,3 @@ interface I { } // LAZINESS:NoLaziness -// FIR_COMPARISON diff --git a/compiler/testData/asJava/lightClasses/LocalFunctions.kt b/compiler/testData/asJava/lightClasses/LocalFunctions.kt index 8a0efc7e886..a8f2f2c2256 100644 --- a/compiler/testData/asJava/lightClasses/LocalFunctions.kt +++ b/compiler/testData/asJava/lightClasses/LocalFunctions.kt @@ -22,4 +22,3 @@ class A { } } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt index 121e3596dc6..8f71bd33b22 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt @@ -1,5 +1,4 @@ // p.ActualTypeAliasKt -// FIR_COMPARISON package p actual typealias B = List \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt index e69623d49f7..3fe6a73ebda 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt @@ -5,5 +5,4 @@ package p actual typealias B = List -// FIR_COMPARISON // SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt index 1f346c34553..e970ca65c7b 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt @@ -12,4 +12,3 @@ class A { var c: String = "" } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt index 87f6d7c332c..7762176e28b 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt @@ -1,5 +1,4 @@ // p.B -// FIR_COMPARISON package p diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt index 43a210aee5c..cd14feb8e27 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt @@ -1,5 +1,4 @@ // p.B -// FIR_COMPARISON package p diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt index 0a8d8d064a6..59c58221b35 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt @@ -1,5 +1,4 @@ // p.B.Nested -// FIR_COMPARISON package p diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt index f1081cb72be..17caab6238b 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt @@ -1,5 +1,4 @@ // p.B.Nested -// FIR_COMPARISON package p diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt index e2a79c59c11..05e874ebc2a 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt @@ -7,5 +7,4 @@ fun f() { } -// FIR_COMPARISON // SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt index cbdd11d53a6..9fd5b63fcf4 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt +++ b/compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt @@ -1,6 +1,5 @@ // Validation // See KT-24323 -// FIR_COMPARISON @Retention(AnnotationRetention.RUNTIME /* ) was removed */ annotation class Validation() diff --git a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt index ba22864881b..02237439904 100644 --- a/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt +++ b/compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt @@ -6,5 +6,4 @@ fun foo() { } -// FIR_COMPARISON // SKIP_IDE_TEST \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt index 219a57dd538..cfd3edd9de8 100644 --- a/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt +++ b/compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt @@ -46,5 +46,4 @@ class Container { } } -// FIR_COMPARISON // COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt b/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt index 177314718d4..c1240dd3370 100644 --- a/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt +++ b/compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt @@ -11,5 +11,4 @@ class C : A() { } // LAZINESS:NoLaziness -// FIR_COMPARISON // COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt index 29447a2ed14..41d651d1532 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt @@ -38,4 +38,3 @@ class Class { lateinit var lateInitVar: String } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt index 18aa68dfe57..d808233a873 100644 --- a/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt +++ b/compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt @@ -8,4 +8,3 @@ class PlatformTypes { fun bothNotNull() = Collections.emptyList()!! } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/coroutines.kt b/compiler/testData/asJava/ultraLightClasses/coroutines.kt index 7d354d23993..5b97b8d646e 100644 --- a/compiler/testData/asJava/ultraLightClasses/coroutines.kt +++ b/compiler/testData/asJava/ultraLightClasses/coroutines.kt @@ -21,4 +21,3 @@ class Derived: Base { } // WITH_STDLIB -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/dataClasses.kt b/compiler/testData/asJava/ultraLightClasses/dataClasses.kt index ebd0f909157..8f81633135c 100644 --- a/compiler/testData/asJava/ultraLightClasses/dataClasses.kt +++ b/compiler/testData/asJava/ultraLightClasses/dataClasses.kt @@ -4,4 +4,3 @@ data class Person(val name: String) { var age: Int = 0 } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt b/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt index 1a8efc26089..17250e5e196 100644 --- a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt +++ b/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt @@ -9,4 +9,3 @@ interface KtInterface { fun withoutBody() } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt b/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt index ea00201aef2..51d3b4464f9 100644 --- a/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt +++ b/compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt @@ -9,4 +9,3 @@ interface KtInterface { fun withoutBody() } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt b/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt index 7d73790afe4..bc6f49e55e4 100644 --- a/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt +++ b/compiler/testData/asJava/ultraLightClasses/inlineClasses.kt @@ -28,5 +28,4 @@ inline class InlineInheritance(val v: Int) : I { fun z() = 7 } -// FIR_COMPARISON // COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/ultraLightClasses/inlineReified.kt b/compiler/testData/asJava/ultraLightClasses/inlineReified.kt index 7e0c52a0b9e..e269b12c3c2 100644 --- a/compiler/testData/asJava/ultraLightClasses/inlineReified.kt +++ b/compiler/testData/asJava/ultraLightClasses/inlineReified.kt @@ -10,5 +10,4 @@ class C { inline set(value) {} } -// FIR_COMPARISON // COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/ultraLightClasses/jvmName.kt b/compiler/testData/asJava/ultraLightClasses/jvmName.kt index ae74495e597..5d71d0ca07e 100644 --- a/compiler/testData/asJava/ultraLightClasses/jvmName.kt +++ b/compiler/testData/asJava/ultraLightClasses/jvmName.kt @@ -23,4 +23,3 @@ class C { fun foo(x: List) {} } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt index 727a8c29498..ff2ec36afb1 100644 --- a/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt +++ b/compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt @@ -14,4 +14,3 @@ class A { @JvmSynthetic set } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt b/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt index 803419a6a59..277726a8eed 100644 --- a/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt +++ b/compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt @@ -52,4 +52,3 @@ class Container { fun typeParameter(x: Out, y: In) {} } -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightFacades/coroutines.kt b/compiler/testData/asJava/ultraLightFacades/coroutines.kt index 99950ccfb60..58bc7848e64 100644 --- a/compiler/testData/asJava/ultraLightFacades/coroutines.kt +++ b/compiler/testData/asJava/ultraLightFacades/coroutines.kt @@ -4,4 +4,3 @@ suspend fun doSomething(foo: String): Int { TODO() } fun async(block: suspend () -> T) { TODO() } // WITH_STDLIB -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightFacades/importAliases.kt b/compiler/testData/asJava/ultraLightFacades/importAliases.kt index c740552e61f..b9becaa7147 100644 --- a/compiler/testData/asJava/ultraLightFacades/importAliases.kt +++ b/compiler/testData/asJava/ultraLightFacades/importAliases.kt @@ -3,4 +3,3 @@ import kotlin.jvm.JvmName as JS @JS("notFoo") fun foo() {} -// FIR_COMPARISON diff --git a/compiler/testData/asJava/ultraLightFacades/jvmField.kt b/compiler/testData/asJava/ultraLightFacades/jvmField.kt index 8fae8a8866e..588dec3aa29 100644 --- a/compiler/testData/asJava/ultraLightFacades/jvmField.kt +++ b/compiler/testData/asJava/ultraLightFacades/jvmField.kt @@ -3,5 +3,4 @@ val a: Collection<*> = emptyList() @JvmField var b: Int = 1 -// FIR_COMPARISON // COMPILATION_ERRORS \ No newline at end of file diff --git a/compiler/testData/asJava/ultraLightFacades/jvmName.kt b/compiler/testData/asJava/ultraLightFacades/jvmName.kt index ca2cde9dd42..6f4fc3b96e7 100644 --- a/compiler/testData/asJava/ultraLightFacades/jvmName.kt +++ b/compiler/testData/asJava/ultraLightFacades/jvmName.kt @@ -21,4 +21,3 @@ fun foo(x: List) {} @JvmName("fooInt") fun foo(x: List) {} -// FIR_COMPARISON