diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
index 57ae05ae9cfb..2e14e35cc742 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.kt
@@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.codeInsight
 import com.intellij.codeInsight.generation.ClassMember
 import com.intellij.codeInsight.generation.OverrideImplementUtil
 import com.intellij.codeInsight.generation.PsiMethodMember
+import com.intellij.grazie.utils.toLinkedSet
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiClassOwner
 import com.intellij.psi.PsiMethod
@@ -14,13 +15,14 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.util.SmartList
+import org.jetbrains.kotlin.idea.base.test.IgnoreTests
+import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.idea.core.overrideImplement.AbstractGenerateMembersHandler
 import org.jetbrains.kotlin.idea.test.*
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.idea.base.test.IgnoreTests
-import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndRemoveRedundantEmptyLinesAtTheEnd
 import org.jetbrains.kotlin.utils.rethrow
 import org.junit.Assert
 import java.io.File
@@ -82,36 +84,48 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
 
     private fun doFileTest(handler: AbstractGenerateMembersHandler<T>, memberToOverride: String? = null) {
         myFixture.configureByFile(getTestName(true) + ".kt")
-        doOverrideImplement(handler, memberToOverride)
-        checkResultByFile(getTestName(true))
+
+        val fileNameWithoutExtension = getTestName(true)
+        doOverrideImplement(handler, memberToOverride, fileNameWithoutExtension)
+        checkResultByFile(fileNameWithoutExtension)
     }
 
     private fun doMultiFileTest(handler: AbstractGenerateMembersHandler<T>) {
         myFixture.configureByFile(getTestName(true) + ".kt")
-        doMultiOverrideImplement(handler)
-        checkResultByFile(getTestName(true))
+
+        val fileNameWithoutExtension = getTestName(true)
+        doMultiOverrideImplement(handler, fileNameWithoutExtension)
+        checkResultByFile(fileNameWithoutExtension)
     }
 
     private fun doDirectoryTest(handler: AbstractGenerateMembersHandler<T>, memberToOverride: String? = null) {
         myFixture.copyDirectoryToProject(getTestName(true), "")
         myFixture.configureFromTempProjectFile("foo/Impl.kt")
-        doOverrideImplement(handler, memberToOverride)
+
+        val filePathWithoutExtension = getTestName(true) + "/foo/Impl"
+        doOverrideImplement(handler, memberToOverride, filePathWithoutExtension)
         checkResultByFile(getTestName(true) + "/foo/Impl")
     }
 
     private fun doMultiDirectoryTest(handler: AbstractGenerateMembersHandler<T>) {
         myFixture.copyDirectoryToProject(getTestName(true), "")
         myFixture.configureFromTempProjectFile("foo/Impl.kt")
-        doMultiOverrideImplement(handler)
-        checkResultByFile(getTestName(true) + "/foo/Impl")
+
+        val filePathWithoutExtension = getTestName(true) + "/foo/Impl"
+        doMultiOverrideImplement(handler, filePathWithoutExtension)
+        checkResultByFile(filePathWithoutExtension)
     }
 
-    private fun doOverrideImplement(handler: AbstractGenerateMembersHandler<T>, memberToOverride: String?) {
+    private fun doOverrideImplement(
+        handler: AbstractGenerateMembersHandler<T>,
+        memberToOverride: String?,
+        fileNameWithoutExtension: String,
+    ) {
         val elementAtCaret = myFixture.file.findElementAt(myFixture.editor.caretModel.offset)
         val classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, KtClassOrObject::class.java)
             ?: error("Caret should be inside class or object")
 
-        val chooserObjects = handler.collectMembersToGenerateUnderProgress(classOrObject)
+        val chooserObjects = collectAndCheckChooserObjects(fileNameWithoutExtension, handler, classOrObject)
 
         val singleToOverride = if (memberToOverride == null) {
             val filtered = chooserObjects.filter { !isMemberOfAny(classOrObject, it) }
@@ -126,7 +140,7 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
         performGenerateCommand(handler, classOrObject, listOf(singleToOverride))
     }
 
-    private fun doMultiOverrideImplement(handler: AbstractGenerateMembersHandler<T>) {
+    private fun doMultiOverrideImplement(handler: AbstractGenerateMembersHandler<T>, fileNameWithoutExtension: String) {
         if (isFirPlugin && InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, IgnoreTests.DIRECTIVES.IGNORE_K2)) {
             return
         }
@@ -134,7 +148,7 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
         val classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, KtClassOrObject::class.java)
             ?: error("Caret should be inside class or object")
 
-        val chooserObjects = handler.collectMembersToGenerateUnderProgress(classOrObject)
+        val chooserObjects = collectAndCheckChooserObjects(fileNameWithoutExtension, handler, classOrObject)
             .sortedBy { getMemberName(classOrObject, it) + " in " + getContainingClassName(classOrObject, it) }
         performGenerateCommand(handler, classOrObject, chooserObjects)
     }
@@ -226,4 +240,54 @@ abstract class AbstractOverrideImplementTest<T : ClassMember> : KotlinLightCodeI
             )
         }
     }
