Create function/property from usage: added "member" when appropriate + changed order

idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties

@@ -176,7 +176,6 @@ map.platform.class.to.kotlin.multiple=Change all usages of ''{0}'' in this file
 map.platform.class.to.kotlin.advertisement=Choose an appropriate Kotlin class
 map.platform.class.to.kotlin.family=Change to Kotlin class
 create.from.usage.family=Create from usage
-create.0.from.usage=Create {0}
 create.local.variable.from.usage=Create local variable ''{0}''
 create.parameter.from.usage=Create parameter ''{0}''
 surround.with=Surround with

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

@@ -16,11 +16,11 @@
 
 package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createCallable
 
+import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.JetBundle
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.refactoring.canRefactor
 import org.jetbrains.kotlin.idea.core.refactoring.chooseContainerElementIfNecessary
@@ -32,14 +32,21 @@ import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
 import java.util.Collections
 import java.util.HashSet
 
-public class CreateCallableFromUsageFix(
+public class CreateCallableFromUsageFix(originalElement: JetElement, callableInfos: List<CallableInfo>)
+: CreateCallableFromUsageFixBase(originalElement, callableInfos, false) {
+    constructor(originalExpression: JetElement, callableInfo: CallableInfo) : this(originalExpression, Collections.singletonList(callableInfo))
+}
+
+public class CreateExtensionCallableFromUsageFix(originalElement: JetElement, callableInfos: List<CallableInfo>)
+: CreateCallableFromUsageFixBase(originalElement, callableInfos, true), LowPriorityAction {
+    constructor(originalExpression: JetElement, callableInfo: CallableInfo) : this(originalExpression, Collections.singletonList(callableInfo))
+}
+
+public abstract class CreateCallableFromUsageFixBase(
         originalElement: JetElement,
         val callableInfos: List<CallableInfo>,
         val isExtension: Boolean
 ) : CreateFromUsageFixBase(originalElement) {
-    constructor(originalExpression: JetElement,
-                callableInfo: CallableInfo,
-                isExtension: Boolean) : this(originalExpression, Collections.singletonList(callableInfo), isExtension) { }
 
     init {
         assert (callableInfos.isNotEmpty()) { "No CallableInfos: ${originalElement.getElementTextWithContext()}" }
@@ -69,15 +76,24 @@ public class CreateCallableFromUsageFix(
             }
             if (it.name.isNotEmpty()) "$kind '${it.name}'" else kind
         }
-        return JetBundle.message(
+
-                "create.0.from.usage",
+        return StringBuilder {
-                renderedCallables.joinToString(prefix = if (isExtension) "extension " else "")
+            append("Create ")
-        )
+
+            val receiverInfo = callableInfos.first().receiverTypeInfo
+            if (isExtension) {
+                append("extension ")
+            }
+            else if (receiverInfo !is TypeInfo.Empty) {
+                append("member ")
+            }
+
+            renderedCallables.joinTo(this)
+        }.toString()
     }
 
     fun isAvailable(): Boolean {
-        val callableInfo = callableInfos.first()
+        val receiverInfo = callableInfos.first().receiverTypeInfo
-        val receiverInfo = callableInfo.receiverTypeInfo
 
         if (receiverInfo is TypeInfo.Empty) return !isExtension
         // TODO: Remove after companion object extensions are supported
@@ -147,16 +163,16 @@ public class CreateCallableFromUsageFix(
 public fun CreateCallableFromUsageFixes(
         originalExpression: JetExpression,
         callableInfos: List<CallableInfo>
-) : List<CreateCallableFromUsageFix> {
+) : List<CreateCallableFromUsageFixBase> {
     return listOf(
-            CreateCallableFromUsageFix(originalExpression, callableInfos, false),
+            CreateCallableFromUsageFix(originalExpression, callableInfos),
-            CreateCallableFromUsageFix(originalExpression, callableInfos, true)
+            CreateExtensionCallableFromUsageFix(originalExpression, callableInfos)
     ).filter { it.isAvailable() }
 }
 
 public fun CreateCallableFromUsageFixes(
         originalExpression: JetExpression,
         callableInfo: CallableInfo
-) : List<CreateCallableFromUsageFix> {
+) : List<CreateCallableFromUsageFixBase> {
     return CreateCallableFromUsageFixes(originalExpression, Collections.singletonList(callableInfo))
 }

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

@@ -63,6 +63,6 @@ object CreateConstructorFromDelegationCallActionFactory : JetSingleIntentionActi
             )
         }
 
-        return CreateCallableFromUsageFix(delegationCall, SecondaryConstructorInfo(parameters, targetClass), false)
+        return CreateCallableFromUsageFix(delegationCall, SecondaryConstructorInfo(parameters, targetClass))
     }
 }

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

