diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index 4d9b3084b20..099b79fce14 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/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 diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt index 27979b7e25c..6005a4456e2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt +++ b/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) +: CreateCallableFromUsageFixBase(originalElement, callableInfos, false) { + constructor(originalExpression: JetElement, callableInfo: CallableInfo) : this(originalExpression, Collections.singletonList(callableInfo)) +} + +public class CreateExtensionCallableFromUsageFix(originalElement: JetElement, callableInfos: List) +: CreateCallableFromUsageFixBase(originalElement, callableInfos, true), LowPriorityAction { + constructor(originalExpression: JetElement, callableInfo: CallableInfo) : this(originalExpression, Collections.singletonList(callableInfo)) +} + +public abstract class CreateCallableFromUsageFixBase( originalElement: JetElement, val callableInfos: List, 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", - renderedCallables.joinToString(prefix = if (isExtension) "extension " else "") - ) + + return StringBuilder { + 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 = callableInfo.receiverTypeInfo + val receiverInfo = callableInfos.first().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 -) : List { +) : List { return listOf( - CreateCallableFromUsageFix(originalExpression, callableInfos, false), - CreateCallableFromUsageFix(originalExpression, callableInfos, true) + CreateCallableFromUsageFix(originalExpression, callableInfos), + CreateExtensionCallableFromUsageFix(originalExpression, callableInfos) ).filter { it.isAvailable() } } public fun CreateCallableFromUsageFixes( originalExpression: JetExpression, callableInfo: CallableInfo -) : List { +) : List { return CreateCallableFromUsageFixes(originalExpression, Collections.singletonList(callableInfo)) } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegationCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegationCallActionFactory.kt index 51775960af6..1182d883651 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegationCallActionFactory.kt +++ b/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)) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegatorToSuperCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegatorToSuperCallActionFactory.kt index 38bfc9f4c29..512448e3a6c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegatorToSuperCallActionFactory.kt +++ b/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)) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index 61ddf993e6e..fb77409dad9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/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 diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt index 884289bd477..4b8e0c8d909 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/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}'" } } diff --git a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt index 1ddc48681d1..68dbc3ba03b 100644 --- a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt index 538e0032d94..99c1bfbb9f2 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt index 720b79cff56..aa2c9a6a9b7 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt +++ b/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.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt index 674b30e9d2c..23d78195efc 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt +++ b/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.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt index 720b79cff56..aa2c9a6a9b7 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt +++ b/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.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt index feb19b4d8de..b1bc78832fb 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt +++ b/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.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt index 19eb8c909fe..92934afc440 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt index fd5882543e7..882e449de00 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt +++ b/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.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt index 1634560e578..e15ec758183 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt index 82c6d09ba7c..ff542e35aa4 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after index b3d688163c5..40fa26e2d2a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt index 24fa9bab9be..3bf56a55fae 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'compareTo'" "true" +// "Create member function 'compareTo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after index 9ff5fc90cf4..cfda24639c6 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'compareTo'" "true" +// "Create member function 'compareTo'" "true" class A(val n: T) { fun compareTo(t: T): Int { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt index 15b01716f84..6f6518db59c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after index cafc1f2e377..9fd49250920 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) { fun contains(t: T): Boolean { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt index 2c1142a6484..c7fef627942 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'compareTo'" "true" +// "Create member function 'compareTo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after index dbbd65624a9..ed005d576f1 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'compareTo'" "true" +// "Create member function 'compareTo'" "true" class A(val n: T) { fun compareTo(t: T): Int { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt index 92ed772961b..4751421bf20 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after index daaab72118d..7c10e2cb431 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) { fun contains(t: T): Boolean { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt index 6c314140432..e3d7447ef57 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'plusAssign'" "true" +// "Create member function 'plusAssign'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after index 78b69161b0e..f42305cfb1a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'plusAssign'" "true" +// "Create member function 'plusAssign'" "true" class A(val n: T) { fun plusAssign(t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt index 905012ce75d..e71b6d28e8e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after index 6132970fd5d..0a98529c3ba 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt index 8393ddf9c98..927723a26d0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after index 3eed6904f0a..82cfdb7ddbb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt index 13276a082a2..211b0b682a0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(i: Int, s: String): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after index cd047289d4a..213cb041d58 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(i: Int, s: String): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt index 17b891c6dda..18c376d3bc9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after index c0752039f2a..81d07aacdb7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt index 0b9abbc369f..c497191d6ad 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after index 9b9dace30a0..3ee0a79abd5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create function 'plus'" "true" +// "Create member function 'plus'" "true" class A(val n: T) { fun plus(i: Int): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt index fd30518798b..4063d6dd80c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after index a66efadc170..a573b7ff4a8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) { fun contains(t: T): Boolean { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt index c81862a8751..1698181d4ca 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after index 5a29aecbfb3..eb02d13b8ba 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'contains'" "true" +// "Create member function 'contains'" "true" class A(val n: T) { fun contains(t: T): Boolean { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt index 3359ad63282..12431c47c52 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after index fdc64bc9eab..067ac187a8c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(t: T, s: String, function: Function1): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt index afd5f0d0371..2bf3286753b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after index 768db103ee2..7a61c1307d9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(function: Function1): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt index 982aaa712cd..34c2ae6e920 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt +++ b/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.foo(settings) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after index e13ee32404f..ff79af014c8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after +++ b/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) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt index 9dbbbd14ff6..d9c2d281091 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(a: Int): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after index e718cbecd9d..2333eeaadc0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(a: Int): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt index 99faa6f8e6e..8171163203c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(i: Int, s: String): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after index e72d59a6181..d58faa396e5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(i: Int, s: String): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt index 91329be1bd6..ef465654f92 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt +++ b/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(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt index 0ef88cb4eec..9a4bac4dd1a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { companion object { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after index 08812e4fc5f..ce179af6794 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { companion object { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt index cc11b1fdc31..b08763c712f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt index 2093e112694..c4a96bc53a0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt +++ b/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? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt index 860c2f3b15d..e8a8c6f62b4 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt +++ b/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? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt index 3ffed58543e..2d8b5cce57a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt +++ b/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? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt index cfb52a9b892..1a93261d1e6 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt +++ b/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? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt index 35759be190f..f2d16a11cb7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" interface T diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after index 68189988cee..76a520eb7b9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt index 12117fadbcd..5423e589e86 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" object A diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after index 73bab5bac17..2bc2784f9bb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after +++ b/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 { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt index 5c3dd3ece28..9189f0b4d2e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after index 2e562c62ef8..6ff907323fa 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt index 3e26b229510..2f9f2d98724 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt +++ b/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() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after index a81e5c728d1..8981c34bdb2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after +++ b/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() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt index fc69cf34940..3f6de74e7b3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after index 98e991bc144..baf44dc4a2c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(u: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt index 9e5cb2c6cba..1333dfada9a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after index 2d61ba161a7..97dbc955aa7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(abc: T, ghi: A, def: String): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt index 0594c52b069..1d97e2da303 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after index 549a539a80f..c7cbc57fa52 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(t: T?): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt index fba8c60baa4..a9e9139ddbb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after index 52148b9c139..1b7beacd05f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(t: T): A? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt index 4d6565ed70c..417088be13b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after index 46ed5326f43..a84997924fb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt index c0cd8e07eaf..0c06161746f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt +++ b/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 { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt index f2d82be2d67..e5195845196 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt +++ b/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 { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt index 4cb688b448c..9e19bb62dfb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Type mismatch.
Required:kotlin.Int
Found:A<kotlin.Int>
class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after index 91e4fefa695..d6d408da0c4 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Type mismatch.
Required:kotlin.Int
Found:A<kotlin.Int>
class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt index 3b3345e1c43..f5cd8ad599f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt +++ b/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 diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt index c5dab6979b9..ef7f9a1acd6 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after index 7bd1880e985..4807aeb497e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after +++ b/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 { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt index 556027cd349..7088d3b8ad2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt +++ b/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() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt index da7eb6f8ef2..32357f66fbe 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt +++ b/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() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt index 70c9df19138..0597850bee8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt +++ b/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() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt index 8dde6f449be..723e9ab13dc 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt +++ b/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() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt index ab9b92435f0..99b105ab863 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt +++ b/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.foo(setOptions) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after index 65b35513241..b0e1a0dabf0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after +++ b/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) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt index 51998af1332..84f18043112 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun test(): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after index f25c3d6af4d..80e02a10c54 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun test(): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt index 39c0835da02..0abf591a8ce 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after index fe21822682c..5f5acac185c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { fun foo(i: Int, s: String): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt index fcf25cd5704..bdb14b3061d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after index a8804dece89..748b419904d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt index 73ccd9bc12e..a8d93c42b6c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after index aaff9e7690f..8d2aaf7154d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt index 110ebd161c8..c8642d99b10 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class B(val t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after index ea2fc4f1673..7bdf6431cc8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after +++ b/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(val t: T) { fun foo(u: U, v: V): U { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt index 824f6b68d7f..c2eef0253bd 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class B(val t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after index 1165f37ad58..3dceadaa981 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class B(val t: T) { fun foo(i: Int, u: U): Int { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt index 086c4f4cc97..b95ba7b2681 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class B(val t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after index ea2fc4f1673..7bdf6431cc8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" class B(val t: T) { fun foo(u: U, v: V): U { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt index 1a7877abe31..b4ae6016077 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: foo class A(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt index 165ae074545..682cde507fb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: foo class A(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt index 91522e59ae7..3918c1fc692 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: foo class A(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt index 7a0313c4186..5bd82347ddc 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: foo class A(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt index 1a7877abe31..b4ae6016077 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: foo class A(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt index 42c87e33083..e32f9abca9a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: foo class A(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt index 1a7288b8f82..3aabe94a6e4 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: s class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after index 1eb75045d81..dd76ea3f879 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: s class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt index 969cc239d04..080be2c7ec5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: B class A: B { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after index de2396cb72f..756616f8c43 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after @@ -1,4 +1,4 @@ -// "Create function 'foo'" "true" +// "Create member function 'foo'" "true" // ERROR: Unresolved reference: B class A: B { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt index 8457e5ce914..67da74bd091 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create function 'component3'" "true" +// "Create member function 'component3'" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after index c16cae2fd34..33cd9890af7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'component3'" "true" +// "Create member function 'component3'" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt index 04cd8a54bd3..3c5547cde90 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create function 'component3'" "true" +// "Create member function 'component3'" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after index 7976cbbe2cc..a3eed3d407c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create function 'component3'" "true" +// "Create member function 'component3'" "true" class Foo { fun component1(): Int { return 0 } fun component2(): Int { return 0 } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt index b3ccab673f4..70b8871021e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class F { } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after index 2cb9d03531a..46745b9c59e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class F { fun get(x: X, propertyMetadata: PropertyMetadata): Int { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt index 60bc795364d..2acca7f06a8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt @@ -1,4 +1,4 @@ -// "Create function 'get', function 'set'" "true" +// "Create member function 'get', function 'set'" "true" class F { } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after index ca7765f8b20..8e664066cb0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get', function 'set'" "true" +// "Create member function 'get', function 'set'" "true" class F { fun get(x: X, propertyMetadata: PropertyMetadata): Int { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt index 9c2f368459d..68e1f8305a2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class F { fun set(x: X, propertyMetadata: PropertyMetadata, i: Int) { } } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after index 1ce19dec185..477ad22d25a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class F { fun set(x: X, propertyMetadata: PropertyMetadata, i: Int) { } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt index daf1c75f7f3..6d9dc820e90 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt @@ -1,4 +1,4 @@ -// "Create function 'set'" "true" +// "Create member function 'set'" "true" class F { fun get(x: X, propertyMetadata: PropertyMetadata): Int = 1 } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after index 9ac005e6892..7b3eaa3a09a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after @@ -1,4 +1,4 @@ -// "Create function 'set'" "true" +// "Create member function 'set'" "true" class F { fun get(x: X, propertyMetadata: PropertyMetadata): Int = 1 diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt index c51b30a5d6a..3619ff1745c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after index 03737856bc6..b867c1678eb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt index 4ac203ea8b2..d839d088ac0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after index bef90bafc40..1de81a76e04 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt index 2abb9bcfeaf..abe94a8db0f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo fun x (y: Foo>, w: java.util.ArrayList) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after index 913e3425a83..2c68bd9dfaf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun get(s: String, w: T): T { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt index 430398a2c15..a63474e4cb0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo fun x (y: Foo>, w: java.util.ArrayList) { val z = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after index 1da0be0a3d4..476930dd353 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun get(s: String, w: T): Any { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt index b52dfb1ef50..e86b7e7e17d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after index f3a7397a9d5..b82ba830801 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt index 58c53ef9d02..71ec5220936 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after index f4fa4103830..f019aabee43 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>) { val z: Iterable = y[""] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt index 4b64c7793be..ab908843b56 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo> { fun x (y: Foo>) { val z: U = y[""] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after index 4dd9d81c6cd..988347628bf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo> { fun x (y: Foo>) { val z: U = y[""] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt index 26543b81acb..89997fde8c1 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>, w: Iterable) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after index e7804794ed8..a5cb63d16f3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" class Foo { fun x (y: Foo>, w: Iterable) { val z: Iterable = y["", w] diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt index 06cf242ec79..218a622ea8d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after index b040522fa77..5092fe6a4f1 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt index 72682ee43b5..a6451c06d08 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after index db3c4c9e888..3342cd635c0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt index 10624510422..8f0c65e1bdb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after index 3e71c1e59f0..b2468a5bed1 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after @@ -1,4 +1,4 @@ -// "Create function 'get'" "true" +// "Create member function 'get'" "true" import java.util.ArrayList class Foo { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt index b573ec14d85..af54c8eebc2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create function 'hasNext'" "true" +// "Create member function 'hasNext'" "true" class FooIterator { fun next(): Int { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after index 12de7bd563a..6396064200d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'hasNext'" "true" +// "Create member function 'hasNext'" "true" class FooIterator { fun next(): Int { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt index 627d7a2bc10..990644a0269 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create function 'hasNext'" "true" +// "Create member function 'hasNext'" "true" class FooIterator { fun next(): T { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after index da050d4ea03..c701ef3c141 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create function 'hasNext'" "true" +// "Create member function 'hasNext'" "true" class FooIterator { fun next(): T { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt index 801cec9401d..e4d11733630 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'invoke'" "true" +// "Create member function 'invoke'" "true" class A(val n: T) class B(val m: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after index 1327773af15..92100282ebe 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'invoke'" "true" +// "Create member function 'invoke'" "true" class A(val n: T) { fun invoke(t: T, s: String): B { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt index 99c3219ab39..41f2668ea8f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create function 'invoke'" "true" +// "Create member function 'invoke'" "true" class A(val n: T) class B(val m: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after index 479c38210c4..eddc7387094 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create function 'invoke'" "true" +// "Create member function 'invoke'" "true" class A(val n: T) { fun invoke(u: T, s: String): B { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt index 40a65c4eb16..d1999c2ef08 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'invoke'" "true" +// "Create member function 'invoke'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after index 7ff02870a0c..e1a5d3e9adb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'invoke'" "true" +// "Create member function 'invoke'" "true" class A(val n: T) { fun invoke(abc: T, ghi: A, def: String): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt index 845a4d7d5fb..28127ffb471 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create function 'iterator'" "true" +// "Create member function 'iterator'" "true" class Foo fun foo() { for (i: Int in Foo()) { } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after index 848e5ad77e7..b213b592500 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'iterator'" "true" +// "Create member function 'iterator'" "true" class Foo { fun iterator(): Iterator { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt index 5eef0b0d735..732ee0f7fc0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create function 'iterator'" "true" +// "Create member function 'iterator'" "true" class Foo fun foo() { for (i in Foo()) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after index a330a54549d..1400681f322 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create function 'iterator'" "true" +// "Create member function 'iterator'" "true" class Foo { fun iterator(): Iterator { throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates. diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt index b48d27d2c25..8c1bc5bb117 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt @@ -1,4 +1,4 @@ -// "Create function 'next'" "true" +// "Create member function 'next'" "true" class FooIterator { fun hasNext(): Boolean { return false } } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after index d6fb00e38d9..122b18313b3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after @@ -1,4 +1,4 @@ -// "Create function 'next'" "true" +// "Create member function 'next'" "true" class FooIterator { fun hasNext(): Boolean { return false } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt index a1515047583..b1f8035b2b4 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create function 'next'" "true" +// "Create member function 'next'" "true" class FooIterator { fun hasNext(): Boolean { return false } } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after index 6be58c1edd2..cd5c5ba8eb3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'next'" "true" +// "Create member function 'next'" "true" class FooIterator { fun hasNext(): Boolean { return false } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt index 3403f246151..34f740acb56 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt @@ -1,4 +1,4 @@ -// "Create function 'next'" "true" +// "Create member function 'next'" "true" class FooIterator { fun hasNext(): Boolean { return false } } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after index fd7dea9a6fb..1225fdf1533 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create function 'next'" "true" +// "Create member function 'next'" "true" class FooIterator { fun hasNext(): Boolean { return false } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt index c59d442c3bc..be677ce850b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt @@ -1,4 +1,4 @@ -// "Create function 'set'" "true" +// "Create member function 'set'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { y["", w] = w diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after index 3efa7201947..c60ee492ac5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create function 'set'" "true" +// "Create member function 'set'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { y["", w] = w diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt index 0f36300b7af..0ef85f51599 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt @@ -1,4 +1,4 @@ -// "Create function 'set'" "true" +// "Create member function 'set'" "true" class A { fun get(s: String): Int = 1 } diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after index b5596b7a8b6..70665d1a038 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after @@ -1,4 +1,4 @@ -// "Create function 'set'" "true" +// "Create member function 'set'" "true" class A { fun get(s: String): Int = 1 diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt index ef6c2efd97e..1f50cce8857 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'inc'" "true" +// "Create member function 'inc'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after index fa54c329d79..a2c460cf097 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'inc'" "true" +// "Create member function 'inc'" "true" class A(val n: T) { fun inc(): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt index a4347d9dd20..8cfb663dc85 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt @@ -1,4 +1,4 @@ -// "Create function 'minus'" "true" +// "Create member function 'minus'" "true" class A(val n: T) { fun minus(n: Int): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after index a35d9640963..6f3f0c68e4c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after @@ -1,4 +1,4 @@ -// "Create function 'minus'" "true" +// "Create member function 'minus'" "true" class A(val n: T) { fun minus(n: Int): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt index 5ad9251721e..142735ba94c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt @@ -1,4 +1,4 @@ -// "Create function 'minus'" "true" +// "Create member function 'minus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after index a48aaec909a..a7cf648c9cf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create function 'minus'" "true" +// "Create member function 'minus'" "true" class A(val n: T) { fun minus(): Any { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt index 76780ec2ee7..4677bf22527 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create function 'minus'" "true" +// "Create member function 'minus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after index 70c73258a0a..aebc4947a0a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create function 'minus'" "true" +// "Create member function 'minus'" "true" class A(val n: T) { fun minus(): A { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt index 9c1e1475c6e..7f61eb2ed0b 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt @@ -1,6 +1,6 @@ // "Create local variable 'foo'" "false" // ACTION: Create extension property 'foo' -// ACTION: Create property 'foo' +// ACTION: Create member property 'foo' // ERROR: Unresolved reference: foo class A diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt index a1746211dee..084c6e96f35 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt @@ -1,6 +1,6 @@ // "Create parameter 'foo'" "false" // ACTION: Create extension property 'foo' -// ACTION: Create property 'foo' +// ACTION: Create member property 'foo' // ERROR: Unresolved reference: foo class A diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt index 81578237712..24910ba26cb 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt @@ -1,6 +1,6 @@ // "Create property 'foo'" "false" // ACTION: Create extension function 'bar' -// ACTION: Create function 'bar' +// ACTION: Create member function 'bar' // ACTION: Replace with infix function call // ERROR: Unresolved reference: bar // ERROR: Unresolved reference: foo diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt index c6781c0c4d4..67c988213bf 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Type mismatch.
Required:kotlin.Int
Found:A<kotlin.Int>
// ERROR: Property must be initialized or be abstract diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after index f528aa48d3c..7fe56980ff8 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Type mismatch.
Required:kotlin.Int
Found:A<kotlin.Int>
// ERROR: Property must be initialized or be abstract diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt index 21e4a3063be..1b075857b8a 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after index 5fcacbeb245..1b862f5e835 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt index a718738519a..87dd72af802 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt @@ -1,5 +1,5 @@ // "Create extension property 'foo'" "false" -// ACTION: Create property 'foo' +// ACTION: Create member property 'foo' // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt index 761ab31908a..70e6b01dc47 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt index 52aa478b60a..f2cc489083f 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt index 761ab31908a..70e6b01dc47 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt index 52aa478b60a..f2cc489083f 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt index a8049c7451f..07eb5a2749f 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after index 1701d58dbdf..936df6d3e51 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt index 5b34b5f9571..ec393f90279 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after index 3426dcb6b2d..4e98f21462c 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt index 01455697064..bbb96bf70ff 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after index 32734ae2e4a..ddb306d0603 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt index 78c5194adaa..6e86e30edb5 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after index 62f9c43a7a5..190442bbb56 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt index d4033a26b27..cb18b14a66f 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after index ebb7165a518..d9faad87634 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt index bf4722f974c..0c1038f639d 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test(): String? { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt index 6a82aa30f02..1852e73106c 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test(): String? { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt index 38511c46e5b..aa62faa405f 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract object A diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after index 7a56e8350cd..c0b1a8dfb17 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract object A { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt index 2c900d08874..fccc642f7ea 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after index 853869e2b2c..a2875b827b2 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt index d5db29c7cc3..f7f29f66db0 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after index 6270d053070..c20284cf6e8 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt index 09d718888e8..61167584c27 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after index fea8c6bf72d..3521ca89a38 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt index 70e18b70a1c..1fb04e878ee 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt index b7106bfabc3..92f5050bda7 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt index 7fdede6a444..3a84129f79a 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after index fcabff6fab6..3403b1049c5 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create property 'foo'" "true" +// "Create member property 'foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) {