FIR IDE: enable override implement test for FIR

idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirJava8OverrideImplementTest.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2021 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.codeinsight
+
+import org.jetbrains.kotlin.idea.codeInsight.Java8OverrideImplementTest
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
+import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
+
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
+internal class FirJava8OverrideImplementTest : Java8OverrideImplementTest<KtClassMember>(), FirOverrideImplementTestMixIn {
+    override fun isFirPlugin(): Boolean = true
+
+    override fun tearDown() {
+        project.invalidateCaches(file as? KtFile)
+        super.tearDown()
+    }
+}
+

idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTest.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2021 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.codeinsight
+
+import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTest
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
+import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
+
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
+internal class FirOverrideImplementTest : OverrideImplementTest<KtClassMember>(), FirOverrideImplementTestMixIn {
+    override fun isFirPlugin(): Boolean = true
+
+    override fun tearDown() {
+        project.invalidateCaches(file as? KtFile)
+        super.tearDown()
+    }
+}
+

idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementTestMixIn.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2021 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.codeinsight
+
+import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementTestMixIn
+import org.jetbrains.kotlin.idea.core.overrideImplement.AbstractGenerateMembersHandler
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtImplementMembersHandler
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtOverrideMembersHandler
+import org.jetbrains.kotlin.idea.frontend.api.analyse
+import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
+import org.jetbrains.kotlin.idea.frontend.api.tokens.HackToForceAllowRunningAnalyzeOnEDT
+import org.jetbrains.kotlin.idea.frontend.api.tokens.hackyAllowRunningOnEdt
+import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.name.StandardClassIds
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtFile
+
+internal interface FirOverrideImplementTestMixIn : OverrideImplementTestMixIn<KtClassMember> {
+    override fun createImplementMembersHandler(): AbstractGenerateMembersHandler<KtClassMember> = KtImplementMembersHandler()
+
+    override fun createOverrideMembersHandler(): AbstractGenerateMembersHandler<KtClassMember> = KtOverrideMembersHandler()
+
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
+    override fun isMemberOfAny(parentClass: KtClassOrObject, chooserObject: KtClassMember): Boolean {
+        return hackyAllowRunningOnEdt {
+            analyse(parentClass) {
+                chooserObject.symbol.callableIdIfNonLocal?.classId == StandardClassIds.Any
+            }
+        }
+    }
+
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
+    override fun getMemberName(parentClass: KtClassOrObject, chooserObject: KtClassMember): String {
+        return hackyAllowRunningOnEdt {
+            analyse(parentClass) {
+                (chooserObject.symbol as? KtNamedSymbol)?.name?.asString() ?: ""
+            }
+        }
+    }
+
+    @OptIn(HackToForceAllowRunningAnalyzeOnEDT::class)
+    override fun getContainingClassName(parentClass: KtClassOrObject, chooserObject: KtClassMember): String {
+        return hackyAllowRunningOnEdt {
+            analyse(parentClass) {
+                chooserObject.symbol.callableIdIfNonLocal?.classId?.shortClassName?.asString() ?: ""
+            }
+        }
+    }
+}

idea/idea-fir/tests/org/jetbrains/kotlin/codeinsight/FirOverrideImplementWithLibTest.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2021 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.codeinsight
+
+import org.jetbrains.kotlin.idea.codeInsight.OverrideImplementWithLibTest
+import org.jetbrains.kotlin.idea.core.overrideImplement.KtClassMember
+import org.jetbrains.kotlin.idea.invalidateCaches
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
+import org.junit.runner.RunWith
+
+@RunWith(JUnit3WithIdeaConfigurationRunner::class)
+internal class FirOverrideImplementWithLibTest : OverrideImplementWithLibTest<KtClassMember>(), FirOverrideImplementTestMixIn {
+    override fun isFirPlugin(): Boolean = true
+
+    override fun tearDown() {
+        project.invalidateCaches(file as? KtFile)
+        super.tearDown()
+    }
+}
+

idea/idea-frontend-independent/tests/org/jetbrains/kotlin/test/uitls/IgnoreTests.kt

@@ -204,22 +204,22 @@ object IgnoreTests {
     }
 
 
