From 3ff5df2179965b74435f4a3505871bac2e64ff95 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Wed, 12 May 2021 12:09:25 +0300 Subject: [PATCH] Remove `IGNORE_FIR` directive from already green tests Original commit: d7a91cb05e386ce4adbe4d5241b9728f6733250b GitOrigin-RevId: 99affb396895e097a23f80e6b321276d29ea7052 --- .../idea/tests/testData/highlighter/deprecated/Invalid.kt | 2 -- .../intentions/specifyTypeExplicitly/classNameClashing.kt | 1 - .../specifyTypeExplicitly/classNameClashing.kt.after | 1 - .../testData/intentions/specifyTypeExplicitly/localClass.kt | 1 - .../intentions/specifyTypeExplicitly/localClass.kt.after | 1 - .../specifyTypeExplicitly/localClassInSecondTypeParameter3.kt | 1 - .../localClassInSecondTypeParameter3.kt.after | 1 - .../tests/testData/quickfix/abstract/notImplementedMember.kt | 4 +--- .../testData/quickfix/abstract/notImplementedMember.kt.after | 4 +--- .../abstract/notImplementedMemberFromAbstractClass.kt | 4 +--- .../abstract/notImplementedMemberFromAbstractClass.kt.after | 4 +--- .../idea/tests/testData/quickfix/expressions/unsafeCall1.kt | 3 +-- .../tests/testData/quickfix/expressions/unsafeCall1.kt.after | 3 +-- .../kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt | 4 +--- .../idea/tests/testData/quickfix/modifiers/kt10409.kt.after | 4 +--- .../testData/quickfix/modifiers/removeExternalModifier.kt | 3 +-- .../quickfix/modifiers/removeExternalModifier.kt.after | 3 +-- .../testData/quickfix/replaceWithSafeCall/functionCall.kt | 3 +-- .../quickfix/replaceWithSafeCall/functionCall.kt.after | 3 +-- .../changeMutability/canBeVal/uninitializedWithGetter.kt | 3 +-- .../canBeVal/uninitializedWithGetter.kt.after | 3 +-- 21 files changed, 14 insertions(+), 42 deletions(-) diff --git a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Invalid.kt b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Invalid.kt index be7a984a2539..b1d714035c20 100644 --- a/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Invalid.kt +++ b/plugins/kotlin/idea/tests/testData/highlighter/deprecated/Invalid.kt @@ -1,5 +1,3 @@ -// IGNORE_FIR - @Deprecated() fun foo() {} @Deprecated(false) diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt index 9bc56fab4e59..3b0b6772357e 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt +++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR // WITH_STDLIB object Holder { diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after index 3646f8b1483b..52a447fb044d 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after +++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/classNameClashing.kt.after @@ -1,4 +1,3 @@ -// IGNORE_FIR // WITH_STDLIB object Holder { diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt index fa6766cc5cc8..a9d9ab11fef5 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt +++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR class A { private fun bar() = { class Local() diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt.after b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt.after index 7ffd9643ad27..1e964ce92674 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt.after +++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClass.kt.after @@ -1,4 +1,3 @@ -// IGNORE_FIR class A { private fun bar(): () -> Any = { class Local() diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt index 8389c588e674..b3464b8aa461 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt +++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt @@ -1,4 +1,3 @@ -// IGNORE_FIR open class F class TestClass diff --git a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt.after index 1481c2242e20..40da2097f017 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt.after +++ b/plugins/kotlin/idea/tests/testData/intentions/specifyTypeExplicitly/localClassInSecondTypeParameter3.kt.after @@ -1,4 +1,3 @@ -// IGNORE_FIR open class F class TestClass diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt index 2b2b640657db..52f3e98d658e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt @@ -4,6 +4,4 @@ interface I { } class A : I { -} - -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt.after index c9648d83f48f..07d309e41b4e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMember.kt.after @@ -4,6 +4,4 @@ interface I { } abstract class A : I { -} - -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt index 47d9e924d394..f7b7b9de8d77 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt @@ -4,6 +4,4 @@ abstract class A { } class B : A() { -} - -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after index 2aa314a6f3de..e5586d14387f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/abstract/notImplementedMemberFromAbstractClass.kt.after @@ -4,6 +4,4 @@ abstract class A { } abstract class B : A() { -} - -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt index 807cd97e0f38..39005f2dffd0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt @@ -1,5 +1,4 @@ // "Replace with safe (?.) call" "true" fun foo(a: Int?) { a.plus(1) -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt.after index 9dfdd27f5c82..29fdce55a65e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/expressions/unsafeCall1.kt.after @@ -1,5 +1,4 @@ // "Replace with safe (?.) call" "true" fun foo(a: Int?) { a?.plus(1) -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt index e5c21b83504a..eb12edede498 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt @@ -11,6 +11,4 @@ interface Pipeline { class IterablePipeline : Pipeline { override fun pipe(block: Pipeline) { } -} - -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt.after index 8fbdfbe8f834..70fc15d1706b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/kt10409.kt.after @@ -11,6 +11,4 @@ interface Pipeline { abstract class IterablePipeline : Pipeline { override fun pipe(block: Pipeline) { } -} - -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt index 44f21ab22eb1..4281aac13ccc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt @@ -2,5 +2,4 @@ class B { external val foo: Int = 23 -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt.after index f350d83d13b1..67e909ab0aba 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/modifiers/removeExternalModifier.kt.after @@ -2,5 +2,4 @@ class B { val foo: Int = 23 -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt index 740ff89d0a1a..40a2a3c55bf7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt @@ -2,5 +2,4 @@ // WITH_STDLIB fun foo(a: String?) { a.toLowerCase() -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt.after index 79b0e970a674..ce79da17fea4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/functionCall.kt.after @@ -2,5 +2,4 @@ // WITH_STDLIB fun foo(a: String?) { a?.toLowerCase() -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt index 7bf059a769d2..aa5cee87c728 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt @@ -2,5 +2,4 @@ class Test { var foo get() = 1 -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after index 508ac3ef2e0a..ca7221450d99 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/variables/changeMutability/canBeVal/uninitializedWithGetter.kt.after @@ -2,5 +2,4 @@ class Test { val foo get() = 1 -} -/* IGNORE_FIR */ \ No newline at end of file +} \ No newline at end of file