[FIR Completion] Enable basic insertion handler tests for FIR completion

Enable tests that are passing

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -51,10 +51,7 @@ import org.jetbrains.kotlin.idea.codeInsight.surroundWith.AbstractSurroundWithTe
 import org.jetbrains.kotlin.idea.codeInsight.unwrap.AbstractUnwrapRemoveTest
 import org.jetbrains.kotlin.idea.completion.AbstractHighLevelJvmBasicCompletionTest
 import org.jetbrains.kotlin.idea.completion.test.*
-import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractBasicCompletionHandlerTest
+import org.jetbrains.kotlin.idea.completion.test.handlers.*
-import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractCompletionCharFilterTest
-import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordCompletionHandlerTest
-import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
 import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
 import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.idea.configuration.AbstractGradleConfigureProjectByChangingFileTest
@@ -1067,6 +1064,10 @@ fun main(args: Array<String>) {
                 model("basic/common")
                 model("basic/java")
             }
+
+            testClass<AbstractHighLevelBasicCompletionHandlerTest> {
+                model("handlers/basic", pattern = KT_WITHOUT_DOTS_IN_NAME)
+            }
         }
 
         testGroup("idea/idea-fir/tests", "idea/testData/findUsages") {

idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class AClass {
     companion object {}
 }

idea/idea-completion/testData/handlers/basic/ClassWithClassObject.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class AClass {
     companion object {}
 }

idea/idea-completion/testData/handlers/basic/DoNotUseParenthesisOnNextLine.kt

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

idea/idea-completion/testData/handlers/basic/DoNotUseParenthesisOnNextLine.kt.after

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

idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T> foo() {}
 
 fun use() = f<caret><String>()

idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T> foo() {}
 
 fun use() = foo<String>()<caret>

idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab2.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T> foo() {}
 
 fun use() = f<caret> <String>()

idea/idea-completion/testData/handlers/basic/GenericFunctionWithTab2.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T> foo() {}
 
 fun use() = foo <String>()<caret>

idea/idea-completion/testData/handlers/basic/KT19863.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package test
 
 fun `backticked`() {}

idea/idea-completion/testData/handlers/basic/KT19863.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package test
 
 fun `backticked`() {}

idea/idea-completion/testData/handlers/basic/KT19864.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package test
 
 fun `backticked~name`() {}

idea/idea-completion/testData/handlers/basic/KT19864.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package test
 
 fun `backticked~name`() {}

idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByPropertyArgs.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     val bar: Int
 }

idea/idea-completion/testData/handlers/basic/ReplaceFunctionCallByPropertyArgs.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 class C {
     val bar: Int
 }

