FIR IDE: add possibility to have different testdata for fir & fe10 keyword tests

generators/idea-generator/tests/org/jetbrains/kotlin/generators/tests/idea/GenerateTests.kt

@@ -1216,7 +1216,7 @@ fun main(args: Array<String>) {
             }
 
             testClass<AbstractFirKeywordCompletionTest> {
-                model("keywords", recursive = false)
+                model("keywords", recursive = false, pattern = KT_WITHOUT_FIR_PREFIX)
             }
         }
 
@@ -1413,7 +1413,7 @@ fun main(args: Array<String>) {
             }
 
             testClass<AbstractKeywordCompletionTest> {
-                model("keywords", recursive = false)
+                model("keywords", recursive = false, pattern = KT_WITHOUT_FIR_PREFIX)
             }
 
             testClass<AbstractJvmWithLibBasicCompletionTest> {

generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TestGeneratorUtil.kt

@@ -14,6 +14,7 @@ object TestGeneratorUtil {
     @Language("RegExp") const val KT_OR_KTS_WITHOUT_DOTS_IN_NAME = """^([^.]+)\.(kt|kts)$"""
 
     @Language("RegExp") const val KT_WITHOUT_DOTS_IN_NAME = """^([^.]+)\.kt$"""
+    @Language("RegExp") const val KT_WITHOUT_FIR_PREFIX = """^(.+)(?<!\.fir)\.kt$"""
 
     @JvmStatic
     fun escapeForJavaIdentifier(fileName: String): String {

idea/idea-completion/testData/keywords/AfterClassName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class Foo <caret> {
 }

idea/idea-completion/testData/keywords/AfterClassProperty.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/AfterClasses.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/AfterClasses_LangLevel10.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class A {
     fun foo() {

idea/idea-completion/testData/keywords/AfterClasses_LangLevel11.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class A {
     fun foo() {

idea/idea-completion/testData/keywords/AfterDot.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     val str : String

idea/idea-completion/testData/keywords/AfterFuns.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/AfterIf.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun some() {
 

idea/idea-completion/testData/keywords/AfterSafeDot.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     val str : String?

idea/idea-completion/testData/keywords/AfterSpaceAndDot.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     val str : String

idea/idea-completion/testData/keywords/AfterTryCatch.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     try {

idea/idea-completion/testData/keywords/AfterTryFinally.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     try {

idea/idea-completion/testData/keywords/BeforeClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 e<caret>class A {
 }

idea/idea-completion/testData/keywords/BeforeDelegationCall.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class A(x: Int) {
     constructor(): <caret>

idea/idea-completion/testData/keywords/BreakContinue.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     myFor@

idea/idea-completion/testData/keywords/CommaExpected.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     Math.pow(2.0 <caret>)

idea/idea-completion/testData/keywords/CompanionObjectBeforeObject.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class TestClass {
     <caret>

idea/idea-completion/testData/keywords/Else1.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(p: Int) {
     if (p > 0) {

idea/idea-completion/testData/keywords/Else2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(p: Int) {
     if (p > 0)

idea/idea-completion/testData/keywords/FileKeyword.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 @<caret>[]
 

idea/idea-completion/testData/keywords/FixingLayoutAndReturn.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     куе<caret>

idea/idea-completion/testData/keywords/GlobalPropertyAccessors.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/IfTryCatch.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(p: Int) {
     if (p > 0)

idea/idea-completion/testData/keywords/InAnnotationClassScope.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/InArgumentList.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(p: Int) {
     x()

idea/idea-completion/testData/keywords/InBlockComment.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class TestClass {
     /* <caret> */

idea/idea-completion/testData/keywords/InChar.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class TestClass {
     fun test() {

idea/idea-completion/testData/keywords/InClassBeforeFun.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/InClassNoCompletionInValName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class Test {
     val <caret>

idea/idea-completion/testData/keywords/InClassProperty.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class MouseMovedEventArgs
 {

idea/idea-completion/testData/keywords/InClassScope.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/InClassTypeParameters.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class T<<caret>>
 

idea/idea-completion/testData/keywords/InCodeBlock.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     <caret>

idea/idea-completion/testData/keywords/InElse.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun some() {
 

idea/idea-completion/testData/keywords/InEnumScope1.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 enum class Test {
     <caret>

idea/idea-completion/testData/keywords/InEnumScope2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/InFunctionExpressionBody.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() = <caret>
 

idea/idea-completion/testData/keywords/InFunctionName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun <caret>() {
 

idea/idea-completion/testData/keywords/InFunctionRecieverType.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun <caret>.
 

idea/idea-completion/testData/keywords/InFunctionTypePosition.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     val test : <caret>

idea/idea-completion/testData/keywords/InGetterExpressionBody.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 val prop: Int
     get() = <caret>

idea/idea-completion/testData/keywords/InIf.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun some() {
 

idea/idea-completion/testData/keywords/InInterfaceScope.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/InMemberFunParametersList.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 package TestData
 

idea/idea-completion/testData/keywords/InModifierListInsideClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // for: KT-2170
 open class Foo {

idea/idea-completion/testData/keywords/InNotFinishedGenericWithFunAfter.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class Test<<caret>
 

idea/idea-completion/testData/keywords/InObjectScope.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/InParameterDefaultValue.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(p: Int = <caret>)
 

idea/idea-completion/testData/keywords/InPrimaryConstructorParametersList.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 package TestData
 

idea/idea-completion/testData/keywords/InPropertyInitializer.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 var a : Int = <caret>
 

idea/idea-completion/testData/keywords/InPropertyTypeReference.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 val e.<caret>
 

idea/idea-completion/testData/keywords/InString.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class TestClass {
     fun test() {

idea/idea-completion/testData/keywords/InTopFunParametersList.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(<caret>) {
 

idea/idea-completion/testData/keywords/InTopScopeAfterPackage.kt

@@ -1,4 +1,5 @@
 // FIR_COMPARISON
+// FIR_IDENTICAL
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 
 package Test

idea/idea-completion/testData/keywords/InTypePosition.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 val a : <caret>
 

idea/idea-completion/testData/keywords/LabeledLambdaThis.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): String.() -> Unit {
     return (label@ {

idea/idea-completion/testData/keywords/LineComment.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class TestClass {
     // <caret>

idea/idea-completion/testData/keywords/NoBreak1.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     myFor@

idea/idea-completion/testData/keywords/NoBreak2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     myFor@

idea/idea-completion/testData/keywords/NoCompanionThis.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class C {
     fun foo() {

idea/idea-completion/testData/keywords/NoCompletionForCapitalPrefix.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 P<caret>
 

idea/idea-completion/testData/keywords/NoContinue.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     myFor@

idea/idea-completion/testData/keywords/NoFinalInParameterList.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(f<caret>
 

idea/idea-completion/testData/keywords/NotInNotIs.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(v: String) {
     if (v !<caret>)

idea/idea-completion/testData/keywords/NotInNotIs2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     list.filter { it !i<caret> }

idea/idea-completion/testData/keywords/PrefixMatcher.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // test that sinple prefix matching is used for keywords
 

idea/idea-completion/testData/keywords/PropertyAccessors.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/PropertyAccessors2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/PropertySetter.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/Receiver.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun @<caret>
 

idea/idea-completion/testData/keywords/Return1.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     takeHandler1 {

idea/idea-completion/testData/keywords/Return2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     takeHandler1 {

idea/idea-completion/testData/keywords/Return3.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     takeHandler1 {

idea/idea-completion/testData/keywords/Return4.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     takeHandler label@ {

idea/idea-completion/testData/keywords/Return5.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     takeHandler label@ {

idea/idea-completion/testData/keywords/Return7.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 val property: Int
     get() {

idea/idea-completion/testData/keywords/Return8.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(p: Int?): Int = p ?: <caret>
 

idea/idea-completion/testData/keywords/Return9.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 inline fun run (p: () -> Unit) {}
 

idea/idea-completion/testData/keywords/ReturnBoolean.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): Boolean {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnCollection.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): Collection<String> {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnIterable.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): Iterable<String> {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnKeywordName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo() {
     `fun` {

idea/idea-completion/testData/keywords/ReturnList.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): List<String> {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnNotNull.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): String {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnNull.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): String? {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnNullableBoolean.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun foo(): Boolean? {
     ret<caret>

idea/idea-completion/testData/keywords/ReturnSet.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun<T> foo(): Set<T> {
     ret<caret>

idea/idea-completion/testData/keywords/SealedForAlreadySealed.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret> sealed class A
 // ABSENT: "sealed"

idea/idea-completion/testData/keywords/SealedForAnnotationClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret> annotation class A
 // ABSENT: "sealed"

idea/idea-completion/testData/keywords/SealedForDataClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret> data class A(val f: Int)
 // ABSENT: "sealed"

idea/idea-completion/testData/keywords/SealedForDeclaredClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret>class A
 // EXIST: "sealed"

idea/idea-completion/testData/keywords/SealedForDeclaredInterface.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret>interface A
 // EXIST: "sealed"

idea/idea-completion/testData/keywords/SealedForEnumClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret> enum class A
 // ABSENT: "sealed"

idea/idea-completion/testData/keywords/SealedForFunInterface.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret> fun interface A {
     fun aFunction()

idea/idea-completion/testData/keywords/SealedForInnerClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 class A {
     seal<caret>inner class B

idea/idea-completion/testData/keywords/SealedForOpenClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 seal<caret> open class A
 // ABSENT: "sealed"

idea/idea-completion/testData/keywords/SealedWithName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects
 

idea/idea-completion/testData/keywords/SealedWithoutName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 // COMPILER_ARGUMENTS: -XXLanguage:+SealedInterfaces -XXLanguage:+MultiPlatformProjects