+
+    private fun collectAndCheckChooserObjects(
+        fileNameWithoutExtension: String,
+        handler: AbstractGenerateMembersHandler<T>,
+        classOrObject: KtClassOrObject,
+        addMissingDirectives: Boolean = false,
+    ): Collection<T> {
+        val chooserObjects = handler.collectMembersToGenerateUnderProgress(classOrObject)
+
+        val testFile = File(testDataDirectory, "$fileNameWithoutExtension.kt")
+
+        val actualMemberTexts = chooserObjects.map { it.text }.toLinkedSet()
+        val expectedMemberTexts = InTextDirectivesUtils.findListWithPrefixes(testFile.readText(), MEMBER_DIRECTIVE_PREFIX).toLinkedSet()
+
+        if (addMissingDirectives) {
+            actualMemberTexts
+                .filterNot { it in expectedMemberTexts }
+                .takeIf { it.isNotEmpty() }
+                ?.let { missingActualMemberTexts ->
+                    val missingDirectives = missingActualMemberTexts.map { "$MEMBER_DIRECTIVE_PREFIX \"$it\"" }
+
+                    addDirectivesToFile(testFile, missingDirectives)
+
+                    val testFilePath = testFile.path
+                    val testResultFiles = listOf("after", "fir.after").map { File("$testFilePath.$it") }.filter { it.exists() }
+
+                    for (testResultFile in testResultFiles) {
+                        addDirectivesToFile(testResultFile, missingDirectives)
+                    }
+                }
+        }
+
+        expectedMemberTexts.minus(actualMemberTexts).firstOrNull()?.let { missingMemberText ->
+            Assert.fail("Expected '${missingMemberText}' not found in:\n${getCollectionRepresentation(actualMemberTexts)}")
+        }
+
+        return chooserObjects
+    }
+
+    private fun addDirectivesToFile(file: File, directives: List<String>) {
+        val fileText = file.readText().trimTrailingWhitespacesAndRemoveRedundantEmptyLinesAtTheEnd()
+        file.writeText(fileText + directives.joinToString(prefix = "\n", separator = "\n"))
+    }
+
+    private fun getCollectionRepresentation(collection: Collection<*>): String = collection.joinToString(separator = "\n")
+
+    companion object {
+        protected const val MEMBER_TEXT = "MEMBER"
+        protected const val MEMBER_DIRECTIVE_PREFIX = "// $MEMBER_TEXT:"
+    }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt
index 4ea4d3fd438b..37d1668eac64 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt
@@ -9,4 +9,6 @@ interface U {
 
 class C1 : T, U {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "getFoo(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
index 6ead03a16cd0..2560e488ad44 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
@@ -11,4 +11,6 @@ class C1 : T, U {
     override fun getFoo(): String {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "getFoo(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt
index 103a4525396e..58642eeb64d8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt
@@ -8,4 +8,9 @@ open class A {
 
 class C : A(), I {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
index e0b4ab6620e4..6be92746b623 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.after
@@ -28,4 +28,9 @@ class C : A(), I {
     override fun toString(): String {
         return super.toString()
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after
index 0fac8cb521e0..fa46073edf76 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after
@@ -28,4 +28,9 @@ class C : A(), I {
     override fun toString(): String {
         return super.toString()
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
index 61358138da14..807a515597fd 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt
@@ -4,3 +4,8 @@ import foo.A
 class B : A() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s1: String!, s2: String!): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
index 1f98f2183ae9..57b1ce923cf4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/androidxNotNull/foo/Impl.kt.after
@@ -6,3 +6,8 @@ class B : A() {
         return super.foo(s1, s2)
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s1: String!, s2: String!): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt
index fc1228adca7f..217ca52f3cfa 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt
@@ -8,3 +8,10 @@ open class Base<A, B, C>() {
 class C : Base<String, C, Unit>() {
     <caret>
 }
+
+// MEMBER: "method: (String?) -> String"
+// MEMBER: "foo(value: C): C"
+// MEMBER: "bar(value: () -> Unit): (String) -> Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
index 1a5c92f6ce47..3769c15d6e84 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/complexMultiOverride.kt.after
@@ -29,3 +29,10 @@ class C : Base<String, C, Unit>() {
         return super.toString()
     }
 }
+
+// MEMBER: "method: (String?) -> String"
+// MEMBER: "foo(value: C): C"
+// MEMBER: "bar(value: () -> Unit): (String) -> Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt
index 8cd825d28c21..8e8e6b91bd51 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt
@@ -6,3 +6,8 @@ import foo.A
 class B : A() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt.after
index 07d01eccec1a..0c435cabe19f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/convertJavaDoc/foo/Impl.kt.after
@@ -11,3 +11,8 @@ class B : A() {
         <selection><caret>return super.foo()</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt
index fd2603199d15..dc3a0f98d339 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt
@@ -9,3 +9,8 @@ open class ParentTarget {
 class ChildTarget : ParentTarget() {
     <caret>
 }
+
+// MEMBER: "targetFun(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt.after
index 98dc1cb4e322..49919f9444cf 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyAnnotationsAllowedByExtension.kt.after
@@ -12,3 +12,8 @@ class ChildTarget : ParentTarget() {
         <selection><caret>super.targetFun()</selection>
     }
 }
+
+// MEMBER: "targetFun(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt
index 0dd40950d7cf..e1830ee3d9bc 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt
@@ -10,4 +10,9 @@ open class ParentTarget {
 
 class ChildTarget : ParentTarget() {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "targetFun(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt.after
index 417a52307c85..a4c98b7f0de4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyExperimental.kt.after
@@ -13,4 +13,9 @@ class ChildTarget : ParentTarget() {
     override fun targetFun() {
         <selection><caret>super.targetFun()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "targetFun(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt
index f4a1c7e3e882..ebe57ca968d8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt
@@ -9,4 +9,9 @@ abstract class A {
 
 class B : A() {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after
index 71b98ae6e22d..ffef8bd014ba 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after
@@ -14,4 +14,9 @@ class B : A() {
     override fun foo() {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt
index fdaa84bf45bb..570ec4a03e74 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt
@@ -1,4 +1,8 @@
 // FIR_IDENTICAL
 data class Foo(val name: String) {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt.after
index a81a55bb1d4c..917998dc8011 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dataClassEquals.kt.after
@@ -3,4 +3,8 @@ data class Foo(val name: String) {
     override fun equals(other: Any?): Boolean {
         <selection>return super.equals(other)</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt
index a1bc9a79568c..442169a9cbac 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt
@@ -5,4 +5,6 @@ interface T {
 
 class C : T {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(a: Int = ...): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after
index 059c97ad8b32..1fcace11b041 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after
@@ -7,4 +7,6 @@ class C : T {
     override fun foo(a: Int) {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(a: Int = ...): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt
index 621221e4ac0c..5da426f6184e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt
@@ -8,4 +8,10 @@ class C(t :T) : T by t {
     <caret>
 }
 
-// KT-5103
\ No newline at end of file
+// KT-5103
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "bar(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
index 34413e9d39d3..1023e00393c8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
@@ -26,4 +26,10 @@ class C(t :T) : T by t {
     }
 }
 
-// KT-5103
\ No newline at end of file
+// KT-5103
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "bar(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt
index 915f91a92070..e6cb4a7db517 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt
@@ -17,3 +17,9 @@ abstract class B : A() {
 class C : B(), I {
     <caret>
 }
+
+// MEMBER: "f(): Unit"
+// MEMBER: "g(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
index 636f714a1ff4..5c8cf6fe8dfb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
@@ -35,3 +35,9 @@ class C : B(), I {
         return super.toString()
     }
 }
+
+// MEMBER: "f(): Unit"
+// MEMBER: "g(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt
index 14e2dadc4c99..29e67713f6e7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt
@@ -16,4 +16,14 @@ open class B: A() {
 
 class C: B() {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "fOverride(): Unit"
+// MEMBER: "vLateinit: String"
+// MEMBER: "contains(n: Int): Boolean"
+// MEMBER: "fInfix(n: Int): Unit"
+// MEMBER: "fProtected(): Unit"
+// MEMBER: "fInternal(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt.after
index ddc82b8f4d8f..32a3324309dc 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotRenderRedundantModifiers.kt.after
@@ -51,3 +51,13 @@ class C: B() {
         get() = super.vLateinit
         set(value) {}
 }
+
+// MEMBER: "fOverride(): Unit"
+// MEMBER: "vLateinit: String"
+// MEMBER: "contains(n: Int): Boolean"
+// MEMBER: "fInfix(n: Int): Unit"
+// MEMBER: "fProtected(): Unit"
+// MEMBER: "fInternal(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt
index dca2a4a92b97..36fb068b1e4b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt
@@ -8,3 +8,8 @@ open class ParentTarget {
 class ChildTarget : ParentTarget() {
     <caret>
 }
+
+// MEMBER: "targetFun(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt.after
index 9886e5b8834f..db2f325fa228 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/dropAnnotations.kt.after
@@ -10,3 +10,8 @@ class ChildTarget : ParentTarget() {
         <selection><caret>super.targetFun()</selection>
     }
 }
+
+// MEMBER: "targetFun(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt
index 3e3f825d9a01..0bd0d1d76983 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt
@@ -7,3 +7,7 @@ interface I
 class B : A<String>(), I {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt.after
index 1c0bea8d97e5..e3082fdfb305 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/duplicatedAnyMembersBug.kt.after
@@ -17,3 +17,7 @@ class B : A<String>(), I {
         return super.toString()
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt
index 890387446dab..8e0496f94cbd 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt
@@ -4,4 +4,6 @@ interface T {
     fun Foo() : (String) -> Unit
 }
 
-class C : <caret>T
\ No newline at end of file
+class C : <caret>T
+
+// MEMBER: "Foo(): (String) -> Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
index f75697a9f8e9..33397d62a2b8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
@@ -8,4 +8,6 @@ class C : T {
     override fun Foo(): (String) -> Unit {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "Foo(): (String) -> Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt
index cd561c4f2528..378038e8bce0 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt
@@ -1,2 +1,4 @@
 // FIR_IDENTICAL
-enum <caret>class Foo
\ No newline at end of file
+enum <caret>class Foo
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt.after
index a35271060579..282fadb09678 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass.kt.after
@@ -5,4 +5,6 @@ enum class Foo {
     override fun toString(): String {
         <selection><caret>return super.toString()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt
index 6812cf4fe527..9c3e500fdd10 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt
@@ -1,3 +1,5 @@
 // FIR_IDENTICAL
 enum <caret>class Foo {
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt.after
index a35271060579..282fadb09678 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass2.kt.after
@@ -5,4 +5,6 @@ enum class Foo {
     override fun toString(): String {
         <selection><caret>return super.toString()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt
index 39cf42817f22..45eeaa72d756 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt
@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
 enum <caret>class Foo {
     A
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt.after
index d5c147548896..97a247e14f8b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass3.kt.after
@@ -5,4 +5,6 @@ enum class Foo {
     override fun toString(): String {
         <selection><caret>return super.toString()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt
index 7d68a9cd09b2..7df27ef57b8d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt
@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
 enum <caret>class Foo {
     A;
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt.after
index d5c147548896..97a247e14f8b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/enumClass4.kt.after
@@ -5,4 +5,6 @@ enum class Foo {
     override fun toString(): String {
         <selection><caret>return super.toString()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt
index 58d5a436f219..a736fed6c49b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt
@@ -3,4 +3,8 @@ interface A
 
 interface B : A {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt.after
index 20acc99fc83b..fa437172d824 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/equalsInInterface.kt.after
@@ -3,4 +3,8 @@ interface A
 
 interface B : A {
     override fun equals(other: Any?): Boolean
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt
index cdab82aeb7ee..5893b184c052 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt
@@ -6,3 +6,8 @@ open class A {
 class C : A() {
     <caret>
 }
+
+// MEMBER: "foo(`object`: Any): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt.after
index b276765f1dba..4520b685d5f4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/escapeIdentifiers.kt.after
@@ -8,3 +8,8 @@ class C : A() {
         <selection><caret>return super.foo(`object`)</selection>
     }
 }
+
+// MEMBER: "foo(`object`: Any): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt
index bb482e94d78a..69648d6b830c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt
@@ -6,4 +6,6 @@ interface T {
 
 class C : T {
   <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "Foo(): (String) -> Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after
index f75697a9f8e9..33397d62a2b8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after
@@ -8,4 +8,6 @@ class C : T {
     override fun Foo(): (String) -> Unit {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "Foo(): (String) -> Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt
index fdaed37f5390..791ef91b73c3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt
@@ -8,4 +8,6 @@ fun some() : A {
     return object : A {<caret>}
 }
 
-// TODO: need better selection and caret
\ No newline at end of file
+// TODO: need better selection and caret
+
+// MEMBER: "method: () -> Unit?"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after
index a3a34572c3db..ee240c4ed5d6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after
@@ -11,4 +11,6 @@ fun some() : A {
     }
 }
 
-// TODO: need better selection and caret
\ No newline at end of file
+// TODO: need better selection and caret
+
+// MEMBER: "method: () -> Unit?"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
index 4c206a5e59e6..6b32b7a7cb06 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
@@ -4,4 +4,6 @@ interface Interface {
 
 class InterfaceImpl : Interface {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit where B : Cloneable, B : Comparable<B>"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
index 9a8ab3861c61..fe091b848ba8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
@@ -6,4 +6,6 @@ class InterfaceImpl : Interface {
     override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit where B : Cloneable, B : Comparable<B>"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.fir.after
index 10bd05a93575..82ad6a66056f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.fir.after
@@ -6,4 +6,6 @@ class InterfaceImpl : Interface {
     override fun <A, B, E : Map.Entry<A, B>> foo() where B : Runnable, B : Cloneable, B : Comparable<B> {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit where B : Cloneable, B : Comparable<B>"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt
index baa9cdda765f..5a8ac9b874c9 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt
@@ -9,4 +9,8 @@ interface Some<T> {
 
 class SomeOther<S> : Some<S> {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "someFoo(): Unit"
+// MEMBER: "someOtherFoo(): Int"
+// MEMBER: "someGenericFoo(): S"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after
index 2b89b521d98c..ca159d0c0802 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -19,4 +19,8 @@ class SomeOther<S> : Some<S> {
     override fun someOtherFoo(): Int {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "someFoo(): Unit"
+// MEMBER: "someOtherFoo(): Int"
+// MEMBER: "someGenericFoo(): S"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt
index a94d40a41418..b013c3b79817 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt
@@ -13,3 +13,6 @@ class <caret>C : I<Int> {
     override fun <U> d(t: Int, u: U) {
     }
 }
+
+// MEMBER: "a(t: Int, u: U): Unit"
+// MEMBER: "c(t: Int): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt.after
index 4091b17322f1..8b2577444001 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericClass.kt.after
@@ -21,3 +21,6 @@ class C : I<Int> {
     override fun <U> d(t: Int, u: U) {
     }
 }
+
+// MEMBER: "a(t: Int, u: U): Unit"
+// MEMBER: "c(t: Int): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt
index 65483d526b7b..c0b3431638eb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt
@@ -6,3 +6,5 @@ interface G<T> {
 class GC() : G<Int> {
     <caret>
 }
+
+// MEMBER: "foo(t: Int): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after
index ceff00b9c666..a7e2fa1c48fc 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after
@@ -8,3 +8,5 @@ class GC() : G<Int> {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(t: Int): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt
index 20ccfb2554d9..ea235309c887 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt
@@ -1,4 +1,43 @@
 // FIR_IDENTICAL
 abstract class X : java.util.ArrayList<String>(), Runnable {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "add(element: String): Boolean"
+// MEMBER: "add(index: Int, element: String): Unit"
+// MEMBER: "addAll(elements: Collection<String>): Boolean"
+// MEMBER: "addAll(index: Int, elements: Collection<String>): Boolean"
+// MEMBER: "clear(): Unit"
+// MEMBER: "iterator(): MutableIterator<String>"
+// MEMBER: "remove(element: String): Boolean"
+// MEMBER: "removeAll(elements: Collection<String>): Boolean"
+// MEMBER: "retainAll(elements: Collection<String>): Boolean"
+// MEMBER: "contains(element: String): Boolean"
+// MEMBER: "containsAll(elements: Collection<String!>): Boolean"
+// MEMBER: "isEmpty(): Boolean"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "forEach(p0: Consumer<in String!>!): Unit"
+// MEMBER: "spliterator(): Spliterator<String!>"
+// MEMBER: "toArray(): Array<(out) Any!>!"
+// MEMBER: "toArray(p0: Array<(out) T!>!): Array<(out) T!>!"
+// MEMBER: "removeIf(p0: Predicate<in String>): Boolean"
+// MEMBER: "stream(): Stream<String!>"
+// MEMBER: "parallelStream(): Stream<String!>"
+// MEMBER: "listIterator(index: Int): MutableListIterator<String>"
+// MEMBER: "listIterator(): MutableListIterator<String>"
+// MEMBER: "removeAt(p0: Int): String"
+// MEMBER: "set(index: Int, element: String): String"
+// MEMBER: "subList(fromIndex: Int, toIndex: Int): MutableList<String>"
+// MEMBER: "get(index: Int): String"
+// MEMBER: "indexOf(element: String): Int"
+// MEMBER: "lastIndexOf(element: String): Int"
+// MEMBER: "replaceAll(p0: UnaryOperator<String>): Unit"
+// MEMBER: "sort(p0: Comparator<in String!>!): Unit"
+// MEMBER: "removeRange(p0: Int, p1: Int): Unit"
+// MEMBER: "clone(): Any"
+// MEMBER: "trimToSize(): Unit"
+// MEMBER: "ensureCapacity(p0: Int): Unit"
+// MEMBER: "size: Int"
+// MEMBER: "run(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt.after
index bca2497d96f7..016da24e7f9f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericSuperClass.kt.after
@@ -3,4 +3,43 @@ abstract class X : java.util.ArrayList<String>(), Runnable {
     override fun iterator(): MutableIterator<String> {
         <selection><caret>return super.iterator()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "add(element: String): Boolean"
+// MEMBER: "add(index: Int, element: String): Unit"
+// MEMBER: "addAll(elements: Collection<String>): Boolean"
+// MEMBER: "addAll(index: Int, elements: Collection<String>): Boolean"
+// MEMBER: "clear(): Unit"
+// MEMBER: "iterator(): MutableIterator<String>"
+// MEMBER: "remove(element: String): Boolean"
+// MEMBER: "removeAll(elements: Collection<String>): Boolean"
+// MEMBER: "retainAll(elements: Collection<String>): Boolean"
+// MEMBER: "contains(element: String): Boolean"
+// MEMBER: "containsAll(elements: Collection<String!>): Boolean"
+// MEMBER: "isEmpty(): Boolean"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "forEach(p0: Consumer<in String!>!): Unit"
+// MEMBER: "spliterator(): Spliterator<String!>"
+// MEMBER: "toArray(): Array<(out) Any!>!"
+// MEMBER: "toArray(p0: Array<(out) T!>!): Array<(out) T!>!"
+// MEMBER: "removeIf(p0: Predicate<in String>): Boolean"
+// MEMBER: "stream(): Stream<String!>"
+// MEMBER: "parallelStream(): Stream<String!>"
+// MEMBER: "listIterator(index: Int): MutableListIterator<String>"
+// MEMBER: "listIterator(): MutableListIterator<String>"
+// MEMBER: "removeAt(p0: Int): String"
+// MEMBER: "set(index: Int, element: String): String"
+// MEMBER: "subList(fromIndex: Int, toIndex: Int): MutableList<String>"
+// MEMBER: "get(index: Int): String"
+// MEMBER: "indexOf(element: String): Int"
+// MEMBER: "lastIndexOf(element: String): Int"
+// MEMBER: "replaceAll(p0: UnaryOperator<String>): Unit"
+// MEMBER: "sort(p0: Comparator<in String!>!): Unit"
+// MEMBER: "removeRange(p0: Int, p1: Int): Unit"
+// MEMBER: "clone(): Any"
+// MEMBER: "trimToSize(): Unit"
+// MEMBER: "ensureCapacity(p0: Int): Unit"
+// MEMBER: "size: Int"
+// MEMBER: "run(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt
index 85741e7391b4..253d579398d8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt
@@ -3,4 +3,6 @@
 
 class MyClass<A: Comparable<A>> : Iterable<A> {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "iterator(): Iterator<A>"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
index 065f177d0f2a..06d344d07fb1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
@@ -5,4 +5,6 @@ class MyClass<A: Comparable<A>> : Iterable<A> {
     override fun iterator(): Iterator<A> {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "iterator(): Iterator<A>"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt
index 1a3a1ad50467..5e170f66a7d6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt
@@ -6,4 +6,6 @@ interface Runnable {
 class <caret>A : Runnable {
     fun foo() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "run(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after
index 95c3398ffcb7..ee4f549659f0 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after
@@ -10,4 +10,6 @@ class A : Runnable {
     override fun run() {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "run(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt
index 325cd7dcfd8a..b3eb9d53f2f0 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt
@@ -16,4 +16,11 @@ class <caret>Test : A {
 
     override fun a6() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after
index 9df30060d378..0e0078c33ea1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after
@@ -40,4 +40,11 @@ class Test : A {
     override fun a8() {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt
index 34de02f74c4c..b60c6acc9e1c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt
@@ -16,4 +16,11 @@ class <caret>Test : A {
 
     override fun a3() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after
index ad9f75c7fe2e..2aa8b95f5dcf 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after
@@ -40,4 +40,11 @@ class Test : A {
     override fun a5() {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt
index 1770368cb96c..b2238457cc12 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt
@@ -19,4 +19,10 @@ class <caret>Test : A {
 
     override fun a2() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a3(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after
index 50f320371355..6f65d6ded807 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after
@@ -39,4 +39,10 @@ class Test : A {
     override fun a3() {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a3(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt
index 8f570805a741..afef21accd4b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt
@@ -25,4 +25,11 @@ class <caret>Test : A {
 
     fun baz() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after
index e7adc733fe14..f8b035affff5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after
@@ -49,4 +49,11 @@ class Test : A {
 
     fun baz() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt
index 737fbe0dc43f..dbd56f6a6638 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt
@@ -25,4 +25,13 @@ class <caret>Test : A, B {
 
     override fun a6() {
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
+// MEMBER: "b3(): Unit"
+// MEMBER: "b1(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after
index afafb0720365..430e476d7fe7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after
@@ -57,4 +57,13 @@ class Test : A, B {
     override fun a8() {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1(): Unit"
+// MEMBER: "a2(): Unit"
+// MEMBER: "a4(): Unit"
+// MEMBER: "a5(): Unit"
+// MEMBER: "a7(): Unit"
+// MEMBER: "a8(): Unit"
+// MEMBER: "b3(): Unit"
+// MEMBER: "b1(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt
index b20f531a97e1..e6857cae867b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt
@@ -1,4 +1,6 @@
 // FIR_IDENTICAL
 class C : (String) -> Boolean {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "invoke(p1: String): Boolean"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
index ed76f7711fae..3ad56601a0c0 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
@@ -3,4 +3,6 @@ class C : (String) -> Boolean {
     override fun invoke(p1: String): Boolean {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "invoke(p1: String): Boolean"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt
index 9c69e549ef24..91800c68c691 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt
@@ -3,3 +3,5 @@ import foo.A
 class C : A() {
     <caret>
 }
+
+// MEMBER: "foo(x: (Mutable)List<(raw) Any?>!, y: String!): B<(raw) Any!>!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
index 79a125ee4e7c..43c00f3e4a7e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
@@ -6,3 +6,5 @@ class C : A() {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(x: (Mutable)List<(raw) Any?>!, y: String!): B<(raw) Any!>!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.fir.after
index ed8a9e1efe72..b3618a86d0c2 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.fir.after
@@ -8,3 +8,5 @@ class C : A() {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(x: (Mutable)List<(raw) Any?>!, y: String!): B<(raw) Any!>!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt
index bb8397bc5a36..27fbb7c145ee 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt
@@ -4,3 +4,5 @@ package foo
 class Impl: B {
     <caret>
 }
+
+// MEMBER: "foo(r: Runnable!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
index 33bbb795e534..b471b5bbb879 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
@@ -6,3 +6,5 @@ class Impl: B {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(r: Runnable!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt
index 3556c9d724fd..f3fda51db015 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt
@@ -4,3 +4,5 @@ interface I {
 }
 
 class C<caret> : I // comment
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt.after
index 4fef1ed1432b..3bd32764135f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment.kt.after
@@ -8,3 +8,5 @@ class C : I { // comment
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt
index 0c0013b07b36..07f442173a02 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt
@@ -4,3 +4,5 @@ interface I {
 }
 
 class C<caret> : I /* comment1 */ // comment2
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt.after
index 9c53b436710d..ced2a3123da2 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment2.kt.after
@@ -8,3 +8,5 @@ class C : I { /* comment1 */ // comment2
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt
index 4cbea2067630..ccda87b1fcd9 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt
@@ -5,3 +5,5 @@ interface I {
 
 class C<caret> : I { // comment
 }
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt.after
index 4fef1ed1432b..3bd32764135f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment3.kt.after
@@ -8,3 +8,5 @@ class C : I { // comment
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt
index 79a3ff5eb0c9..13ec64aaf9ac 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt
@@ -6,3 +6,5 @@ interface I {
 class C<caret> : I { // comment1
     // comment2
 }
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt.after
index 80d8525ee185..8e5417866cf2 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementWithComment4.kt.after
@@ -9,3 +9,5 @@ class C : I { // comment1
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt
index c6edcdd7bfe3..1a8513df1353 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt
@@ -5,4 +5,6 @@ interface G<T> {
 
 class GC<T>() : G<T> {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(t: T): T"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt.after
index cb235994512d..14f027d2bc2f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceGenericImplement.kt.after
@@ -7,4 +7,6 @@ class GC<T>() : G<T> {
     override fun foo(t: T): T {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(t: T): T"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt
index f64f752cc75d..2dc3ceffded0 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt
@@ -5,4 +5,6 @@ interface Some {
 
 class SomeOther : Some {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(some: Int?): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt.after
index f3dafa0cf3e2..618f90c7aa93 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/interfaceNullableFunction.kt.after
@@ -7,4 +7,6 @@ class SomeOther : Some {
     override fun foo(some: Int?): Int {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(some: Int?): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt
index 14c331bd84c9..5d16b9814dff 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt
@@ -3,3 +3,5 @@ import foo.Intf
 class Impl(): Intf {
     <caret>
 }
+
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
index 372326852913..477dec2721ce 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
@@ -5,3 +5,5 @@ class Impl(): Intf {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.fir.after
index 90a77cf1f561..4e750ea33f76 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.fir.after
@@ -5,3 +5,5 @@ class Impl(): Intf {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt
index 0f3ff142b882..0c8022cb7f72 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt
@@ -3,3 +3,10 @@ package foo
 
 class <caret>Impl : TestJavaInterface {
 }
+
+// MEMBER: "onTextEvent(): Unit"
+// MEMBER: "onAttachmentEvent(): Unit"
+// MEMBER: "onEventDeleted(): Unit"
+// MEMBER: "onSeenReceipt(): Unit"
+// MEMBER: "onDeliveredReceipt(): Unit"
+// MEMBER: "onTypingEvent(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt.after
index f017127b1f80..5bf742323c1b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodInCorrectOrder/foo/Impl.kt.after
@@ -26,3 +26,10 @@ class Impl : TestJavaInterface {
         TODO("Not yet implemented")
     }
 }
+
+// MEMBER: "onTextEvent(): Unit"
+// MEMBER: "onAttachmentEvent(): Unit"
+// MEMBER: "onEventDeleted(): Unit"
+// MEMBER: "onSeenReceipt(): Unit"
+// MEMBER: "onDeliveredReceipt(): Unit"
+// MEMBER: "onTypingEvent(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt
index be436bbd3368..3cc709abc3b1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt
@@ -2,3 +2,5 @@ package foo
 
 class <caret>Impl : TestJavaInterface<String> {
 }
+
+// MEMBER: "onTypingEvent(): T!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.after
index 769299df94b7..ad92ba76dee1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.after
@@ -5,3 +5,5 @@ class Impl : TestJavaInterface<String> {
         TODO("Not yet implemented")
     }
 }
+
+// MEMBER: "onTypingEvent(): T!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.fir.after
index 46e866747e17..55c2b221cd8f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethodWithTypeParameters/foo/Impl.kt.fir.after
@@ -5,3 +5,5 @@ class Impl : TestJavaInterface<String> {
         TODO("Not yet implemented")
     }
 }
+
+// MEMBER: "onTypingEvent(): T!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt
index bfe41a2f9d37..a0427f6518db 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt
@@ -5,3 +5,8 @@ import foo.Intf
 class Impl(): Intf() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
index 426680954d91..81b0d35a4d7d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.after
@@ -7,3 +7,8 @@ class Impl(): Intf() {
         <selection><caret>return super.getFooBar()</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.fir.after
index 93d18984e635..0b005136792b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageProtectedVisibility/foo/Impl.kt.fir.after
@@ -7,3 +7,8 @@ class Impl(): Intf() {
         <selection><caret>return super.getFooBar()</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt
index bfe41a2f9d37..a0427f6518db 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt
@@ -5,3 +5,8 @@ import foo.Intf
 class Impl(): Intf() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
index 426680954d91..81b0d35a4d7d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.after
@@ -7,3 +7,8 @@ class Impl(): Intf() {
         <selection><caret>return super.getFooBar()</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.fir.after
index 93d18984e635..0b005136792b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibility/foo/Impl.kt.fir.after
@@ -7,3 +7,8 @@ class Impl(): Intf() {
         <selection><caret>return super.getFooBar()</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getFooBar(): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt
index eeb56187cd04..18469ec829ef 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt
@@ -6,3 +6,9 @@ import parent.Parent
 class Impl : Parent() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "publicMethod(): Unit"
+// MEMBER: "protectedMethod(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt.after
index 01843fef47cb..88a8217880da 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaMethodWithPackageVisibilityFromOtherPackage/foo/Impl.kt.after
@@ -24,3 +24,9 @@ class Impl : Parent() {
         return super.toString()
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "publicMethod(): Unit"
+// MEMBER: "protectedMethod(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt
index 14c331bd84c9..026828cd42d7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt
@@ -3,3 +3,5 @@ import foo.Intf
 class Impl(): Intf {
     <caret>
 }
+
+// MEMBER: "fooBar(i: Int, s: Array<(out) String!>!, foo: Any!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
index d11be1ab1fb8..b49636b188e3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
@@ -5,3 +5,5 @@ class Impl(): Intf {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "fooBar(i: Int, s: Array<(out) String!>!, foo: Any!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.fir.after
index 7b232fa41beb..45b3ffd68792 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.fir.after
@@ -5,3 +5,5 @@ class Impl(): Intf {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "fooBar(i: Int, s: Array<(out) String!>!, foo: Any!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt
index 61358138da14..32cec03ff396 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt
@@ -4,3 +4,8 @@ import foo.A
 class B : A() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt.after
index 40129a4ec35b..f2478bb0d0d8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaxNonnullJavaType/foo/Impl.kt.after
@@ -6,3 +6,8 @@ class B : A() {
         <selection><caret>return super.foo(s)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt
index 81955d1a0058..19184b9fc995 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt
@@ -1,4 +1,24 @@
 // FIR_IDENTICAL
 abstract class A : List<String> {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "size: Int"
+// MEMBER: "contains(element: String): Boolean"
+// MEMBER: "containsAll(elements: Collection<String>): Boolean"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "forEach(action: Consumer<in String!>!): Unit"
+// MEMBER: "get(index: Int): String"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "indexOf(element: String): Int"
+// MEMBER: "isEmpty(): Boolean"
+// MEMBER: "iterator(): Iterator<String>"
+// MEMBER: "lastIndexOf(element: String): Int"
+// MEMBER: "listIterator(): ListIterator<String>"
+// MEMBER: "listIterator(index: Int): ListIterator<String>"
+// MEMBER: "parallelStream(): Stream<String>"
+// MEMBER: "spliterator(): Spliterator<String!>"
+// MEMBER: "stream(): Stream<String>"
+// MEMBER: "subList(fromIndex: Int, toIndex: Int): List<String>"
+// MEMBER: "toArray(generator: IntFunction<Array<(out) T!>!>!): Array<(out) T!>!"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after
index 4ae1dce0f6b6..b79046bfded5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.after
@@ -6,3 +6,23 @@ abstract class A : List<String> {
         return super.stream()
     }
 }
+
+// MEMBER: "size: Int"
+// MEMBER: "contains(element: String): Boolean"
+// MEMBER: "containsAll(elements: Collection<String>): Boolean"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "forEach(action: Consumer<in String!>!): Unit"
+// MEMBER: "get(index: Int): String"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "indexOf(element: String): Int"
+// MEMBER: "isEmpty(): Boolean"
+// MEMBER: "iterator(): Iterator<String>"
+// MEMBER: "lastIndexOf(element: String): Int"
+// MEMBER: "listIterator(): ListIterator<String>"
+// MEMBER: "listIterator(index: Int): ListIterator<String>"
+// MEMBER: "parallelStream(): Stream<String>"
+// MEMBER: "spliterator(): Spliterator<String!>"
+// MEMBER: "stream(): Stream<String>"
+// MEMBER: "subList(fromIndex: Int, toIndex: Int): List<String>"
+// MEMBER: "toArray(generator: IntFunction<Array<(out) T!>!>!): Array<(out) T!>!"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/jdk8/overrideCollectionStream.kt.fir.after
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt
index 6425ac3bdd26..df465aec10df 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt
@@ -7,4 +7,6 @@ interface Foo {
 
 class <caret>Bar(override val text: String, val number: Int) : Foo {
 
-}
\ No newline at end of file
+}
+
+// MEMBER: "name: String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt.after
index 07a010ac1428..0b9bc14da827 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ktij16175.kt.after
@@ -10,3 +10,5 @@ class Bar(override val text: String, val number: Int) : Foo {
         get() = TODO("Not yet implemented")
 
 }
+
+// MEMBER: "name: String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt
index cda23cdde570..0ff048f6abca 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt
@@ -10,3 +10,5 @@ fun f() {
         <caret>
     }
 }
+
+// MEMBER: "f(a: R): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after
index d9a934deae97..89a0aebef503 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after
@@ -12,3 +12,5 @@ fun f() {
         }
     }
 }
+
+// MEMBER: "f(a: R): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt
index 377e711f776a..29c6492d637c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt
@@ -7,3 +7,9 @@ interface A {
 class C : A {
     <caret>
 }
+
+// MEMBER: "foo(value: String): Int"
+// MEMBER: "bar(): String"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt.after
index a8977ddb10f9..bc6391a06e61 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multiOverride.kt.after
@@ -25,3 +25,9 @@ class C : A {
         return super.toString()
     }
 }
+
+// MEMBER: "foo(value: String): Int"
+// MEMBER: "bar(): String"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt
index 7eb33e0dedaf..6077187d44d6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt
@@ -10,3 +10,9 @@ interface B {
 class C : A(), B {
    <caret>
 }
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "bar(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after
index f2bb396fba6b..3d7f748c3e5a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after
@@ -28,3 +28,9 @@ class C : A(), B {
         return super.toString()
     }
 }
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "bar(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt
index 96a2b8b20057..24a93910e1ee 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt
@@ -1,3 +1,5 @@
 // IGNORE_K2
 @JvmInline
-value class <caret>V(val v: Int)
\ No newline at end of file
+value class <caret>V(val v: Int)
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after
index fe34ba09d08b..9806698c1091 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClass.kt.after
@@ -4,4 +4,6 @@ value class V(val v: Int) {
     override fun toString(): String {
         return super.toString()
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt
index f4e98c5be65a..49b8c0737e51 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt
@@ -2,3 +2,5 @@
 // COMPILER_ARGUMENTS: -XXLanguage:+GenericInlineClassParameter
 @JvmInline
 value class <caret>V(val v: Int)
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after
index a0401538a04a..d59fce2d4c2a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noAnyMembersInValueClassWithGenerics.kt.after
@@ -6,3 +6,5 @@ value class V(val v: Int) {
         return super.toString()
     }
 }
+
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt
index 2fb0c229ea23..210571cf0d07 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt
@@ -7,4 +7,8 @@ interface I
 
 class B : A(), I {  // Any:hashCode() (available via I) is not an option
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "hashCode(): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt.after
index 037053c295b8..163ea980d691 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper.kt.after
@@ -9,4 +9,8 @@ class B : A(), I {  // Any:hashCode() (available via I) is not an option
     override fun hashCode(): Int {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "hashCode(): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt
index 2ebe906c0436..f52eb151f4d1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt
@@ -13,4 +13,9 @@ interface I: MyAny
 
 class B : A(), I { // MyAny:foo()
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt.after
index 6efac396e14e..90ef3a5384ea 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/noCallToAbstractSuper2.kt.after
@@ -16,3 +16,8 @@ class B : A(), I { // MyAny:foo()
         super.foo()
     }
 }
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt
index 61358138da14..0b47eb56f0d1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt
@@ -4,3 +4,8 @@ import foo.A
 class B : A() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String!): String?"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt.after
index bf3a50a786aa..14dc486db407 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableJavaType/foo/Impl.kt.after
@@ -6,3 +6,8 @@ class B : A() {
         <selection><caret>return super.foo(s)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String!): String?"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt
index 2fc76135dff5..d26c8d90affb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt
@@ -5,4 +5,9 @@ interface IBase {
 
 class C : IBase {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Any?"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after
index d1cc1f31f17d..540f8e05a926 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after
@@ -7,4 +7,9 @@ class C : IBase {
     override fun foo(): Any? {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Any?"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt
index 9a9b1f5a6255..9f8802ab43be 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt
@@ -5,4 +5,9 @@ interface A {
 
 class B : A {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
index 6e5773efccd9..fc98193575df 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
@@ -7,4 +7,9 @@ class B : A {
     override fun String.foo() {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt
index 2ec1d14621c8..4706cdcc3c48 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt
@@ -7,4 +7,9 @@ open class A {
 
 class B: A() {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after
index d5ddc0a7ee13..f0188bf245f1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after
@@ -10,3 +10,8 @@ class B: A() {
         TODO("Not yet implemented")
     }
 }
+
+// MEMBER: "foo(): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt
index 93288e47b976..b8092764d85e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt
@@ -6,3 +6,8 @@ interface A {
 class B : A {
     <caret>
 }
+
+// MEMBER: "prop: Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
index df16ac05f6bf..081637b701f4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
@@ -7,3 +7,8 @@ class B : A {
     override val String.prop: Int
         get() = <selection><caret>TODO("Not yet implemented")</selection>
 }
+
+// MEMBER: "prop: Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt
index bbf2356fb079..5caf5a810f8d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt
@@ -5,4 +5,9 @@ open class A {
 
 class B : A() {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt.after
index 24701f8334a4..9e3bb493da16 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExternalFunction.kt.after
@@ -7,4 +7,9 @@ class B : A() {
     override fun foo() {
         super.foo()
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt
index 00aaa7e45192..7f828fdeb16d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt
@@ -12,3 +12,6 @@ class <caret>Other {
     }
 }
 
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after
index 2f63949d29ae..48e61bd6810b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromClassName.kt.after
@@ -24,3 +24,6 @@ class Other {
     }
 }
 
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt
index 0f4b2c1d1b7f..290fc4b0cc03 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt
@@ -12,3 +12,6 @@ class Other {
     }
 }
 
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after
index 9998317dc8ff..2adc03399fa1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromFunctionPosition.kt.after
@@ -25,3 +25,6 @@ class Other {
     }
 }
 
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt
index d1f51442033a..5a75f9439689 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt
@@ -16,3 +16,5 @@ class Other <caret>{
     }
 }
 
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after
index 2f63949d29ae..128eda05bc31 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFromLBrace.kt.after
@@ -24,3 +24,5 @@ class Other {
     }
 }
 
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
index 69a2c0b33b41..0a65def0f126 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt
@@ -8,3 +8,8 @@ fun some() : A {
 }
 
 // TODO: need better selection and caret
+
+// MEMBER: "method: () -> Unit?"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
index 849e62e69316..7db3bd77ea4f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideFunctionProperty.kt.after
@@ -11,3 +11,8 @@ fun some() : A {
 }
 
 // TODO: need better selection and caret
+
+// MEMBER: "method: () -> Unit?"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt
index c6488782ac33..4fba616b85c1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt
@@ -6,3 +6,8 @@ interface A<T> {
 class C : A<C> {
     <caret>
 }
+
+// MEMBER: "foo(value: C): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
index 68c4bf6807cc..ceb51f528af1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideGenericFunction.kt.after
@@ -8,3 +8,8 @@ class C : A<C> {
         <selection><caret>super.foo(value)</selection>
     }
 }
+
+// MEMBER: "foo(value: C): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt
index 9c69e549ef24..ede4b7182967 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt
@@ -3,3 +3,8 @@ import foo.A
 class C : A() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getAnswer(array: Array<(out) String!>!, number: Int, value: Any!): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
index 3663e4133dec..97b1fab21eb1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.after
@@ -5,3 +5,8 @@ class C : A() {
         <selection><caret>return super.getAnswer(array, number, value)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getAnswer(array: Array<(out) String!>!, number: Int, value: Any!): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.fir.after
index 7e77b9666e1c..9413e85907eb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideJavaMethod/foo/Impl.kt.fir.after
@@ -5,3 +5,8 @@ class C : A() {
         <selection><caret>return super.getAnswer(array, number, value)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "getAnswer(array: Array<(out) String!>!, number: Int, value: Any!): Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt
index 345812d3613d..ecba7693e6ff 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt
@@ -6,3 +6,8 @@ interface A {
 class B : A {
     <caret>
 }
+
+// MEMBER: "foo: Double"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
index 496bb898cbbb..3b88282ce1d9 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
@@ -8,3 +8,8 @@ class B : A {
         get() = <selection><caret>TODO("Not yet implemented")</selection>
         set(value) {}
 }
+
+// MEMBER: "foo: Double"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt
index bf0b98e6a60a..3caf97ce47e7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt
@@ -6,3 +6,8 @@ interface A {
 class C : A {
   <caret>
 }
+
+// MEMBER: "foo(value: String): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
index 3de99bd555bf..2e3e49ece95d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideNonUnitFunction.kt.after
@@ -8,3 +8,8 @@ class C : A {
         <selection><caret>return super.foo(value)</selection>
     }
 }
+
+// MEMBER: "foo(value: String): Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt
index 708b8d9df5e4..a9f8c53e4bb4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt
@@ -11,4 +11,13 @@ interface T {
 }
 
 class C : T {<caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1: Byte"
+// MEMBER: "a2: Short"
+// MEMBER: "a3: Int"
+// MEMBER: "a4: Long"
+// MEMBER: "a5: Float"
+// MEMBER: "a6: Double"
+// MEMBER: "a7: Char"
+// MEMBER: "a8: Boolean"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
index c05ca8d66996..790fb57cea66 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
@@ -27,4 +27,13 @@ class C : T {
         get() = TODO("Not yet implemented")
     override val a8: Boolean
         get() = TODO("Not yet implemented")
-}
\ No newline at end of file
+}
+
+// MEMBER: "a1: Byte"
+// MEMBER: "a2: Short"
+// MEMBER: "a3: Int"
+// MEMBER: "a4: Long"
+// MEMBER: "a5: Float"
+// MEMBER: "a6: Double"
+// MEMBER: "a7: Char"
+// MEMBER: "a8: Boolean"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt
index 91b415ea32d9..0634a57aa880 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt
@@ -14,3 +14,9 @@ class C : A() {
 
     }
 }
+
+// MEMBER: "foo(value: Int): Unit"
+// MEMBER: "bar: Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
index bed129bd1b79..0ec7f85fd8ba 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.after
@@ -33,3 +33,9 @@ class C : A() {
 
     }
 }
+
+// MEMBER: "foo(value: Int): Unit"
+// MEMBER: "bar: Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.fir.after
index 62d5cbf3cd70..9a8d783f15db 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideRespectCaretPosition.kt.fir.after
@@ -32,3 +32,9 @@ class C : A() {
 
     }
 }
+
+// MEMBER: "foo(value: Int): Unit"
+// MEMBER: "bar: Int"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt
index aae4753b4338..7b899a92ede6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt
@@ -4,3 +4,8 @@ package foo
 class Impl: B() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(r: Runnable!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
index dfa4897e0e08..7ae421992d75 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideSamAdapters/foo/Impl.kt.after
@@ -6,3 +6,8 @@ class Impl: B() {
         <selection><caret>super.foo(r)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(r: Runnable!): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt
index cc603088ebb9..255e2f6f6230 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt
@@ -6,3 +6,8 @@ interface A {
 class C : A {
   <caret>
 }
+
+// MEMBER: "foo(value: String): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
index 5ea6364a4482..c78d40f3d9cd 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideUnitFunction.kt.after
@@ -8,3 +8,8 @@ class C : A {
         <selection><caret>super.foo(value)</selection>
     }
 }
+
+// MEMBER: "foo(value: String): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt
index cb7bb6ac6af3..d04b632afb20 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt
@@ -3,3 +3,8 @@ import foo.A
 class B : A {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(): (Mutable)List<String!>!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after
index 7cf007fb2f08..114a50a91e87 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after
@@ -5,3 +5,8 @@ class B : A {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(): (Mutable)List<String!>!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.fir.after
index ae92fca09475..87ab70f8ad16 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.fir.after
@@ -5,3 +5,8 @@ class B : A {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(): (Mutable)List<String!>!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt
index 4cfd67ae82cb..c000e404e633 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt
@@ -3,3 +3,8 @@ import foo.A
 class B : A() {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String!): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.after
index 3e805299ba2d..555b653e46c3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.after
@@ -5,3 +5,8 @@ class B : A() {
         <selection><caret>return super.foo(s)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String!): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.fir.after
index e0e18c01c415..52315460a3e4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformTypes/foo/Impl.kt.fir.after
@@ -5,3 +5,8 @@ class B : A() {
         <selection><caret>return super.foo(s)</selection>
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "foo(s: String!): String!"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt
index 1dfbed147209..ae5a2931f83b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt
@@ -6,3 +6,9 @@ interface I {
 class C : A(), I {
     <caret>
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "x(): Unit"
+// MEMBER: "z(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
index aa592687470e..50902d853e36 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
@@ -24,3 +24,9 @@ class C : A(), I {
         TODO("Not yet implemented")
     }
 }
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "x(): Unit"
+// MEMBER: "z(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt
index cf39a79ca462..14657b1dfd6e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt
@@ -4,3 +4,8 @@ package foo
 class Impl : Bar() {
     <caret>
 }
+
+// MEMBER: "f(): Any"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
index 2377353a10c8..e37c2cf09697 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/propagationKJK/foo/Impl.kt.after
@@ -6,3 +6,8 @@ class Impl : Bar() {
         <selection><caret>return super.f()</selection>
     }
 }
+
+// MEMBER: "f(): Any"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt
index 76704d0669f1..ec106e49d71b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt
@@ -6,3 +6,5 @@ interface T {
 class GC() : T {
     <caret>
 }
+
+// MEMBER: "v: Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after
index 85e6d576b36f..95f0376c3708 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after
@@ -7,3 +7,5 @@ class GC() : T {
     override val v: Int
         get() = <selection><caret>TODO("Not yet implemented")</selection>
 }
+
+// MEMBER: "v: Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt
index 7cbbaf676cc6..1e442a8ccb0e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt
@@ -11,4 +11,10 @@ class Outer {
 
 class X : Outer.Inner1, Outer.Inner2 {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "f(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "g(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt.after
index a585f1c42368..3a0820dc959f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/qualifySuperType.kt.after
@@ -13,4 +13,10 @@ class X : Outer.Inner1, Outer.Inner2 {
     override fun f() {
         <selection><caret>super.f()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "f(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "g(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt
index 5b4bd3f0db9e..dcb46cec8076 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt
@@ -14,3 +14,6 @@ class SomeTest : Test {
 
     }
 }
+
+// MEMBER: "test(): Unit"
+// MEMBER: "testProp: Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index 0cfb371911fa..abdc9724d22f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -20,3 +20,6 @@ class SomeTest : Test {
 
     }
 }
+
+// MEMBER: "test(): Unit"
+// MEMBER: "testProp: Int"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
index bb734f3f9333..7083bc556dd5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt
@@ -6,4 +6,9 @@ public class Impl : ArrayFactory {
     <caret>
 }
 
-val array: Array<String> = emptyArray()
\ No newline at end of file
+val array: Array<String> = emptyArray()
+
+// MEMBER: "create(): Array"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
index 00a2f4289ea6..77c79deba4e5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -8,4 +8,9 @@ public class Impl : ArrayFactory {
     }
 }
 
-val array: Array<String> = emptyArray()
\ No newline at end of file
+val array: Array<String> = emptyArray()
+
+// MEMBER: "create(): Array"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt
index bb8928fbc93d..cb75b816a76f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt
@@ -7,4 +7,6 @@ interface Base {
 
 class Derived : Base {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(c: C<*>): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after
index 7f50dffd7e8b..71b1bcc0881a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after
@@ -9,4 +9,6 @@ class Derived : Base {
     override fun foo(c: C<*>) {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "foo(c: C<*>): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt
index b99187d8b6c4..6febaaa08322 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt
@@ -20,3 +20,11 @@ interface I3 {
 abstract class B : I2, A(), I3 {
     <caret>
 }
+
+// MEMBER: "i2(): Unit"
+// MEMBER: "a(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "i1(): Unit"
+// MEMBER: "i(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after
index fead319093db..93023ea3a5fe 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after
@@ -46,3 +46,11 @@ abstract class B : I2, A(), I3 {
         return super.toString()
     }
 }
+
+// MEMBER: "i2(): Unit"
+// MEMBER: "a(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
+// MEMBER: "i1(): Unit"
+// MEMBER: "i(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt
index 983c6ca3dead..191113da6c44 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt
@@ -6,3 +6,8 @@ interface I {
 class C : I {
     <caret>
 }
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after
index 76d718b86209..68ec6e6f215f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after
@@ -8,3 +8,8 @@ class C : I {
         <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
+
+// MEMBER: "foo(): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt
index 3556c7c5d647..fd1cc7104a15 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt
@@ -7,4 +7,9 @@ interface Bar {
 
 class Bar2 : Bar {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "test(foo: Foo /* = Int */): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt.after
index fd13d3da19d9..8a035d831425 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/typeAliasNotExpanded.kt.after
@@ -9,4 +9,9 @@ class Bar2 : Bar {
     override fun test(foo: Foo) {
         <selection><caret>super.test(foo)</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "test(foo: Foo /* = Int */): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt
index 2c59fc1e7486..3e40883b21a3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt
@@ -6,4 +6,9 @@ interface A<in TPipeline, out TBuilder : Any, TFeature : Any> {
 
 class X : A<String, UnresolvedType, Unit> {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "install(pipeline: String, configure: UnresolvedType.() -> Unit): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after
index 999efafcec50..889a4004053f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after
@@ -9,3 +9,8 @@ class X : A<String, UnresolvedType, Unit> {
         TODO("Not yet implemented")
     }
 }
+
+// MEMBER: "install(pipeline: String, configure: UnresolvedType.() -> Unit): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt
index 4d3d18349907..8e8be863ccdd 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt
@@ -6,4 +6,9 @@ interface A {
 
 class X : A {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "f(x: Iterable<IADW>.() -> PPPP): XXX<Int, YYY>"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt.after
index 61f1e6861e9e..445fedafcc7c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType2.kt.after
@@ -8,4 +8,9 @@ class X : A {
     override fun f(x: Iterable<IADW>.() -> PPPP): XXX<Int, YYY> {
         TODO("Not yet implemented")
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "f(x: Iterable<IADW>.() -> PPPP): XXX<Int, YYY>"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt
index c51644e48668..95a5235a3476 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt
@@ -7,4 +7,6 @@ interface Runnable {
 @JvmInline
 value <caret>class B(private val property: Int) : Runnable {
 
-}
\ No newline at end of file
+}
+
+// MEMBER: "run(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt.after
index 5b765c1b56d6..a24fd46d24c6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/valueClass.kt.after
@@ -11,3 +11,5 @@ value class B(private val property: Int) : Runnable {
     }
 
 }
+
+// MEMBER: "run(): Unit"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt
index 0e28e384fe84..2e3622af5030 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt
@@ -6,3 +6,8 @@ open class S {
 class D : S() {
     <caret>
 }
+
+// MEMBER: "s(vararg v: Int): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt.after
index b8c461782acb..3bb18d4f9ee3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/varArgs.kt.after
@@ -8,3 +8,8 @@ class D : S() {
         <selection><caret>super.s(*v)</selection>
     }
 }
+
+// MEMBER: "s(vararg v: Int): Unit"
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt
index 5704155291f8..8546cba2bff5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt
@@ -9,4 +9,9 @@ public open class B() : A() {
 
 public open class C() : B() {
   <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "foo(): Unit"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
index b68e1b6159df..51c31b3afe7c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/fakeOverride.kt.after
@@ -11,4 +11,9 @@ public open class C() : B() {
     override fun foo() {
         <selection><caret>super.foo()</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "foo(): Unit"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt
index dcfde32cb7ac..195fcb6866eb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt
@@ -5,4 +5,9 @@ import dependency.D
 
 class C: D<Int>() {
     <caret>
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "id(t: Int): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt.after
index 733b976caee8..3155f5584ad7 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/withLib/genericSubstituted.kt.after
@@ -7,4 +7,9 @@ class C: D<Int>() {
     override fun id(t: Int): Int {
         <selection><caret>return super.id(t)</selection>
     }
-}
\ No newline at end of file
+}
+
+// MEMBER: "equals(other: Any?): Boolean"
+// MEMBER: "hashCode(): Int"
+// MEMBER: "id(t: Int): Int"
+// MEMBER: "toString(): String"
\ No newline at end of file