Create from Usage: Show target class name in the text of "Create member" quick fix

(cherry picked from commit a51d3fc)

idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt

@@ -95,19 +95,24 @@ abstract class CreateCallableFromUsageFixBase<E : KtElement>(
                 if (it.name.isNotEmpty()) {
                     append(" '")
 
-                    if (isExtension) {
-                        val callableBuilder =
-                                CallableBuilderConfiguration(callableInfos, element, isExtension = isExtension)
-                                .createBuilder()
-                        val receiverType = callableBuilder
-                                .computeTypeCandidates(callableInfos.first().receiverTypeInfo)
-                                .firstOrNull()
-                                ?.theType
-                        if (receiverType != null) {
+                    val callableBuilder =
+                            CallableBuilderConfiguration(callableInfos, element, isExtension = isExtension)
+                                    .createBuilder()
+                    val receiverType = callableBuilder
+                            .computeTypeCandidates(callableInfos.first().receiverTypeInfo)
+                            .firstOrNull()
+                            ?.theType
+                    if (receiverType != null) {
+                        if (isExtension) {
                             val receiverTypeText = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(receiverType)
                             val isFunctionType = receiverType.constructor.declarationDescriptor is FunctionClassDescriptor
                             append(if (isFunctionType) "($receiverTypeText)" else receiverTypeText).append('.')
                         }
+                        else {
+                            receiverType.constructor.declarationDescriptor?.let {
+                                append(IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderClassifierName(it)).append('.')
+                            }
+                        }
                     }
 
                     append("${it.name}'")

idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt

@@ -1,6 +1,6 @@
 // "Import" "false"
 // ACTION: Create extension function 'H?.inc'
-// ACTION: Create member function 'inc'
+// ACTION: Create member function 'H.inc'
 // ACTION: Replace overloaded operator with function call
 // ERROR: Unresolved reference: ++
 

idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test

@@ -3,7 +3,7 @@
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
 // ACTION: Create extension function 'Some.get'
-// ACTION: Create member function 'get'
+// ACTION: Create member function 'Some.get'
 // ACTION: Replace overloaded operator with function call
 
 

idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test

@@ -3,7 +3,7 @@
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No set method providing array access
 // ACTION: Create extension function 'Some.set'
-// ACTION: Create member function 'set'
+// ACTION: Create member function 'Some.set'
 // ACTION: Replace overloaded operator with function call
 
 

idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test

@@ -3,7 +3,7 @@
 // ERROR: Unresolved reference: foo()["str"]
 // ERROR: No get method providing array access
 // ACTION: Create extension function 'Some.get'
-// ACTION: Create member function 'get'
+// ACTION: Create member function 'Some.get'
 // ACTION: Replace overloaded operator with function call
 
 

idea/testData/quickfix/autoImports/infixCall2.before.Main.kt

@@ -1,7 +1,7 @@
 // "Import" "false"
 // ERROR: Unresolved reference: foo
 // ACTION: Create extension function 'H.foo'
-// ACTION: Create member function 'foo'
+// ACTION: Create member function 'H.foo'
 // ACTION: Replace infix call with ordinary call
 
 package h

idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test

@@ -2,7 +2,7 @@
 // "Import" "false"
 // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found
 // ACTION: Create extension function 'Some.invoke'
-// ACTION: Create member function 'invoke'
+// ACTION: Create member function 'Some.invoke'
 
 
 package testing

idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test

@@ -2,7 +2,7 @@
 // "Import" "false"
 // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ACTION: Create extension function 'Some.component1'
-// ACTION: Create member function 'component1'
+// ACTION: Create member function 'Some.component1'
 
 
 package testing

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt

@@ -1,6 +1,6 @@
 // "Create class 'A'" "false"
 // ACTION: Create extension property 'X.A'
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'X.A'
 // ACTION: Create property 'A' as constructor parameter
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt

@@ -1,5 +1,5 @@
 // "Create enum constant 'A'" "false"
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'J.A'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A
 fun foo() = J.<caret>A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt

@@ -1,6 +1,6 @@
 // "Create enum constant 'A'" "false"
 // ACTION: Convert to block body
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'J.A'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A
 internal fun foo(): J = J.<caret>A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt

@@ -1,5 +1,5 @@
 // "Create enum constant 'A'" "false"
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'J.A'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A
 fun foo() = J.<caret>A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt

@@ -1,6 +1,6 @@
 // "Create enum constant 'A'" "false"
 // ACTION: Convert to block body
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'E.A'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A
 internal fun foo(): X = E.<caret>A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt

@@ -1,6 +1,6 @@
 // "Create enum constant 'A'" "false"
 // ACTION: Create extension property 'X.A'
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'X.A'
 // ACTION: Create property 'A' as constructor parameter
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt

@@ -1,5 +1,5 @@
 // "Create object 'A'" "false"
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'J.A'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A
 fun foo() = J.<caret>A

idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt

@@ -1,6 +1,6 @@
 // "Create object 'A'" "false"
 // ACTION: Create extension property 'X.A'
-// ACTION: Create member property 'A'
+// ACTION: Create member property 'X.A'
 // ACTION: Create property 'A' as constructor parameter
 // ACTION: Rename reference
 // ERROR: Unresolved reference: A

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     infix fun foo(t: T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'compareTo'" "true"
+// "Create member function 'A.compareTo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'compareTo'" "true"
+// "Create member function 'A.compareTo'" "true"
 
 class A<T>(val n: T) {
     infix operator fun compareTo(t: T): Int {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'compareTo'" "true"
+// "Create member function 'A.compareTo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'compareTo'" "true"
+// "Create member function 'A.compareTo'" "true"
 
 class A<T>(val n: T) {
     infix operator fun compareTo(t: T): Int {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'plusAssign'" "true"
+// "Create member function 'A.plusAssign'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'plusAssign'" "true"
+// "Create member function 'A.plusAssign'" "true"
 
 class A<T>(val n: T) {
     infix operator fun plusAssign(t: T) {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     operator fun unaryPlus(): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     operator fun unaryPlus(): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     infix operator fun plus(t: T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     fun plus(i: Int, s: String): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     fun plus(i: Int, s: String): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     infix operator fun plus(t: T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'plus'" "true"
+// "Create member function 'A.plus'" "true"
 
 class A<T>(val n: T) {
     infix operator fun plus(i: Int): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'contains'" "true"
+// "Create member function 'A.contains'" "true"
 
 class A<T>(val n: T) {
     infix operator fun contains(t: T): Boolean {

idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt

@@ -1,7 +1,7 @@
 // "Create abstract function 'foo'" "false"
 // ACTION: Convert to expression body
 // ACTION: Create extension function 'B.foo'
-// ACTION: Create member function 'foo'
+// ACTION: Create member function 'B.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 abstract class A {

idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
 

idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(t: T, s: String, function: (T) -> T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
 

idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(function: (T) -> T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'C.foo'" "true"
 class Settings
 
 fun isModified(settings: Settings, c: C) = c.<caret>foo(settings)

idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'C.foo'" "true"
 class Settings
 
 fun isModified(settings: Settings, c: C) = c.foo(settings)

idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(a: Int): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(a: Int): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<T> = throw Exception()

idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.Companion.foo'" "true"
 
 class A<T>(val n: T) {
     companion object {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.Companion.foo'" "true"
 
 class A<T>(val n: T) {
     companion object {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 internal fun test(a: A): Int? {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 internal fun test(a: A): Int? {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int? {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int? {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'T.foo'" "true"
 
 interface T
 

idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'T.foo'" "true"
 
 interface T {
     fun foo(s: String, i: Int): Boolean

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 object A
 

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 object A {
     fun foo(i: Int): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(t: T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'F.foo'" "true"
 class F {
     fun bar() {
 

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'F.foo'" "true"
 class F {
     fun bar() {
 

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(u: T): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(abc: T, ghi: A<T>, def: String): A<T> {

idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(t: T?): A<Int> {

idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(t: T): A<T>? {

idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(t: T): A<String> {

idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Type mismatch: inferred type is A<Int> but Int was expected
 
 class A<T>(val n: T)

idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 // ERROR: Type mismatch: inferred type is A<Int> but Int was expected
 
 class A<T>(val n: T) {

idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A
 

idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A {
     fun foo(): String {

idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt

@@ -1,5 +1,5 @@
-// "Create extension function 'foo'" "false"
-// ACTION: Create member function 'foo'
+// "Create extension function 'J.foo'" "false"
+// ACTION: Create member function 'J.foo'
 // ACTION: Rename reference
 // ERROR: Unresolved reference: foo
 

idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'J.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test() {

idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'J.foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test() {

idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'C.foo'" "true"
 class SetOptions
 
 fun isModified(setOptions: SetOptions, c: C) = c.<caret>foo(setOptions)

idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'C.foo'" "true"
 class SetOptions
 
 fun isModified(setOptions: SetOptions, c: C) = c.foo(setOptions)

idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun test(): A<Int> {

idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun test(): A<Int> {

idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T)
 

idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<Int> {

idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.B.foo'" "true"
 
 class A<T>(val n: T) {
     inner class B<U>(val m: U) {

idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.B.foo'" "true"
 
 class A<T>(val n: T) {
     inner class B<U>(val m: U) {

idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     inner class B<U>(val m: U) {

idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'A.foo'" "true"
 
 class A<T>(val n: T) {
     inner class B<U>(val m: U) {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'B.foo'" "true"
 
 class B<T>(val t: T) {
 

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'B.foo'" "true"
 
 class B<T>(val t: T) {
     fun <U, V> foo(u: U, v: V): U {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'B.foo'" "true"
 
 class B<T>(val t: T) {
 

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after

@@ -1,4 +1,4 @@
-// "Create member function 'foo'" "true"
+// "Create member function 'B.foo'" "true"
 
 class B<T>(val t: T) {
     fun <U> foo(i: Int, u: U): Int {