@@ -59,6 +59,6 @@ object CreateConstructorFromDelegatorToSuperCallActionFactory : JetSingleIntenti
             )
         }
 
-        return CreateCallableFromUsageFix(delegationCall, SecondaryConstructorInfo(parameters, targetClass), false)
+        return CreateCallableFromUsageFix(delegationCall, SecondaryConstructorInfo(parameters, targetClass))
     }
 }

idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt

@@ -66,8 +66,8 @@ public class CreateClassFromUsageFix(
         element: JetElement,
         val classInfo: ClassInfo
 ): CreateFromUsageFixBase(element) {
-    override fun getText(): String =
+
-            JetBundle.message("create.0.from.usage", "${classInfo.kind.description} '${classInfo.name}'")
+    override fun getText() = "Create ${classInfo.kind.description} '${classInfo.name}'"
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean {
         if (!super.isAvailable(project, editor, file)) return false

idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt

@@ -131,6 +131,6 @@ private fun JetSimpleNameExpression.getCreatePackageFixIfApplicable(targetParent
     return object: DelegatingIntentionAction(javaFix) {
         override fun getFamilyName(): String = JetBundle.message("create.from.usage.family")
 
-        override fun getText(): String = JetBundle.message("create.0.from.usage", "package '${fullName}'")
+        override fun getText(): String = "Create package '${fullName}'"
     }
 }

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

@@ -1,6 +1,6 @@
 // "Import" "false"
 // ACTION: Create extension function 'inc'
-// ACTION: Create function 'inc'
+// ACTION: Create member function 'inc'
 // ACTION: Create local variable '++'
 // ACTION: Create parameter '++'
 // ACTION: Replace overloaded operator with function call

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

@@ -1,6 +1,6 @@
 // "Create class 'A'" "false"
 // ACTION: Create extension property 'A'
-// ACTION: Create property 'A'
+// ACTION: Create member property 'A'
 // ERROR: Unresolved reference: A
 package p
 

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 // "Create enum constant 'A'" "false"
 // ACTION: Convert to block body
-// ACTION: Create property 'A'
+// ACTION: Create member property 'A'
 // ERROR: Unresolved reference: A
 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 'A'
-// ACTION: Create property 'A'
+// ACTION: Create member property 'A'
 // ERROR: Unresolved reference: A
 package p
 

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

@@ -1,4 +1,4 @@
 // "Create object 'A'" "false"
-// ACTION: Create property 'A'
+// ACTION: Create member property 'A'
 // 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 'A'
-// ACTION: Create property 'A'
+// ACTION: Create member property 'A'
 // ERROR: Unresolved reference: A
 package p
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "false"
+// "Create member function 'foo'" "false"
 // ERROR: Unresolved reference: foo
 
 class A<T>(val n: T)

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

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

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "false"
+// "Create member function 'foo'" "false"
 // ACTION: Convert to expression body
 // ACTION: Create extension function 'foo'
 // ERROR: Unresolved reference: foo

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create member function '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 function 'foo'" "true"
+// "Create member function 'foo'" "true"
 class F {
     fun bar() {
 

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create member function '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 function 'foo'" "true"
+// "Create member function 'foo'" "true"
 // ERROR: Unresolved reference: foo
 
 fun test(): Int {

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create member function 'foo'" "true"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>A&lt;kotlin.Int&gt;</td></tr></table></html>
 
 class A<T>(val n: T)

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create member function 'foo'" "true"
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>A&lt;kotlin.Int&gt;</td></tr></table></html>
 
 class A<T>(val n: T) {

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "false"
+// "Create member function 'foo'" "false"
 // ACTION: Convert to expression body
 // ACTION: Replace with infix function call
 // ERROR: Unresolved reference: x

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create member function '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 function 'foo'
+// ACTION: Create member function 'foo'
 // ERROR: Unresolved reference: foo
 
 fun test() {

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

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

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

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

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

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

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

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

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

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

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

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