-    fun cleanUpIdenticalFirTestFile(originalTestFile: File) {
+    fun cleanUpIdenticalFirTestFile(
-        val firTestFile = deriveFirTestFile(originalTestFile)
+        originalTestFile: File,
+        firTestFile: File = deriveFirTestFile(originalTestFile),
+        additionalFileToMarkFirIdentical: File? = null
+    ) {
         if (firTestFile.exists() && firTestFile.readText().trim() == originalTestFile.readText().trim()) {
             val message = if (isTeamCityBuild) {
-                "Please remove .fir.kt dump and add // FIR_IDENTICAL to test source"
+                "Please remove $firTestFile and add // FIR_IDENTICAL to test source file $originalTestFile"
             } else {
                 // The FIR test file is identical with the original file. We should remove the FIR file and mark "FIR_IDENTICAL" in the
                 // original file
                 firTestFile.delete()
-                val content = originalTestFile.readText()
+                originalTestFile.prependFirIdentical()
-                originalTestFile.writer().use {
+                additionalFileToMarkFirIdentical?.prependFirIdentical()
-                    it.appendLine(DIRECTIVES.FIR_IDENTICAL)
-                    it.append(content)
-                }
 
-                "Deleted .fir.kt dump, added // FIR_IDENTICAL to test source"
+                "Deleted $firTestFile, added // FIR_IDENTICAL to test source file $originalTestFile"
             }
             KtAssert.fail(
                 """
@@ -231,6 +231,14 @@ object IgnoreTests {
         }
     }
 
+    private fun File.prependFirIdentical() {
+        val content = readText()
+        writer().use {
+            it.appendLine(DIRECTIVES.FIR_IDENTICAL)
+            it.append(content)
+        }
+    }
+
     private fun deriveFirTestFile(originalTestFile: File) =
         originalTestFile.parentFile.resolve(originalTestFile.name.removeSuffix(".kt") + ".fir.kt")
 }

idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/testUtils.kt

@@ -5,10 +5,12 @@
 
 package org.jetbrains.kotlin.idea.test
 
+import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.testFramework.LightPlatformTestCase
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
@@ -17,7 +19,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithContent
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
-import java.util.*
 
 fun KtFile.dumpTextWithErrors(ignoreErrors: Set<DiagnosticFactory<*>> = emptySet()): String {
     val text = text
@@ -31,6 +32,13 @@ fun KtFile.dumpTextWithErrors(ignoreErrors: Set<DiagnosticFactory<*>> = emptySet
     return header + text
 }
 
+fun JavaCodeInsightTestFixture.dumpErrorLines(): List<String> {
+    if (InTextDirectivesUtils.isDirectiveDefined(file.text, "// DISABLE-ERRORS")) return emptyList()
+    return doHighlighting().filter { it.severity == HighlightSeverity.ERROR }.map {
+        "// ERROR: ${it.description.replace('\n', ' ')}"
+    }
+}
+
 fun closeAndDeleteProject() = LightPlatformTestCase.closeAndDeleteProject()
 
 fun invalidateLibraryCache(project: Project) {

idea/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface T {
     fun getFoo(): String = ""
 }

idea/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface T {
     fun getFoo(): String = ""
 }

idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after

@@ -1,5 +1,5 @@
-// ERROR: Conflicting overloads: public open fun foo(): Unit defined in C, public open fun foo(): Unit defined in C
+// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: public open fun foo(): Unit defined in C, public open fun foo(): Unit defined in C
-// ERROR: Conflicting overloads: public open fun foo(): Unit defined in C, public open fun foo(): Unit defined in C
+// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: public open fun foo(): Unit defined in C, public open fun foo(): Unit defined in C
 interface I {
     open fun foo(){}
 }

idea/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after

@@ -0,0 +1,31 @@
+// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: [/C.foo]
+// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: [/C.foo]
+interface I {
+    open fun foo(){}
+}
+
+open class A {
+    open fun foo(){}
+}
+
+class C : A(), I {
+    override fun equals(other: Any?): Boolean {
+        <selection><caret>return super.equals(other)</selection>
+    }
+
+    override fun foo() {
+        super<A>.foo()
+    }
+
+    override fun foo() {
+        super<I>.foo()
+    }
+
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun toString(): String {
+        return super.toString()
+    }
+}

idea/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.fir.after

@@ -0,0 +1,10 @@
+import androidx.annotation.RecentlyNonNull
+import androidx.annotation.RecentlyNullable
+import foo.A
+
+class B : A() {
+    @RecentlyNonNull
+    override fun foo(@RecentlyNonNull s1: String, @RecentlyNullable s2: String?): String {
+        <selection><caret>return super.foo(s1, s2)</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/complexMultiOverride.kt.fir.after

@@ -0,0 +1,30 @@
+open class Base<A, B, C>() {
+    open val method : (A?) -> A = { it!! }
+    open fun foo(value : B) : B = value
+    open fun bar(value : () -> C) : (String) -> C = { value() }
+}
+
+class C : Base<String, C, Unit>() {
+    override fun bar(value: () -> Unit): (String) -> Unit {
+        <selection><caret>return super.bar(value)</selection>
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return super.equals(other)
+    }
+
+    override fun foo(value: C): C {
+        return super.foo(value)
+    }
+
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override val method: (String?) -> String
+        get() = method
+
+    override fun toString(): String {
+        return super.toString()
+    }
+}

idea/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // COPY_DOC
 
 import foo.A

idea/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // COPY_DOC
 
 import foo.A

idea/testData/codeInsight/overrideImplement/copyExperimental.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // DISABLE-ERRORS
 
 @RequiresOptIn

idea/testData/codeInsight/overrideImplement/copyExperimental.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // DISABLE-ERRORS
 
 @RequiresOptIn

idea/testData/codeInsight/overrideImplement/copyKDoc.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // COPY_DOC
 abstract class A {
     /**

idea/testData/codeInsight/overrideImplement/copyKDoc.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // COPY_DOC
 abstract class A {
     /**

idea/testData/codeInsight/overrideImplement/dataClassEquals.kt.fir.after

@@ -0,0 +1,5 @@
+data class Foo(val name: String) {
+    override fun equals(other: Any?): Boolean {
+        <selection><caret>return super.equals(other)</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/defaultValues.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface T {
     fun foo(a:Int = 1)
 }

idea/testData/codeInsight/overrideImplement/defaultValues.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface T {
     fun foo(a:Int = 1)
 }

idea/testData/codeInsight/overrideImplement/delegatedMembers.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface T {
     fun foo()
     fun bar()

idea/testData/codeInsight/overrideImplement/delegatedMembers.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface T {
     fun foo()
     fun bar()

idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A {
     fun a(){}
     fun b(){}

idea/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A {
     fun a(){}
     fun b(){}

idea/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A<T> {
 }
 

idea/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A<T> {
 }
 

idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // From KT-1254
 interface T {
     fun Foo() : (String) -> Unit

idea/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // From KT-1254
 interface T {
     fun Foo() : (String) -> Unit

idea/testData/codeInsight/overrideImplement/enumClass.kt

@@ -1 +1,2 @@
+// FIR_IDENTICAL
 enum <caret>class Foo

idea/testData/codeInsight/overrideImplement/enumClass.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 enum class Foo {
     ;
 

idea/testData/codeInsight/overrideImplement/enumClass2.kt

@@ -1,2 +1,3 @@
+// FIR_IDENTICAL
 enum <caret>class Foo {
 }

idea/testData/codeInsight/overrideImplement/enumClass2.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 enum class Foo {
     ;
 

idea/testData/codeInsight/overrideImplement/enumClass3.kt

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

idea/testData/codeInsight/overrideImplement/enumClass3.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 enum class Foo {
     A;
 

idea/testData/codeInsight/overrideImplement/enumClass4.kt

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

idea/testData/codeInsight/overrideImplement/enumClass4.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 enum class Foo {
     A;
 

idea/testData/codeInsight/overrideImplement/equalsInInterface.kt.fir.after

@@ -0,0 +1,5 @@
+interface A
+
+interface B : A {
+    override fun equals(other: Any?): Boolean<caret>
+}

idea/testData/codeInsight/overrideImplement/escapeIdentifiers.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A {
     open fun foo(`object` : Any): Int = 0
 }

idea/testData/codeInsight/overrideImplement/escapeIdentifiers.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A {
     open fun foo(`object` : Any): Int = 0
 }

idea/testData/codeInsight/overrideImplement/functionMethod.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // From KT-1254
 interface T {
     fun Foo() : (String) -> Unit

idea/testData/codeInsight/overrideImplement/functionMethod.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // From KT-1254
 interface T {
     fun Foo() : (String) -> Unit

idea/testData/codeInsight/overrideImplement/functionProperty.kt.fir.after

@@ -0,0 +1,13 @@
+// From KT-1648
+interface A {
+    val method:() -> Unit?
+}
+
+fun some() : A {
+    return object : A {
+        override val method: () -> kotlin.Unit?
+            get() = <selection><caret>TODO("Not yet implemented")</selection>
+    }
+}
+
+// TODO: need better selection and caret

idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Trait {
     fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>
 }

idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Trait {
     fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>
 }

idea/testData/codeInsight/overrideImplement/generateMulti.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package something
 
 interface Some<T> {

idea/testData/codeInsight/overrideImplement/generateMulti.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package something
 
 interface Some<T> {

idea/testData/codeInsight/overrideImplement/genericMethod.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface G<T> {
     fun foo(t : T) : T
 }

idea/testData/codeInsight/overrideImplement/genericMethod.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface G<T> {
     fun foo(t : T) : T
 }

idea/testData/codeInsight/overrideImplement/genericSuperClass.kt.fir.after

@@ -0,0 +1,9 @@
+
+import org.jetbrains.annotations.NotNull
+
+abstract class X : java.util.ArrayList<String>(), Runnable {
+    @NotNull
+    override fun iterator(): MutableIterator<String?> {
+        <selection><caret>return super.iterator()</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // from KT-488
 
 class MyClass<A: Comparable<A>> : Iterable<A> {

idea/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // from KT-488
 
 class MyClass<A: Comparable<A>> : Iterable<A> {

idea/testData/codeInsight/overrideImplement/implementFromClassName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Runnable {
     fun run()
 }

idea/testData/codeInsight/overrideImplement/implementFromClassName.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Runnable {
     fun run()
 }

idea/testData/codeInsight/overrideImplement/implementFromClassName2.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun a1()
     fun a2()

idea/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun a1()
     fun a2()

idea/testData/codeInsight/overrideImplement/implementFromClassName3.kt.fir.after

@@ -0,0 +1,42 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class Test : A {
+    override fun a6() {
+    }
+
+    override fun a7() {
+        <selection><caret>TODO("Not yet implemented")</selection>
+    }
+
+    override fun a8() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a1() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a2() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a3() {
+    }
+
+    override fun a4() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a5() {
+        TODO("Not yet implemented")
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName4.kt.fir.after

@@ -0,0 +1,41 @@
+interface A {
+    fun a1()
+    fun a2()
+    fun a3()
+    fun a4()
+    fun a5()
+    fun a6()
+    fun a7()
+    fun a8()
+}
+
+class Test : A {
+    override fun a4() {
+    }
+
+    override fun a5() {
+        <selection><caret>TODO("Not yet implemented")</selection>
+    }
+
+    override fun a6() {
+    }
+
+    override fun a7() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a8() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a1() {
+        TODO("Not yet implemented")
+    }
+
+    override fun a2() {
+    }
+
+    override fun a3() {
+        TODO("Not yet implemented")
+    }
+}

idea/testData/codeInsight/overrideImplement/implementFromClassName5.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun a1()
     fun a2()

idea/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun a1()
     fun a2()

idea/testData/codeInsight/overrideImplement/implementFromClassName6.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun a1()
     fun a2()

idea/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun a1()
     fun a2()

idea/testData/codeInsight/overrideImplement/implementFunctionType.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class C : (String) -> Boolean {
     <caret>
 }

idea/testData/codeInsight/overrideImplement/implementFunctionType.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class C : (String) -> Boolean {
     override fun invoke(p1: String): Boolean {
         <selection><caret>TODO("Not yet implemented")</selection>

idea/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.fir.after

@@ -0,0 +1,12 @@
+// ERROR: Unexpected tokens
+// ERROR: Unexpected token
+// ERROR: Unexpected token
+// ERROR: Unexpected token
+import foo.A
+import foo.B
+
+class C : A() {
+    override fun foo(x: (Mutable)List<String!>!, y: String!): B<String?>? {
+        <selection><caret>TODO("Not yet implemented")</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.fir.after

@@ -0,0 +1,8 @@
+// ERROR: Unexpected token
+package foo
+
+class Impl: B {
+    override fun foo(r: Runnable!) {
+        <selection><caret>TODO("Not yet implemented")</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.fir.after

@@ -0,0 +1,7 @@
+import foo.Intf
+
+class Impl(): Intf {
+    override fun getFooBar(): String? {
+        <selection><caret>TODO("Not yet implemented")</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package foo
 
 class <caret>Impl : TestJavaInterface {

idea/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package foo
 
 class Impl : TestJavaInterface {

idea/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.fir.after

@@ -0,0 +1,9 @@
+package foo
+
+import foo.Intf
+
+class Impl(): Intf() {
+    override fun getFooBar(): String? {
+        <selection><caret>return super.getFooBar()</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.fir.after

@@ -0,0 +1,9 @@
+package foo
+
+import foo.Intf
+
+class Impl(): Intf() {
+    override fun getFooBar(): String? {
+        <selection><caret>return super.getFooBar()</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.fir.after

@@ -0,0 +1,11 @@
+// ERROR: Unexpected tokens
+// ERROR: Unexpected token
+// ERROR: Unexpected token
+// ERROR: Unexpected token
+import foo.Intf
+
+class Impl(): Intf {
+    override fun fooBar(i: Int, s: Array<(out) String!>!, foo: Any!) {
+        <selection><caret>TODO("Not yet implemented")</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt.fir.after

@@ -0,0 +1,9 @@
+import foo.A
+import javax.annotation.Nonnull
+
+class B : A() {
+    @Nonnull
+    override fun foo(@Nonnull s: String): String {
+        <selection><caret>return super.foo(s)</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.fir.after

@@ -0,0 +1,8 @@
+
+import java.util.stream.Stream
+
+abstract class A : List<String> {
+    override fun stream(): Stream<String?> {
+        <selection><caret>return super.stream()</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/localClass.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 abstract class C<A> {
     abstract fun f(a: A)
 }

idea/testData/codeInsight/overrideImplement/localClass.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 abstract class C<A> {
     abstract fun f(a: A)
 }

idea/testData/codeInsight/overrideImplement/multiOverride.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun foo(value : String) : Int = 0
     fun bar() : String = "hello"

idea/testData/codeInsight/overrideImplement/multiOverride.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun foo(value : String) : Int = 0
     fun bar() : String = "hello"

idea/testData/codeInsight/overrideImplement/multipleSupers.kt

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

idea/testData/codeInsight/overrideImplement/multipleSupers.kt.after

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

idea/testData/codeInsight/overrideImplement/noAnyMembersInInterface.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface I {
     <caret>
 }

idea/testData/codeInsight/overrideImplement/noAnyMembersInInterface.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface I {
     <caret>
 }

idea/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt.fir.after

@@ -0,0 +1,10 @@
+// ERROR: Unexpected token
+import foo.A
+import org.jetbrains.annotations.Nullable
+
+class B : A() {
+    @Nullable
+    override fun foo(s: String!): String? {
+        <selection><caret>return super.foo(s)</selection>
+    }
+}

idea/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface IBase {
     fun foo(): Any?
 }

idea/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface IBase {
     fun foo(): Any?
 }

idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun String.foo()
 }

idea/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     fun String.foo()
 }

idea/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A {
     open fun Int.foo(): Int {
         return 0

idea/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class A {
     open fun Int.foo(): Int {
         return 0

idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     val String.prop : Int
 }

idea/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A {
     val String.prop : Int
 }

idea/testData/codeInsight/overrideImplement/overrideExternalFunction.kt

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

idea/testData/codeInsight/overrideImplement/overrideExternalFunction.kt.after

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

idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Some {
     fun foo()
 }

idea/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Some {
     fun foo()
 }

idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Some {
     fun foo()
 }

idea/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Some {
     fun foo()
 }

idea/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.fir.after

@@ -0,0 +1,25 @@
+interface Some {
+    fun foo()
+}
+
+class Other {
+    fun test() {
+        val a = 1
+    }
+    fun otherTest() {
+
+    }
+
+    override fun equals(other: Any?): Boolean {
+        <selection><caret>return super.equals(other)</selection>
+    }
+
+    override fun hashCode(): Int {
+        return super.hashCode()
+    }
+
+    override fun toString(): String {
+        return super.toString()
+    }
+}
+

idea/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.fir.after

@@ -0,0 +1,12 @@
+open class A() {
+    open val method : () -> Unit? = {println("hello")}
+}
+
+fun some() : A {
+    return object : A() {
+        override val method: () -> kotlin.Unit?
+            get() = <selection><caret>super.method</selection>
+    }
+}
+
+// TODO: need better selection and caret

idea/testData/codeInsight/overrideImplement/overrideGenericFunction.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface A<T> {
     fun foo(value : T) : Unit = println(value)
 }