From e9298d1d7149ca30dfff31d0f3b03816ca72938a Mon Sep 17 00:00:00 2001 From: Mark Punzalan Date: Thu, 18 Mar 2021 22:23:29 +0000 Subject: [PATCH] FIR IDE: Allow FIR-specific "after" files for AbstractHighLevelQuickFixTest. --- .../idea/quickfix/AbstractHighLevelQuickFixTest.kt | 13 ++++++++++++- .../org/jetbrains/kotlin/test/uitls/IgnoreTests.kt | 2 +- .../abstract/abstractFunctionInNonAbstractClass.kt | 2 +- .../abstractFunctionInNonAbstractClass.kt.after | 2 +- .../abstract/abstractPropertyInCompanionObject.kt | 2 +- .../abstract/abstractPropertyInNonAbstractClass1.kt | 2 +- .../abstractPropertyInNonAbstractClass1.kt.after | 2 +- .../abstract/abstractPropertyInNonAbstractClass2.kt | 2 +- .../abstractPropertyInNonAbstractClass2.kt.after | 2 +- .../abstract/abstractPropertyInNonAbstractClass3.kt | 2 +- .../abstractPropertyInNonAbstractClass3.kt.after | 2 +- .../abstract/abstractPropertyWithGetter1.kt | 2 +- .../abstract/abstractPropertyWithGetter1.kt.after | 2 +- .../abstract/abstractPropertyWithInitializer1.kt | 2 +- .../abstractPropertyWithInitializer1.kt.after | 2 +- .../quickfix/abstract/abstractPropertyWithSetter.kt | 2 +- .../abstract/abstractPropertyWithSetter.kt.after | 2 +- .../quickfix/abstract/makeEnumEntryAbstract.kt | 2 +- .../quickfix/abstract/makeInlineClassAbstract.kt | 2 +- .../quickfix/abstract/makeObjectMemberAbstract.kt | 2 +- .../quickfix/abstract/makeTopLevelAbstract.kt | 2 +- idea/testData/quickfix/abstract/manyImpl.kt | 2 +- .../mustBeInitializedOrBeAbstractInSealedClass.kt | 2 +- ...tBeInitializedOrBeAbstractInSealedClass.kt.after | 2 +- .../abstract/nonAbstractFunctionWithNoBody.kt | 2 +- .../abstract/nonAbstractFunctionWithNoBody.kt.after | 2 +- idea/testData/quickfix/abstract/replaceOpen.kt | 2 +- .../testData/quickfix/abstract/replaceOpen.kt.after | 2 +- .../fixNullableWithExclExclAbsentWithBadIterator.kt | 2 +- .../modifiers/abstractVarWithPrivateSetter.kt | 2 +- .../modifiers/abstractVarWithPrivateSetter.kt.after | 2 +- .../quickfix/modifiers/nestedAbstractClass.kt | 2 +- .../quickfix/modifiers/nestedAbstractClass.kt.after | 2 +- .../quickfix/modifiers/nestedClassNotAllowed.kt | 2 +- .../modifiers/nestedClassNotAllowed.kt.after | 2 +- .../quickfix/modifiers/openMemberInFinalClass1.kt | 2 +- .../modifiers/openMemberInFinalClass1.kt.after | 2 +- .../quickfix/modifiers/openMemberInFinalClass2.kt | 2 +- .../modifiers/openMemberInFinalClass2.kt.after | 2 +- .../quickfix/modifiers/openMemberInFinalClass3.kt | 2 +- .../modifiers/openMemberInFinalClass3.kt.after | 2 +- .../quickfix/modifiers/openMemberInFinalClass4.kt | 2 +- .../modifiers/openMemberInFinalClass4.kt.after | 2 +- .../quickfix/modifiers/openVarWithPrivateSetter1.kt | 2 +- .../modifiers/openVarWithPrivateSetter1.kt.after | 2 +- .../quickfix/modifiers/openVarWithPrivateSetter2.kt | 2 +- .../modifiers/openVarWithPrivateSetter2.kt.after | 2 +- .../modifiers/overrideWithPrivateSetter1.kt | 2 +- .../modifiers/overrideWithPrivateSetter1.kt.after | 2 +- .../modifiers/overrideWithPrivateSetter2.kt | 2 +- .../modifiers/overrideWithPrivateSetter2.kt.after | 2 +- .../cantChangeReturnTypeOfOverriddenFunction.kt | 2 +- .../quickfix/replaceWithSafeCall/comment.kt | 3 ++- .../quickfix/replaceWithSafeCall/comment.kt.after | 3 ++- .../quickfix/replaceWithSafeCall/lineBreak.kt | 3 ++- .../quickfix/replaceWithSafeCall/lineBreak.kt.after | 3 ++- .../kotlin/idea/quickfix/AbstractQuickFixTest.kt | 6 +++++- 57 files changed, 76 insertions(+), 57 deletions(-) diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt index bc9feea4af5..61a728fa05d 100644 --- a/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt +++ b/idea/idea-fir/tests/org/jetbrains/kotlin/idea/quickfix/AbstractHighLevelQuickFixTest.kt @@ -7,7 +7,9 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInspection.InspectionProfileEntry +import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.test.uitls.IgnoreTests +import java.io.File import java.nio.file.Paths @@ -15,7 +17,7 @@ abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() { override fun doTest(beforeFileName: String) { IgnoreTests.runTestIfEnabledByFileDirective( Paths.get(beforeFileName), - enableTestDirective = IgnoreTests.DIRECTIVES.FIR_COMPARISON_MUTLTILINE_COMMENT, + enableTestDirective = IgnoreTests.DIRECTIVES.FIR_COMPARISON_MULTILINE_COMMENT, directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE, additionalFilesExtensions = arrayOf("after") ) { @@ -23,6 +25,15 @@ abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() { } } + override fun getAfterFileName(beforeFileName: String): String { + val firAfterFile = File(testPath(beforeFileName + ".fir.after")) + return if (firAfterFile.exists()) { + firAfterFile.name + } else { + super.getAfterFileName(beforeFileName) + } + } + // TODO: Enable these as more actions/inspections are enabled, and/or add more FIR-specific directives override fun checkForUnexpectedErrors() {} override fun checkAvailableActionsAreExpected(actions: List) {} diff --git a/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt b/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt index 07dc12cb1dd..b0efb028c1e 100644 --- a/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt +++ b/idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt @@ -170,7 +170,7 @@ object IgnoreTests { object DIRECTIVES { const val FIR_COMPARISON = "// FIR_COMPARISON" - const val FIR_COMPARISON_MUTLTILINE_COMMENT = "/* FIR_COMPARISON */" + const val FIR_COMPARISON_MULTILINE_COMMENT = "/* FIR_COMPARISON */" const val IGNORE_FIR = "// IGNORE_FIR" const val FIX_ME = "// FIX_ME: " } diff --git a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt index a09e7e6bd4d..f596c528519 100644 --- a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt +++ b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt @@ -2,4 +2,4 @@ class A() { abstract fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after index e5e38c11d67..6701f9c8659 100644 --- a/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after +++ b/idea/testData/quickfix/abstract/abstractFunctionInNonAbstractClass.kt.after @@ -2,4 +2,4 @@ class A() { fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt b/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt index c3779a41342..332f3655469 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInCompanionObject.kt @@ -8,4 +8,4 @@ class Owner { abstract val x: Int } } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt index f36bbe2aba0..a47f5f7ad4d 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt @@ -2,4 +2,4 @@ class A() { abstract var i : Int } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after index 4c0e5551c18..bb4b5b405bb 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass1.kt.after @@ -2,4 +2,4 @@ abstract class A() { abstract var i : Int } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt index 0eee94636cc..48d5285c98f 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt @@ -2,4 +2,4 @@ class A() { abstract var i : Int = 0 } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after index 5bf704d54aa..68e8cc772cd 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass2.kt.after @@ -2,4 +2,4 @@ class A() { var i : Int = 0 } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt index cc8b8c0ad6f..72926fc3369 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt @@ -2,4 +2,4 @@ public class A() { abstract var i : Int } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after index c6e9f139b96..02dcf43e416 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyInNonAbstractClass3.kt.after @@ -2,4 +2,4 @@ public abstract class A() { abstract var i : Int } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt index 97b88445cd5..67b8f784138 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt @@ -3,4 +3,4 @@ class B { abstract val i: Int = 0 get() = field } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after index 13b69dca120..814fcd8df0f 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after @@ -3,4 +3,4 @@ class B { val i: Int = 0 get() = field } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt index 59fc73a9e4f..ad44fc325c8 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt @@ -2,4 +2,4 @@ class A { abstract var i = 0 } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after index ae725ce1da9..742e0d21e94 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyWithInitializer1.kt.after @@ -2,4 +2,4 @@ class A { var i = 0 } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt index afc115a3608..ddfd942e895 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt @@ -3,4 +3,4 @@ class B { abstract var j: Int = 0 set(v: Int) {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after index b67e494c23e..f7bf68969b2 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyWithSetter.kt.after @@ -3,4 +3,4 @@ class B { var j: Int = 0 set(v: Int) {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt index 72c38a36528..580b039f070 100644 --- a/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt +++ b/idea/testData/quickfix/abstract/makeEnumEntryAbstract.kt @@ -7,4 +7,4 @@ enum class E { abstract fun foo() } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt b/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt index 6e697e2f6e2..00c00b07821 100644 --- a/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt +++ b/idea/testData/quickfix/abstract/makeInlineClassAbstract.kt @@ -10,4 +10,4 @@ interface I { } inline class A : I -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt b/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt index 476d90bb2ff..9ae6e1bf3d8 100644 --- a/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt +++ b/idea/testData/quickfix/abstract/makeObjectMemberAbstract.kt @@ -8,4 +8,4 @@ object O { fun foo() } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt b/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt index e43eb13e15e..fcf4ea00a7a 100644 --- a/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt +++ b/idea/testData/quickfix/abstract/makeTopLevelAbstract.kt @@ -6,4 +6,4 @@ // ERROR: Function 'foo' must have a body fun foo() -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/manyImpl.kt b/idea/testData/quickfix/abstract/manyImpl.kt index 8899a524ece..b8141607861 100644 --- a/idea/testData/quickfix/abstract/manyImpl.kt +++ b/idea/testData/quickfix/abstract/manyImpl.kt @@ -19,4 +19,4 @@ object Impl : D, E { } class X : D by Impl, E by Impl {} -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt index 97205fd65f1..e65dad7f76b 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt @@ -2,4 +2,4 @@ sealed class A() { fun i() : Int } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after index 225d9fb13e5..d008cc348e8 100644 --- a/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after +++ b/idea/testData/quickfix/abstract/mustBeInitializedOrBeAbstractInSealedClass.kt.after @@ -2,4 +2,4 @@ sealed class A() { abstract fun i() : Int } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt index a9518f7c369..7f2ce6a007d 100644 --- a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt +++ b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt @@ -2,4 +2,4 @@ class A() { fun foo() } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after index dd1e04bb937..ed303785cb1 100644 --- a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after +++ b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after @@ -2,4 +2,4 @@ class A() { fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/replaceOpen.kt b/idea/testData/quickfix/abstract/replaceOpen.kt index 388ace5b0b8..8d7828c66d9 100644 --- a/idea/testData/quickfix/abstract/replaceOpen.kt +++ b/idea/testData/quickfix/abstract/replaceOpen.kt @@ -2,4 +2,4 @@ abstract class B() { open fun foo() } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/replaceOpen.kt.after b/idea/testData/quickfix/abstract/replaceOpen.kt.after index 2f73a3f1d97..5bb50aaa194 100644 --- a/idea/testData/quickfix/abstract/replaceOpen.kt.after +++ b/idea/testData/quickfix/abstract/replaceOpen.kt.after @@ -2,4 +2,4 @@ abstract class B() { abstract fun foo() } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt b/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt index 154c200f5b9..f161cdc73ab 100644 --- a/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt +++ b/idea/testData/quickfix/expressions/fixNullableWithExclExclAbsentWithBadIterator.kt @@ -11,4 +11,4 @@ fun foo() { val test: Some? = Some() for (i in test) { } } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt index 4e245044c05..6f9cf01b6e8 100644 --- a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt +++ b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt @@ -3,4 +3,4 @@ abstract class My { abstract var foo: Int private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after index 259c816a112..29d1051f244 100644 --- a/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after +++ b/idea/testData/quickfix/modifiers/abstractVarWithPrivateSetter.kt.after @@ -3,4 +3,4 @@ abstract class My { abstract var foo: Int set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt index 5478726f260..8e4f899b641 100644 --- a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt +++ b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt @@ -4,4 +4,4 @@ class A() { abstract class C } } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after index 6703712237d..577a29a2460 100644 --- a/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after +++ b/idea/testData/quickfix/modifiers/nestedAbstractClass.kt.after @@ -4,4 +4,4 @@ class A() { abstract inner class C } } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt index 88c59ffa795..b631355d7ba 100644 --- a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt +++ b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt @@ -5,4 +5,4 @@ class A() { } } } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after index b537b39ae94..b0fec24835b 100644 --- a/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after +++ b/idea/testData/quickfix/modifiers/nestedClassNotAllowed.kt.after @@ -5,4 +5,4 @@ class A() { } } } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt index 15eae0fc04f..ef30238b69a 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt @@ -2,4 +2,4 @@ class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after index 49d1de567fd..b16d4d9c59d 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass1.kt.after @@ -2,4 +2,4 @@ open class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt index d1511b18ebf..03584cd287a 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt @@ -2,4 +2,4 @@ class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after index f4ab72f49e1..3ce1a9bd1e1 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass2.kt.after @@ -2,4 +2,4 @@ class A() { fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt index ac4d6a46f79..cba371c2891 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt @@ -2,4 +2,4 @@ public class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after index 6d9b4169765..1cc25429d40 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass3.kt.after @@ -2,4 +2,4 @@ public open class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt index 0f809fea999..2d52950e705 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt @@ -2,4 +2,4 @@ @Deprecated("") class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after index 283a5bdf267..d395c3b0500 100644 --- a/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after +++ b/idea/testData/quickfix/modifiers/openMemberInFinalClass4.kt.after @@ -3,4 +3,4 @@ open class A() { open fun foo() {} } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt index 99166a71575..dc8e55cd5ed 100644 --- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt +++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt @@ -3,4 +3,4 @@ open class My { open var foo = 42 private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after index 145fdf079e3..55ace69a4dc 100644 --- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after +++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter1.kt.after @@ -3,4 +3,4 @@ open class My { var foo = 42 private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt index ed42f792eba..da15282acf9 100644 --- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt +++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt @@ -3,4 +3,4 @@ open class My { open var foo = 42 private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after index 7bcf2ef5576..b4cb7407fae 100644 --- a/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after +++ b/idea/testData/quickfix/modifiers/openVarWithPrivateSetter2.kt.after @@ -3,4 +3,4 @@ open class My { open var foo = 42 set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt index 323dfa80c4a..6452aff1f92 100644 --- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt +++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt @@ -7,4 +7,4 @@ open class FooImpl : Foo { override var bar: String = "" private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after index b219f0c6f73..32b45a2ca4c 100644 --- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after +++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter1.kt.after @@ -7,4 +7,4 @@ open class FooImpl : Foo { final override var bar: String = "" private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt index 41a206cc411..37fe7be10d7 100644 --- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt +++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt @@ -7,4 +7,4 @@ open class FooImpl : Foo { override var bar: String = "" private set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after index 91809d7d35d..5754803ff68 100644 --- a/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after +++ b/idea/testData/quickfix/modifiers/overrideWithPrivateSetter2.kt.after @@ -7,4 +7,4 @@ open class FooImpl : Foo { override var bar: String = "" set } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt index e67faff7e96..37bd96308e2 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/cantChangeReturnTypeOfOverriddenFunction.kt @@ -12,4 +12,4 @@ interface C : A, B { override fun foo(): Long } -/* FIR_COMPARISON */ +/* FIR_COMPARISON */ \ No newline at end of file diff --git a/idea/testData/quickfix/replaceWithSafeCall/comment.kt b/idea/testData/quickfix/replaceWithSafeCall/comment.kt index 8f48b917d5d..0c277614b1e 100644 --- a/idea/testData/quickfix/replaceWithSafeCall/comment.kt +++ b/idea/testData/quickfix/replaceWithSafeCall/comment.kt @@ -5,4 +5,5 @@ fun foo(a: String?) { // comment2 .length } -/* FIR_COMPARISON */ \ No newline at end of file +// FIR_IDENTICAL +/* FIR_COMPARISON */ diff --git a/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after b/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after index 2b50aa5091c..1ba6dfa318f 100644 --- a/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after +++ b/idea/testData/quickfix/replaceWithSafeCall/comment.kt.after @@ -5,4 +5,5 @@ fun foo(a: String?) { // comment2 ?.length } -/* FIR_COMPARISON */ \ No newline at end of file +// FIR_IDENTICAL +/* FIR_COMPARISON */ diff --git a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt index dde03f04af6..8170f5a2f99 100644 --- a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt +++ b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt @@ -4,4 +4,5 @@ fun foo(a: String?) { val b = a .length } -/* FIR_COMPARISON */ \ No newline at end of file +// FIR_IDENTICAL +/* FIR_COMPARISON */ diff --git a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after index 19f89e8c0e3..faafd1d4c6e 100644 --- a/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after +++ b/idea/testData/quickfix/replaceWithSafeCall/lineBreak.kt.after @@ -4,4 +4,5 @@ fun foo(a: String?) { val b = a ?.length } -/* FIR_COMPARISON */ \ No newline at end of file +// FIR_IDENTICAL +/* FIR_COMPARISON */ diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt index 60c0c406b6a..4bb752736de 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt @@ -191,7 +191,7 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q ) } - myFixture.checkResultByFile(File(fileName).name + ".after") + myFixture.checkResultByFile(getAfterFileName(fileName)) if (stubComparisonFailure != null) { throw stubComparisonFailure @@ -201,6 +201,10 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q } } + protected open fun getAfterFileName(beforeFileName: String): String { + return File(beforeFileName).name + ".after" + } + @Throws(ClassNotFoundException::class) private fun checkForUnexpectedActions() { val text = myFixture.editor.document.text