idea/idea-completion/testData/handlers/basic/TypeParameter.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package xxx
 
 class A<T> {

idea/idea-completion/testData/handlers/basic/TypeParameter.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package xxx
 
 class A<T> {

idea/idea-completion/testData/handlers/basic/callableReference/ClassConstructor.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package ppp
 
 class X(p: Int)

idea/idea-completion/testData/handlers/basic/callableReference/ClassConstructor.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package ppp
 
 class X(p: Int)

idea/idea-completion/testData/handlers/basic/callableReference/Property.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 val prop: Int = 0
 
 class C {

idea/idea-completion/testData/handlers/basic/callableReference/Property.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 val prop: Int = 0
 
 class C {

idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertWhenNoSpacesForBraces.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // CODE_STYLE_SETTING: INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD = false
 
 fun main(args: Array<String>) {

idea/idea-completion/testData/handlers/basic/highOrderFunctions/FunctionLiteralInsertWhenNoSpacesForBraces.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 // CODE_STYLE_SETTING: INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD = false
 
 fun main(args: Array<String>) {

idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArg.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun main(args: Array<String>) {
     args.filter<caret> {it != ""}
 }

idea/idea-completion/testData/handlers/basic/highOrderFunctions/HigherOrderFunctionWithArg.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun main(args: Array<String>) {
     args.filterNot {<caret>it != ""}
 }

idea/idea-completion/testData/handlers/basic/highOrderFunctions/ParameterTypeIsDerivedFromFunction.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 interface I : () -> Unit
 
 fun foo(i: I){}

idea/idea-completion/testData/handlers/basic/highOrderFunctions/ParameterTypeIsDerivedFromFunction.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 interface I : () -> Unit
 
 fun foo(i: I){}

idea/idea-completion/testData/handlers/basic/importAliases/KDoc.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 import java.sql.Date as SqlDate
 
 /**

idea/idea-completion/testData/handlers/basic/importAliases/KDoc.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 import java.sql.Date as SqlDate
 
 /**

idea/idea-completion/testData/handlers/basic/stringTemplate/3.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package ppp
 
 fun foo(): String {

idea/idea-completion/testData/handlers/basic/stringTemplate/3.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package ppp
 
 fun foo(): String {

idea/idea-completion/testData/handlers/basic/stringTemplate/4.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(param: Any): String {
     val s = "${<caret>}"
 }

idea/idea-completion/testData/handlers/basic/stringTemplate/4.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(param: Any): String {
     val s = "${param<caret>}"
 }

idea/idea-completion/testData/handlers/basic/stringTemplate/GlobalVal.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package p
 
 val vvv = 1

idea/idea-completion/testData/handlers/basic/stringTemplate/GlobalVal.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package p
 
 val vvv = 1

idea/idea-completion/testData/handlers/basic/stringTemplate/GlobalValInCurlyBraces.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package p
 
 val vvv = 1

idea/idea-completion/testData/handlers/basic/stringTemplate/GlobalValInCurlyBraces.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 package p
 
 val vvv = 1

idea/idea-completion/testData/handlers/basic/typeArgsForCall/AfterElse.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(list: List<String>, b: Boolean) {
     val v = if (b) list else emp<caret>
 }

idea/idea-completion/testData/handlers/basic/typeArgsForCall/AfterElse.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(list: List<String>, b: Boolean) {
     val v = if (b) list else emptyList()<caret>
 }

idea/idea-completion/testData/handlers/basic/typeArgsForCall/AfterElvis.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(list: List<String>?) {
     val v = list ?: emp<caret>
 }

idea/idea-completion/testData/handlers/basic/typeArgsForCall/AfterElvis.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun foo(list: List<String>?) {
     val v = list ?: emptyList()<caret>
 }

idea/idea-completion/testData/handlers/basic/typeArgsForCall/HasExpectedType.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 public inline fun <reified T> Iterable<*>.myFirstIsInstance(): T { }
 
 fun foo(list: List<Any>): String {

idea/idea-completion/testData/handlers/basic/typeArgsForCall/HasExpectedType.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 public inline fun <reified T> Iterable<*>.myFirstIsInstance(): T { }
 
 fun foo(list: List<Any>): String {

idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab2.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 inline fun <reified R> Iterable<*>.myFilterIsInstance(): List<R> {
     return filterIsInstanceTo(ArrayList<R>())
 }

idea/idea-completion/testData/handlers/basic/typeArgsForCall/ReplaceByTab2.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 inline fun <reified R> Iterable<*>.myFilterIsInstance(): List<R> {
     return filterIsInstanceTo(ArrayList<R>())
 }

idea/idea-completion/testData/handlers/basic/typeArgsForCall/TypeArgumentsFromParameters.kt

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T1, T2> T1.foo(t: T2): T2 = t
 
 fun foo() {

idea/idea-completion/testData/handlers/basic/typeArgsForCall/TypeArgumentsFromParameters.kt.after

@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 fun <T1, T2> T1.foo(t: T2): T2 = t
 
 fun foo() {

idea/idea-fir/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractHighLevelBasicCompletionHandlerTest.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.completion.test.handlers
+
+import org.jetbrains.kotlin.idea.completion.FIR_COMPARISON
+import org.jetbrains.kotlin.idea.completion.runTestWithCustomEnableDirective
+
+abstract class AbstractHighLevelBasicCompletionHandlerTest : AbstractBasicCompletionHandlerTest() {
+    override val captureExceptions: Boolean = false
+
+    override fun doTest(testPath: String) {
+        runTestWithCustomEnableDirective(FIR_COMPARISON, testDataFile()) { super.doTest(testPath) }
+    }
+}