diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties index 4d9b3084b20d..099b79fce147 100644 --- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties +++ b/plugins/kotlin/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt index 27979b7e25ca..6005a4456e28 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt +++ b/plugins/kotlin/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegationCallActionFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegationCallActionFactory.kt index 51775960af6f..1182d8836515 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegationCallActionFactory.kt +++ b/plugins/kotlin/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegatorToSuperCallActionFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegatorToSuperCallActionFactory.kt index 38bfc9f4c298..512448e3a6c0 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateConstructorFromDelegatorToSuperCallActionFactory.kt +++ b/plugins/kotlin/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index 61ddf993e6ed..fb77409dad92 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/plugins/kotlin/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/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt index 884289bd477b..4b8e0c8d909d 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/plugins/kotlin/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/plugins/kotlin/idea/tests/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt index 1ddc48681d1c..68dbc3ba03bc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt index 538e0032d94e..99c1bfbb9f2b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt index 720b79cff562..aa2c9a6a9b78 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt index 674b30e9d2ca..23d78195efcb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt index 720b79cff562..aa2c9a6a9b78 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt index feb19b4d8de3..b1bc78832fb0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt index 19eb8c909fe6..92934afc4401 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt index fd5882543e7d..882e449de009 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt index 1634560e5787..e15ec7581837 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt index 82c6d09ba7cf..ff542e35aa4c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after index b3d688163c57..40fa26e2d2ab 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt index 24fa9bab9be1..3bf56a55fae4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after index 9ff5fc90cf4a..cfda24639c65 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt index 15b01716f846..6f6518db59c6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after index cafc1f2e377d..9fd492509206 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt index 2c1142a6484c..c7fef627942f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after index dbbd65624a9d..ed005d576f1f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt index 92ed772961bd..4751421bf20c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after index daaab72118d1..7c10e2cb431b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt index 6c3141404320..e3d7447ef572 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after index 78b69161b0e6..f42305cfb1a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt index 905012ce75de..e71b6d28e8ef 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after index 6132970fd5de..0a98529c3bad 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt index 8393ddf9c987..927723a26d0b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after index 3eed6904f0a1..82cfdb7ddbbd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt index 13276a082a29..211b0b682a0c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after index cd047289d4af..213cb041d581 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt index 17b891c6ddae..18c376d3bc93 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after index c0752039f2a4..81d07aacdb75 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt index 0b9abbc369f3..c497191d6ad7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after index 9b9dace30a05..3ee0a79abd50 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt index fd30518798b8..4063d6dd80cb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after index a66efadc1709..a573b7ff4a83 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt index c81862a87514..1698181d4ca7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after index 5a29aecbfb38..eb02d13b8ba0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt index 3359ad63282f..12431c47c522 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after index fdc64bc9eabe..067ac187a8c8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt index afd5f0d0371e..2bf3286753bc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after index 768db103ee2d..7a61c1307d94 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt index 982aaa712cd3..34c2ae6e920d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after index e13ee32404fa..ff79af014c80 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt index 9dbbbd14ff6c..d9c2d281091c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after index e718cbecd9d9..2333eeaadc01 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt index 99faa6f8e6eb..8171163203c5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after index e72d59a61819..d58faa396e52 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt index 91329be1bd6b..ef465654f923 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassNoClassObject.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt index 0ef88cb4eec1..9a4bac4dd1ac 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after index 08812e4fc5fd..ce179af6794f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt index cc11b1fdc319..b08763c712f0 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnGroovyType.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt index 2093e1126943..c4a96bc53a08 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt index 860c2f3b15d3..e8a8c6f62b44 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt index 3ffed58543ea..2d8b5cce57a1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt index cfb52a9b892c..1a93261d1e61 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt index 35759be190fb..f2d16a11cb76 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after index 68189988cee3..76a520eb7b91 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt index 12117fadbcdb..5423e589e86b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after index 73bab5bac17c..2bc2784f9bbf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt index 5c3dd3ece283..9189f0b4d2e3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after index 2e562c62ef84..6ff907323fac 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt index 3e26b2295104..2f9f2d987247 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after index a81e5c728d17..8981c34bdb20 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt index fc69cf34940b..3f6de74e7b33 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after index 98e991bc1443..baf44dc4a2c8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt index 9e5cb2c6cba1..1333dfada9ac 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after index 2d61ba161a7e..97dbc955aa7c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt index 0594c52b0690..1d97e2da303f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after index 549a539a80f5..c7cbc57fa52f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt index fba8c60baa48..a9e9139ddbb7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after index 52148b9c1396..1b7beacd05fc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt index 4d6565ed70cb..417088be13b4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after index 46ed5326f435..a84997924fb2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt index c0cd8e07eaf4..0c06161746fa 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt index f2d82be2d67e..e51958451960 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt index 4cb688b448c2..9e19bb62dfbd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after index 91e4fefa695f..d6d408da0c48 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt index 3b3345e1c438..f5cd8ad599fb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/propertyOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt index c5dab6979b91..ef7f9a1acd64 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after index 7bd1880e985c..4807aeb497ed 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt index 556027cd3498..7088d3b8ad24 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt index da7eb6f8ef27..32357f66fbeb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt index 70c9df191385..0597850bee87 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt index 8dde6f449bef..723e9ab13dc1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaInterface.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt index ab9b92435f0a..99b105ab8635 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after index 65b35513241b..b0e1a0dabf0b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt index 51998af1332c..84f180431125 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after index f25c3d6af4dc..80e02a10c540 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt index 39c0835da025..0abf591a8ceb 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after index fe21822682c2..5f5acac185ce 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt index fcf25cd57045..bdb14b3061db 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after index a8804dece89f..748b419904da 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt index 73ccd9bc12e1..a8d93c42b6cd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after index aaff9e7690f2..8d2aaf7154da 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt index 110ebd161c8f..c8642d99b109 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after index ea2fc4f16734..7bdf6431cc83 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt index 824f6b68d7f2..c2eef0253bdc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after index 1165f37ad587..3dceadaa9812 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt index 086c4f4cc974..b95ba7b26814 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after index ea2fc4f16734..7bdf6431cc83 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt index 1a7877abe31f..b4ae60160776 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt index 165ae074545f..682cde507fb5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt index 91522e59ae7c..3918c1fc692f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt index 7a0313c4186d..5bd82347ddca 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt index 1a7877abe31f..b4ae60160776 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt index 42c87e33083f..e32f9abca9ad 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt index 1a7288b8f821..3aabe94a6e4f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after index 1eb75045d813..dd76ea3f879f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt index 969cc239d048..080be2c7ec56 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after index de2396cb72f9..756616f8c43f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt index 8457e5ce9146..67da74bd0914 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after index c16cae2fd347..33cd9890af73 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt index 04cd8a54bd36..3c5547cde90d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after index 7976cbbe2cc7..a3eed3d407c7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt index b3ccab673f4a..70b8871021e4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after index 2cb9d03531a0..46745b9c59ef 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt index 60bc795364da..2acca7f06a89 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after index ca7765f8b20f..8e664066cb0a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt index 9c2f368459d2..68e1f8305a20 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after index 1ce19dec1853..477ad22d25a4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt index daf1c75f7f36..6d9dc820e90f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after index 9ac005e6892b..7b3eaa3a09ae 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt index c51b30a5d6a8..3619ff1745c6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after index 03737856bc6f..b867c1678eb9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt index 4ac203ea8b2a..d839d088ac0a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after index bef90bafc402..1de81a76e04a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt index 2abb9bcfeaf0..abe94a8db0fd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after index 913e3425a836..2c68bd9dfaff 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt index 430398a2c155..a63474e4cb07 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after index 1da0be0a3d49..476930dd353b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt index b52dfb1ef50b..e86b7e7e17d2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after index f3a7397a9d5b..b82ba830801b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt index 58c53ef9d02f..71ec52209362 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after index f4fa4103830e..f019aabee43c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt index 4b64c7793be3..ab908843b567 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after index 4dd9d81c6cdc..988347628bf7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt index 26543b81acbf..89997fde8c18 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after index e7804794ed8b..a5cb63d16f3c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt index 06cf242ec792..218a622ea8d8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after index b040522fa77a..5092fe6a4f14 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt index 72682ee43b56..a6451c06d085 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after index db3c4c9e8884..3342cd635c01 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt index 106245104220..8f0c65e1bdbe 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after index 3e71c1e59f0d..b2468a5bed1a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt index b573ec14d85b..af54c8eebc23 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after index 12de7bd563a7..6396064200d3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt index 627d7a2bc100..990644a02694 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after index da050d4ea038..c701ef3c1413 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt index 801cec9401d4..e4d11733630d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after index 1327773af156..92100282ebe8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt index 99c3219ab390..41f2668ea8f5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after index 479c38210c4b..eddc7387094e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt index 40a65c4eb16e..d1999c2ef081 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after index 7ff02870a0c1..e1a5d3e9adb9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt index 845a4d7d5fb3..28127ffb471b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after index 848e5ad77e71..b213b5925000 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt index 5eef0b0d7359..732ee0f7fc0c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after index a330a54549dd..1400681f322f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt index b48d27d2c254..8c1bc5bb117d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after index d6fb00e38d98..122b18313b35 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt index a1515047583b..b1f8035b2b4e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after index 6be58c1edd28..cd5c5ba8eb3e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt index 3403f246151e..34f740acb56b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after index fd7dea9a6fbd..1225fdf15337 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt index c59d442c3bc8..be677ce850bd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after index 3efa72019473..c60ee492ac5f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt index 0f36300b7af3..0ef85f51599e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after index b5596b7a8b6b..70665d1a0389 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt index ef6c2efd97e8..1f50cce88575 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after index fa54c329d795..a2c460cf097a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt index a4347d9dd209..8cfb663dc85a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after index a35d96409631..6f3f0c68e4c4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt index 5ad9251721e0..142735ba94c9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after index a48aaec909ae..a7cf648c9cfe 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt index 76780ec2ee74..4677bf225273 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after index 70c73258a0ac..aebc4947a0a7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt index 9c1e1475c6ec..7f61eb2ed0bd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt index a1746211dee9..084c6e96f358 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt index 815782377129..24910ba26cb7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt index c6781c0c4d4a..67c988213bff 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after index f528aa48d3c5..7fe56980ff8f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt index 21e4a3063be3..1b075857b8ae 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after index 5fcacbeb2451..1b862f5e8359 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt index a718738519a7..87dd72af8026 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt index 761ab31908a1..70e6b01dc47b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt index 52aa478b60a8..f2cc489083f2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt index 761ab31908a1..70e6b01dc47b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt index 52aa478b60a8..f2cc489083f2 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt index a8049c7451f3..07eb5a2749f7 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after index 1701d58dbdf5..936df6d3e511 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt index 5b34b5f95711..ec393f902792 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after index 3426dcb6b2dc..4e98f21462cf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt index 014556970644..bbb96bf70ff1 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after index 32734ae2e4a3..ddb306d0603c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt index 78c5194adaa3..6e86e30edb53 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after index 62f9c43a7a5b..190442bbb56e 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt index d4033a26b273..cb18b14a66f5 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after index ebb7165a5180..d9faad87634f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt index bf4722f974c6..0c1038f639da 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt index 6a82aa30f02c..1852e73106ce 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt index 38511c46e5b3..aa62faa405fd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after index 7a56e8350cd8..c0b1a8dfb170 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt index 2c900d08874b..fccc642f7eaf 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after index 853869e2b2ca..a2875b827b27 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt index d5db29c7cc36..f7f29f66db03 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after index 6270d0530703..c20284cf6e83 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt index 09d718888e88..61167584c27c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after index fea8c6bf72d2..3521ca89a383 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt index 70e18b70a1c7..1fb04e878ee3 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt index b7106bfabc3a..92f5050bda70 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt index 7fdede6a4449..3a84129f79a9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt +++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after index fcabff6fab61..3403b1049c5b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after +++ b/plugins/kotlin/idea/tests/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) {