From 92ffdc8f3c1ac83dcf557c68134465eeef66e9d0 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 15 Jul 2016 00:52:26 +0300 Subject: [PATCH] Create from Usage: Show target class name in the text of "Create member" quick fix (cherry picked from commit a51d3fc) GitOrigin-RevId: 7470bb83faad9230f79fffe9c617d716a7a2eac8 --- .../CreateCallableFromUsageFix.kt | 23 +++++++++++-------- .../falsePostfixOperator.before.Main.kt | 2 +- .../indexCallExtensionGetNoOperator.test | 2 +- ...lNoImportWhenGetNeededButSetAvailable.test | 2 +- ...lNoImportWhenSetNeededButGetAvailable.test | 2 +- .../autoImports/infixCall2.before.Main.kt | 2 +- .../invokeExtensionNoOperator.test | 2 +- ...clarationExtensionComponentNoOperator.test | 2 +- .../referenceExpression/classWithReceiver.kt | 2 +- ...mEntryWithJavaEnumQualifier.before.Main.kt | 2 +- ...EntryWithJavaEnumSuperclass.before.Main.kt | 2 +- ...tryWithJavaNonEnumQualifier.before.Main.kt | 2 +- ...ryWithJavaNonEnumSuperclass.before.Main.kt | 2 +- .../enumEntryWithReceiver.kt | 2 +- .../objectWithJavaQualifier.before.Main.kt | 2 +- .../referenceExpression/objectWithReceiver.kt | 2 +- .../customOperationOnUserType.kt | 2 +- .../customOperationOnUserType.kt.after | 2 +- .../greaterOrEqualOnUserType.kt | 2 +- .../greaterOrEqualOnUserType.kt.after | 2 +- .../binaryOperations/inOnUserType.kt | 2 +- .../binaryOperations/inOnUserType.kt.after | 2 +- .../binaryOperations/lessOnUserType.kt | 2 +- .../binaryOperations/lessOnUserType.kt.after | 2 +- .../binaryOperations/notInOnUserType.kt | 2 +- .../binaryOperations/notInOnUserType.kt.after | 2 +- .../binaryOperations/plusAssignOnUserType.kt | 2 +- .../plusAssignOnUserType.kt.after | 2 +- .../binaryOperations/plusExtraArgs.kt | 2 +- .../binaryOperations/plusExtraArgs.kt.after | 2 +- .../plusForAssignmentOnUserType.kt | 2 +- .../plusForAssignmentOnUserType.kt.after | 2 +- .../binaryOperations/plusMissingArgs.kt | 2 +- .../binaryOperations/plusMissingArgs.kt.after | 2 +- .../binaryOperations/plusOnUserType.kt | 2 +- .../binaryOperations/plusOnUserType.kt.after | 2 +- .../plusOnUserTypeWithTypeParams.kt | 2 +- .../plusOnUserTypeWithTypeParams.kt.after | 2 +- .../binaryOperations/whenInOnUserType.kt | 2 +- .../whenInOnUserType.kt.after | 2 +- .../binaryOperations/whenNotInOnUserType.kt | 2 +- .../whenNotInOnUserType.kt.after | 2 +- .../call/abstract/otherExplicitReceiver.kt | 2 +- .../createFunction/call/callWithLambdaArg.kt | 2 +- .../call/callWithLambdaArg.kt.after | 2 +- .../call/callWithLambdaArgOnly.kt | 2 +- .../call/callWithLambdaArgOnly.kt.after | 2 +- .../createFunction/call/doNotStripPrefix.kt | 2 +- .../call/doNotStripPrefix.kt.after | 2 +- .../createFunction/call/funExtraArgs.kt | 2 +- .../createFunction/call/funExtraArgs.kt.after | 2 +- .../createFunction/call/funMissingArgs.kt | 2 +- .../call/funMissingArgs.kt.after | 2 +- .../createFunction/call/funOnClassObject.kt | 2 +- .../call/funOnClassObject.kt.after | 2 +- .../call/funOnJavaInterface.after.kt | 2 +- .../call/funOnJavaInterface.before.Main.kt | 2 +- .../call/funOnJavaType.after.kt | 2 +- .../call/funOnJavaType.before.Main.kt | 2 +- .../createFunction/call/funOnTrait.kt | 2 +- .../createFunction/call/funOnTrait.kt.after | 2 +- .../createFunction/call/funOnUserObject.kt | 2 +- .../call/funOnUserObject.kt.after | 2 +- .../createFunction/call/funOnUserType.kt | 2 +- .../call/funOnUserType.kt.after | 2 +- .../call/funOnUserTypeWithDeclarations.kt | 2 +- .../funOnUserTypeWithDeclarations.kt.after | 2 +- .../call/funOnUserTypeWithTypeParams.kt | 2 +- .../call/funOnUserTypeWithTypeParams.kt.after | 2 +- .../funWithExplicitParamNamesOnUserType.kt | 2 +- ...nWithExplicitParamNamesOnUserType.kt.after | 2 +- .../call/funWithNullableParamType.kt | 2 +- .../call/funWithNullableParamType.kt.after | 2 +- .../call/funWithNullableType.kt | 2 +- .../call/funWithNullableType.kt.after | 2 +- .../call/funWithNullableTypeParameter.kt | 2 +- .../funWithNullableTypeParameter.kt.after | 2 +- .../call/genericFunOnJavaType.after.kt | 2 +- .../call/genericFunOnJavaType.before.Main.kt | 2 +- .../createFunction/call/inconsistentTypes.kt | 2 +- .../call/inconsistentTypes.kt.after | 2 +- .../qualifiedCallInStringTemplateRuntime.kt | 2 +- ...lifiedCallInStringTemplateRuntime.kt.after | 2 +- ...aticExtensionFunOnJavaClass.before.Main.kt | 4 ++-- .../call/staticFunOnJavaClass.after.kt | 2 +- .../call/staticFunOnJavaClass.before.Main.kt | 2 +- .../createFunction/call/stripPrefix.kt | 2 +- .../createFunction/call/stripPrefix.kt.after | 2 +- .../createFunction/call/thisInClass.kt | 2 +- .../createFunction/call/thisInClass.kt.after | 2 +- .../createFunction/call/thisInExtension.kt | 2 +- .../call/thisInExtension.kt.after | 2 +- .../createFunction/call/thisInNestedClass1.kt | 2 +- .../call/thisInNestedClass1.kt.after | 2 +- .../createFunction/call/thisInNestedClass2.kt | 2 +- .../call/thisInNestedClass2.kt.after | 2 +- .../call/typeArguments/classMember.kt | 2 +- .../call/typeArguments/classMember.kt.after | 2 +- .../classMemberPartialSubstitution.kt | 2 +- .../classMemberPartialSubstitution.kt.after | 2 +- .../classMemberWithReceiverArg.kt | 2 +- .../classMemberWithReceiverArg.kt.after | 2 +- .../typeArguments/javaClassMember.after.kt | 2 +- .../javaClassMember.before.Main.kt | 2 +- ...avaClassMemberPartialSubstitution.after.kt | 2 +- ...ssMemberPartialSubstitution.before.Main.kt | 2 +- .../javaClassMemberWithReceiverArg.after.kt | 2 +- ...aClassMemberWithReceiverArg.before.Main.kt | 2 +- .../createFunction/call/unknownType.kt | 2 +- .../createFunction/call/unknownType.kt.after | 2 +- .../call/unresolvedSupertype.kt | 2 +- .../call/unresolvedSupertype.kt.after | 2 +- .../component/createComponentFromUsage1.kt | 2 +- .../createComponentFromUsage1.kt.after | 2 +- .../component/createComponentFromUsage2.kt | 2 +- .../createComponentFromUsage2.kt.after | 2 +- .../createFunction/delegateAccessors/val.kt | 2 +- .../delegateAccessors/val.kt.after | 2 +- .../createFunction/delegateAccessors/var.kt | 2 +- .../delegateAccessors/var.kt.after | 2 +- .../delegateAccessors/varMissingGet.kt | 2 +- .../delegateAccessors/varMissingGet.kt.after | 2 +- .../delegateAccessors/varMissingSet.kt | 2 +- .../delegateAccessors/varMissingSet.kt.after | 2 +- .../createFunction/get/createGetFromUsage1.kt | 2 +- .../get/createGetFromUsage1.kt.after | 2 +- .../get/createGetFromUsage10.kt | 2 +- .../get/createGetFromUsage10.kt.after | 2 +- .../get/createGetFromUsage11.kt | 2 +- .../get/createGetFromUsage11.kt.after | 2 +- .../get/createGetFromUsage12.kt | 2 +- .../get/createGetFromUsage12.kt.after | 2 +- .../get/createGetFromUsage13.kt | 2 +- .../get/createGetFromUsage13.kt.after | 2 +- .../createFunction/get/createGetFromUsage3.kt | 2 +- .../get/createGetFromUsage3.kt.after | 2 +- .../createFunction/get/createGetFromUsage4.kt | 2 +- .../get/createGetFromUsage4.kt.after | 2 +- .../createFunction/get/createGetFromUsage5.kt | 2 +- .../get/createGetFromUsage5.kt.after | 2 +- .../createFunction/get/createGetFromUsage7.kt | 2 +- .../get/createGetFromUsage7.kt.after | 2 +- .../createFunction/get/createGetFromUsage8.kt | 2 +- .../get/createGetFromUsage8.kt.after | 2 +- .../createFunction/get/createGetFromUsage9.kt | 2 +- .../get/createGetFromUsage9.kt.after | 2 +- .../hasNext/createHasNextFromUsage1.kt | 2 +- .../hasNext/createHasNextFromUsage1.kt.after | 2 +- .../hasNext/createHasNextFromUsage2.kt | 2 +- .../hasNext/createHasNextFromUsage2.kt.after | 2 +- .../createFunction/invoke/invokeOnUserType.kt | 2 +- .../invoke/invokeOnUserType.kt.after | 2 +- .../invoke/invokeOnUserTypeWithTypeParams.kt | 2 +- .../invokeOnUserTypeWithTypeParams.kt.after | 2 +- .../invokeWithExplicitParamNamesOnUserType.kt | 2 +- ...eWithExplicitParamNamesOnUserType.kt.after | 2 +- .../iterator/createIteratorFromUsage1.kt | 2 +- .../createIteratorFromUsage1.kt.after | 2 +- .../iterator/createIteratorFromUsage2.kt | 2 +- .../createIteratorFromUsage2.kt.after | 2 +- .../iterator/createIteratorFromUsage3.kt | 2 +- .../createIteratorFromUsage3.kt.after | 2 +- .../next/createNextFromUsage1.kt | 2 +- .../next/createNextFromUsage1.kt.after | 2 +- .../next/createNextFromUsage2.kt | 2 +- .../next/createNextFromUsage2.kt.after | 2 +- .../createFunction/set/createSetFromUsage1.kt | 2 +- .../set/createSetFromUsage1.kt.after | 2 +- .../createFunction/set/setterForIncrement.kt | 2 +- .../set/setterForIncrement.kt.after | 2 +- .../unaryOperations/incOnUserType.kt | 2 +- .../unaryOperations/incOnUserType.kt.after | 2 +- .../unaryOperations/minusMissingArgs.kt | 2 +- .../unaryOperations/minusMissingArgs.kt.after | 2 +- .../unaryOperations/minusOnUserType.kt | 2 +- .../unaryOperations/minusOnUserType.kt.after | 2 +- .../minusOnUserTypeWithTypeParams.kt | 2 +- .../minusOnUserTypeWithTypeParams.kt.after | 2 +- .../localVariable/nonIdentifier.kt | 2 +- .../localVariable/qualifiedInFun.kt | 2 +- .../createVariable/parameter/nonIdentifier.kt | 2 +- .../parameter/qualifiedInFun.kt | 2 +- .../staticValOnJavaClass.before.Main.kt | 2 +- .../primaryParameter/valOnCompanionObject.kt | 2 +- .../valOnJavaType.before.Main.kt | 2 +- .../abstract/otherExplicitReceiver.kt | 2 +- .../createVariable/property/callOnUserType.kt | 2 +- .../property/inconsistentTypes.kt | 2 +- .../property/inconsistentTypes.kt.after | 2 +- .../qualifiedRefInStringTemplateRuntime.kt | 2 +- ...alifiedRefInStringTemplateRuntime.kt.after | 2 +- ...taticExtensionValOnJavaType.before.Main.kt | 2 +- .../property/staticValOnJavaClass.after.kt | 2 +- .../staticValOnJavaClass.before.Main.kt | 2 +- .../staticValOnJavaInterface.after.kt | 2 +- .../staticValOnJavaInterface.before.Main.kt | 2 +- .../createVariable/property/thisInClass.kt | 2 +- .../property/thisInClass.kt.after | 2 +- .../property/thisInExtension.kt | 2 +- .../property/thisInExtension.kt.after | 2 +- .../property/thisInNestedClass1.kt | 2 +- .../property/thisInNestedClass1.kt.after | 2 +- .../property/thisInNestedClass2.kt | 2 +- .../property/thisInNestedClass2.kt.after | 2 +- .../property/valOnClassObject.kt | 2 +- .../property/valOnClassObject.kt.after | 2 +- .../property/valOnJavaType.after.kt | 2 +- .../property/valOnJavaType.before.Main.kt | 2 +- .../property/valOnUserObject.kt | 2 +- .../property/valOnUserObject.kt.after | 2 +- .../createVariable/property/valOnUserType.kt | 2 +- .../property/valOnUserType.kt.after | 2 +- .../property/valOnUserTypeWithTypeParams.kt | 2 +- .../valOnUserTypeWithTypeParams.kt.after | 2 +- .../property/valWithNullableType.kt | 2 +- .../property/valWithNullableType.kt.after | 2 +- .../property/varOnJavaType.after.kt | 2 +- .../property/varOnJavaType.before.Main.kt | 2 +- .../createVariable/property/varOnUserType.kt | 2 +- .../property/varOnUserType.kt.after | 2 +- 220 files changed, 234 insertions(+), 229 deletions(-) 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 6416ff769691..c1c06e2de0f0 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 @@ -95,19 +95,24 @@ abstract class CreateCallableFromUsageFixBase( if (it.name.isNotEmpty()) { append(" '") - if (isExtension) { - val callableBuilder = - CallableBuilderConfiguration(callableInfos, element, isExtension = isExtension) - .createBuilder() - val receiverType = callableBuilder - .computeTypeCandidates(callableInfos.first().receiverTypeInfo) - .firstOrNull() - ?.theType - if (receiverType != null) { + val callableBuilder = + CallableBuilderConfiguration(callableInfos, element, isExtension = isExtension) + .createBuilder() + val receiverType = callableBuilder + .computeTypeCandidates(callableInfos.first().receiverTypeInfo) + .firstOrNull() + ?.theType + if (receiverType != null) { + if (isExtension) { val receiverTypeText = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(receiverType) val isFunctionType = receiverType.constructor.declarationDescriptor is FunctionClassDescriptor append(if (isFunctionType) "($receiverTypeText)" else receiverTypeText).append('.') } + else { + receiverType.constructor.declarationDescriptor?.let { + append(IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderClassifierName(it)).append('.') + } + } } append("${it.name}'") 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 1c418270d84d..074be4214921 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 'H?.inc' -// ACTION: Create member function 'inc' +// ACTION: Create member function 'H.inc' // ACTION: Replace overloaded operator with function call // ERROR: Unresolved reference: ++ diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test index 93d745c2e9a7..ad6811a5cdc4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo()["str"] // ERROR: No get method providing array access // ACTION: Create extension function 'Some.get' -// ACTION: Create member function 'get' +// ACTION: Create member function 'Some.get' // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test index bf37e3a51d50..075001b64022 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo()["str"] // ERROR: No set method providing array access // ACTION: Create extension function 'Some.set' -// ACTION: Create member function 'set' +// ACTION: Create member function 'Some.set' // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test index eafa01f4de9e..8b847899de97 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo()["str"] // ERROR: No get method providing array access // ACTION: Create extension function 'Some.get' -// ACTION: Create member function 'get' +// ACTION: Create member function 'Some.get' // ACTION: Replace overloaded operator with function call diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/infixCall2.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/infixCall2.before.Main.kt index 85a4bb5a86c6..220150f8f64d 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/infixCall2.before.Main.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/infixCall2.before.Main.kt @@ -1,7 +1,7 @@ // "Import" "false" // ERROR: Unresolved reference: foo // ACTION: Create extension function 'H.foo' -// ACTION: Create member function 'foo' +// ACTION: Create member function 'H.foo' // ACTION: Replace infix call with ordinary call package h diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtensionNoOperator.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtensionNoOperator.test index b4a4b3725a3c..b73f2fffeabd 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtensionNoOperator.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invokeExtensionNoOperator.test @@ -2,7 +2,7 @@ // "Import" "false" // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found // ACTION: Create extension function 'Some.invoke' -// ACTION: Create member function 'invoke' +// ACTION: Create member function 'Some.invoke' package testing diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test index d884bd4aba25..6b5587b24ad9 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test +++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test @@ -2,7 +2,7 @@ // "Import" "false" // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function // ACTION: Create extension function 'Some.component1' -// ACTION: Create member function 'component1' +// ACTION: Create member function 'Some.component1' package testing 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 cb7370d74b81..2cf245402218 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 'X.A' -// ACTION: Create member property 'A' +// ACTION: Create member property 'X.A' // ACTION: Create property 'A' as constructor parameter // ACTION: Rename reference // ERROR: Unresolved reference: A 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 a5470fdd8cda..8f43f9057648 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,5 +1,5 @@ // "Create enum constant 'A'" "false" -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A fun foo() = J.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 630bc03138c4..93ea7e21de4b 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,6 +1,6 @@ // "Create enum constant 'A'" "false" // ACTION: Convert to block body -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A internal fun foo(): J = J.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 a5470fdd8cda..8f43f9057648 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,5 +1,5 @@ // "Create enum constant 'A'" "false" -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A fun foo() = J.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 e3a4135d9d1e..4983e2725fb9 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,6 +1,6 @@ // "Create enum constant 'A'" "false" // ACTION: Convert to block body -// ACTION: Create member property 'A' +// ACTION: Create member property 'E.A' // ACTION: Rename reference // ERROR: Unresolved reference: A internal fun foo(): X = E.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 5bb13530d9b5..4b12eeaa3064 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 'X.A' -// ACTION: Create member property 'A' +// ACTION: Create member property 'X.A' // ACTION: Create property 'A' as constructor parameter // ACTION: Rename reference // ERROR: Unresolved reference: A 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 1f2b969ce2ce..548f18f98127 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,5 +1,5 @@ // "Create object 'A'" "false" -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A fun foo() = J.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 a9dfe7e88cab..f5befe96549c 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 'X.A' -// ACTION: Create member property 'A' +// ACTION: Create member property 'X.A' // ACTION: Create property 'A' as constructor parameter // ACTION: Rename reference // ERROR: Unresolved reference: A 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 ff542e35aa4c..42bec74492ba 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 member function 'foo'" "true" +// "Create member function 'A.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 8f98e44d6152..09817cb6b80d 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { infix 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 3bf56a55fae4..b620ff4d5d9c 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 member function 'compareTo'" "true" +// "Create member function 'A.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 e42d3a802e51..9103e5846b86 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 member function 'compareTo'" "true" +// "Create member function 'A.compareTo'" "true" class A(val n: T) { infix operator 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 6f6518db59c6..e2c9dccc5428 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 member function 'contains'" "true" +// "Create member function 'A.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 a2c5877b71ae..7678a489c145 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 member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) { infix operator 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 c7fef627942f..dc39919912e8 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 member function 'compareTo'" "true" +// "Create member function 'A.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 1e743d76bcb5..0158eb0ec4cd 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 member function 'compareTo'" "true" +// "Create member function 'A.compareTo'" "true" class A(val n: T) { infix operator 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 4751421bf20c..fea99688dfd7 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 member function 'contains'" "true" +// "Create member function 'A.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 ca3d31fd6da1..1e15b7175258 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 member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) { infix operator 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 e3d7447ef572..a5a44f8a3f21 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 member function 'plusAssign'" "true" +// "Create member function 'A.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 56ba072c9d2e..f2a4d0b470b7 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 member function 'plusAssign'" "true" +// "Create member function 'A.plusAssign'" "true" class A(val n: T) { infix operator 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 c43c5aa59dd3..f3a47a49b5b4 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 member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { operator fun unaryPlus(): 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 512e119385f0..7b1013506e7a 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 member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { operator fun unaryPlus(): 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 927723a26d0b..77da2173ee79 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 member function 'plus'" "true" +// "Create member function 'A.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 db1c9d74ca2c..3263b14b1510 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 member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { infix operator 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 211b0b682a0c..666c6d641a0a 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 member function 'plus'" "true" +// "Create member function 'A.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 334fec23a8f9..faca0579ea2c 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 member function 'plus'" "true" +// "Create member function 'A.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 18c376d3bc93..32956c57b61b 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 member function 'plus'" "true" +// "Create member function 'A.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 130081a8cb1f..4dfc901ae23a 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 member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { infix operator 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 38c0565681b1..5e3984df7a8d 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 member function 'plus'" "true" +// "Create member function 'A.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 938ac1f7031d..5584258d2405 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 member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { infix operator 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 4063d6dd80cb..a8ca8fc01a38 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 member function 'contains'" "true" +// "Create member function 'A.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 498451a18637..9163aa1cb1fc 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 member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) { infix operator 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 1698181d4ca7..6231ca87826c 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 member function 'contains'" "true" +// "Create member function 'A.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 c04ccdb644b0..bb8c4f685811 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 member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) { infix operator fun contains(t: T): Boolean { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt index 303944ea9eb0..5d141b5a9c3f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt @@ -1,7 +1,7 @@ // "Create abstract function 'foo'" "false" // ACTION: Convert to expression body // ACTION: Create extension function 'B.foo' -// ACTION: Create member function 'foo' +// ACTION: Create member function 'B.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo abstract class A { 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 12431c47c522..fe37a87e500c 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 member function 'foo'" "true" +// "Create member function 'A.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 302743fcb045..a63e1feb665b 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(t: T, s: String, function: (T) -> T): 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 2bf3286753bc..33e461c58117 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 member function 'foo'" "true" +// "Create member function 'A.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 bc1713a254c5..1ea04a5e83fe 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(function: (T) -> T): 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 34c2ae6e920d..b81053f28eab 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 member function 'foo'" "true" +// "Create member function 'C.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 47ce30377e50..5bf898109114 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 member function 'foo'" "true" +// "Create member function 'C.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 d9c2d281091c..2959edadfeb0 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 member function 'foo'" "true" +// "Create member function 'A.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 037a661210ad..6263bb5c379f 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 member function 'foo'" "true" +// "Create member function 'A.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 8171163203c5..0d4e8df58bf7 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 member function 'foo'" "true" +// "Create member function 'A.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 b3a0b92e1137..ab771a0f5757 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 member function 'foo'" "true" +// "Create member function 'A.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/funOnClassObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt index 9a4bac4dd1ac..9e9c7057eb92 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 member function 'foo'" "true" +// "Create member function 'A.Companion.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 cfe62ceb2287..ad74836f3062 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 member function 'foo'" "true" +// "Create member function 'A.Companion.foo'" "true" class A(val n: T) { companion object { 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 96e5aa36287b..ca9ef3bd83c7 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo internal 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 d1a7f2dab2c5..bca868690227 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo internal 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 2d8b5cce57a1..16c1af770e0b 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 member function 'foo'" "true" +// "Create member function 'A.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 1a93261d1e61..46f8a02b11d5 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 member function 'foo'" "true" +// "Create member function 'A.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 f2d16a11cb76..3c4e2fc0bdf7 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 member function 'foo'" "true" +// "Create member function 'T.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 76a520eb7b91..fdc65eae7ba4 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 member function 'foo'" "true" +// "Create member function 'T.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 5423e589e86b..55ecea16b0ba 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 member function 'foo'" "true" +// "Create member function 'A.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 13258dfcd340..afb7e43e8c21 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 member function 'foo'" "true" +// "Create member function 'A.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 9189f0b4d2e3..cc42fc336cf6 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 member function 'foo'" "true" +// "Create member function 'A.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 fff27a05b763..809ef3c29b3f 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 member function 'foo'" "true" +// "Create member function 'A.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 2f9f2d987247..f4d46f42468a 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 member function 'foo'" "true" +// "Create member function 'F.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 ad49e54aa5c8..50f254721563 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 member function 'foo'" "true" +// "Create member function 'F.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 2cc630cc9984..6c3e7afc08ac 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 member function 'foo'" "true" +// "Create member function 'A.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 ef50047dcd36..03ec451c5527 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 member function 'foo'" "true" +// "Create member function 'A.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 1333dfada9ac..5aa09e757d56 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 member function 'foo'" "true" +// "Create member function 'A.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 e7e832ab7600..1b9ff45021a5 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 member function 'foo'" "true" +// "Create member function 'A.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 1d97e2da303f..90f57e3cd8fd 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 member function 'foo'" "true" +// "Create member function 'A.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 61acf2f0abd2..79e5ba8498d3 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 member function 'foo'" "true" +// "Create member function 'A.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 a9e9139ddbb7..a59b1898313e 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 member function 'foo'" "true" +// "Create member function 'A.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 4b33d8f486b1..2cc12cca10f0 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 member function 'foo'" "true" +// "Create member function 'A.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 417088be13b4..cdf48f476869 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 member function 'foo'" "true" +// "Create member function 'A.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 076fd0eceb04..7b56ef251ab3 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 member function 'foo'" "true" +// "Create member function 'A.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 0c06161746fa..91ada08c0c1e 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 member function 'foo'" "true" +// "Create member function 'A.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 e51958451960..72ec900634f4 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 member function 'foo'" "true" +// "Create member function 'A.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 b34a5413967c..7a83ae1a96f3 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Type mismatch: inferred type is A but Int was expected 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 d06ed7734a5f..8f6dfe86fb34 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 member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Type mismatch: inferred type is A but Int was expected class A(val n: T) { 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 ef7f9a1acd64..009c077937e7 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 member function 'foo'" "true" +// "Create member function 'A.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 8330c78d3089..ffa1f7caa63f 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 member function 'foo'" "true" +// "Create member function 'A.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 0a67286da88d..8dbbee6bee12 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 member function 'foo' +// "Create extension function 'J.foo'" "false" +// ACTION: Create member function 'J.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo 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 32357f66fbeb..5902606e2c50 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 member function 'foo'" "true" +// "Create member function 'J.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 0597850bee87..1555eccd5018 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 member function 'foo'" "true" +// "Create member function 'J.foo'" "true" // 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 99b105ab8635..ffc06baa4de3 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 member function 'foo'" "true" +// "Create member function 'C.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 d9f351011a74..6749ece5ccd6 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 member function 'foo'" "true" +// "Create member function 'C.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 84f180431125..67f585585ac5 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 member function 'foo'" "true" +// "Create member function 'A.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 9cc728a5e5e0..8dae9264e640 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 member function 'foo'" "true" +// "Create member function 'A.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 0abf591a8ceb..583a904781f0 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 member function 'foo'" "true" +// "Create member function 'A.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 d8f6bec55e83..2736a4299138 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 member function 'foo'" "true" +// "Create member function 'A.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 bdb14b3061db..46aa88191774 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 member function 'foo'" "true" +// "Create member function 'A.B.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 2aaf326e9e05..4f4d88331096 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 member function 'foo'" "true" +// "Create member function 'A.B.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 a8d93c42b6cd..c276d688e6ce 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 member function 'foo'" "true" +// "Create member function 'A.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 c488f2353a53..8a93f9c27b5b 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 member function 'foo'" "true" +// "Create member function 'A.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 c8642d99b109..03e7f6b9c664 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 member function 'foo'" "true" +// "Create member function 'B.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 4d11570753c1..a50b6631fe3c 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 member function 'foo'" "true" +// "Create member function 'B.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 c2eef0253bdc..c169768abad1 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 member function 'foo'" "true" +// "Create member function 'B.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 9ec75c6c776b..02b70bad814f 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 member function 'foo'" "true" +// "Create member function 'B.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 b95ba7b26814..5c755f9853c5 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 member function 'foo'" "true" +// "Create member function 'B.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 4d11570753c1..a50b6631fe3c 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 member function 'foo'" "true" +// "Create member function 'B.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 665c40a423e3..ebc3a95cc97b 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 member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(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 45d3c9ccd900..0c990c906bac 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 member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(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 c6ea6830a52a..7a7b1758819e 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 member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(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 7ad795d23c65..c1a57bfbb18f 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 member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(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 665c40a423e3..ebc3a95cc97b 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 member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(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 1b6fb73f1dba..d8428c3b7d33 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 member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(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 3aabe94a6e4f..6d40cedab419 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 member function 'foo'" "true" +// "Create member function 'A.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 37b4f57ab86e..52cbb8e2923b 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 member function 'foo'" "true" +// "Create member function 'A.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 080be2c7ec56..79308d8dc0ed 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 member function 'foo'" "true" +// "Create member function 'A.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 2f3859c35152..a95f4484d16d 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 member function 'foo'" "true" +// "Create member function 'A.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 0dffde81f0ed..787c185767e9 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 member function 'component3'" "true" +// "Create member function 'Foo.component3'" "true" class Foo { operator fun component1(): Int { return 0 } operator 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 902e32a257ae..393b00932db4 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 member function 'component3'" "true" +// "Create member function 'Foo.component3'" "true" class Foo { operator fun component1(): Int { return 0 } operator 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 3fe003d3c27d..4092ea337bf0 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 member function 'component3'" "true" +// "Create member function 'Foo.component3'" "true" class Foo { operator fun component1(): Int { return 0 } operator 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 fd040400f1d8..e58a93e74c22 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 member function 'component3'" "true" +// "Create member function 'Foo.component3'" "true" class Foo { operator fun component1(): Int { return 0 } operator 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 94154830c5b0..335d577a9d91 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 member function 'getValue'" "true" +// "Create member function 'F.getValue'" "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 6b9274bb3f28..46d0dd03d886 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,6 +1,6 @@ import kotlin.reflect.KProperty -// "Create member function 'getValue'" "true" +// "Create member function 'F.getValue'" "true" class F { operator fun getValue(x: X, property: KProperty<*>): Int { TODO("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 c152b01e5e6b..a789825d46cb 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 member function 'getValue', function 'setValue'" "true" +// "Create member function 'F.getValue', function 'F.setValue'" "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 138a82442046..416ab5e9f540 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,6 +1,6 @@ import kotlin.reflect.KProperty -// "Create member function 'getValue', function 'setValue'" "true" +// "Create member function 'F.getValue', function 'F.setValue'" "true" class F { operator fun getValue(x: X, property: KProperty<*>): Int { TODO("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 0069f811b551..bd06878ee20b 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 member function 'getValue'" "true" +// "Create member function 'F.getValue'" "true" import kotlin.reflect.KProperty class F { 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 a544486ec4c7..89620ef6380a 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 member function 'getValue'" "true" +// "Create member function 'F.getValue'" "true" import kotlin.reflect.KProperty class F { 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 60e3a0179c97..70c129e1074c 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 member function 'setValue'" "true" +// "Create member function 'F.setValue'" "true" import kotlin.reflect.KProperty class F { 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 b697b26db942..3f9e96d34261 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 member function 'setValue'" "true" +// "Create member function 'F.setValue'" "true" import kotlin.reflect.KProperty class F { 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 d86b348c6408..28130542f961 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>) { 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 013d33481067..295c54adaeca 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>) { 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 5200b372537f..e72d1ea3576a 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { 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 3e6cd272f954..4c56327e8d43 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { 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 680721b7d717..de10e1406efe 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo fun x (y: Foo>, w: java.util.ArrayList) { 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 33703f574835..b35e9e1d3ed5 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { operator fun get(s: String, w: T): T { 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 328484a644e1..1e55a364dc0e 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo fun x (y: Foo>, w: java.util.ArrayList) { 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 f15fba44794f..a506f22361fb 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { operator fun get(s: String, w: T): Any { 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 f5f12ad6eb75..a574c536643e 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 b1a892c2e3a1..cd7e6a3fc9f8 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 84851a2434ca..5ab217cf9cc1 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>) { 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 d67a00cbdc48..fe59141de0c6 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>) { 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 e643de937a9e..38b8d94b5aa3 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo> { fun x (y: Foo>) { 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 7f2a573f7261..6ab64dba583d 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo> { fun x (y: Foo>) { 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 5aec7a8c8f4e..e799a4b31648 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>, w: Iterable) { 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 41c8c998f4e8..0bdc764ab9eb 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>, w: Iterable) { 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 c407ee18ebcf..c39fd0c771d9 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 899f706e012a..9b5b0f7a1ffa 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 6c454ac50a03..fdd3fa7ac45e 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 748cd41c746d..d93272dcb60b 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 b9ae8d5b19b9..69e5152bb110 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 a7e402d7c2eb..f56cf3104c99 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 member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList 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 c346a2ff1b55..e8554411d95f 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 member function 'hasNext'" "true" +// "Create member function 'FooIterator.hasNext'" "true" class FooIterator { operator 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 5b95242ac016..1944d27ac0df 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 member function 'hasNext'" "true" +// "Create member function 'FooIterator.hasNext'" "true" class FooIterator { operator 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 18473c230468..db95e3c3eb95 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 member function 'hasNext'" "true" +// "Create member function 'FooIterator.hasNext'" "true" class FooIterator { operator 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 0ccf3a2f8619..bd18e6b64bd6 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 member function 'hasNext'" "true" +// "Create member function 'FooIterator.hasNext'" "true" class FooIterator { operator 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 e4d11733630d..284482e3c108 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 member function 'invoke'" "true" +// "Create member function 'A.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 8d4b042102c8..1d0f2b4edfb8 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 member function 'invoke'" "true" +// "Create member function 'A.invoke'" "true" class A(val n: T) { operator 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 2a0f05f9f196..02c2dd159f3e 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 member function 'invoke'" "true" +// "Create member function 'A.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 bbf15f19dd32..aa4a1bc6bf24 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 member function 'invoke'" "true" +// "Create member function 'A.invoke'" "true" class A(val n: T) { operator 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 d1999c2ef081..2f5c2f8ce432 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 member function 'invoke'" "true" +// "Create member function 'A.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 6dbb7480bd12..9d289394f3b7 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 member function 'invoke'" "true" +// "Create member function 'A.invoke'" "true" class A(val n: T) { operator 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 28127ffb471b..eafe7521df7a 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 member function 'iterator'" "true" +// "Create member function 'Foo.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 a5dc06a211d4..ea47bd3abcc5 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 member function 'iterator'" "true" +// "Create member function 'Foo.iterator'" "true" class Foo { operator fun iterator(): Iterator { TODO("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 732ee0f7fc0c..ac205b962018 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 member function 'iterator'" "true" +// "Create member function 'Foo.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 d071dafa27c0..494d9c68a8eb 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 member function 'iterator'" "true" +// "Create member function 'Foo.iterator'" "true" class Foo { operator fun iterator(): Iterator { TODO("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 0f0cf4d7d3d1..8e6375ffa8d1 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 member function 'next'" "true" +// "Create member function 'FooIterator.next'" "true" class FooIterator { operator 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 9879417e2430..897907ef74ea 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 member function 'next'" "true" +// "Create member function 'FooIterator.next'" "true" class FooIterator { operator fun hasNext(): Boolean { return false } operator fun next(): Any { 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 aba536225140..10421a883eba 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 member function 'next'" "true" +// "Create member function 'FooIterator.next'" "true" class FooIterator { operator 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 4aff8d4ba757..4f1b44454983 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 member function 'next'" "true" +// "Create member function 'FooIterator.next'" "true" class FooIterator { operator fun hasNext(): Boolean { return false } operator fun next(): Int { 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 67794a26d1aa..4553807c9783 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 member function 'next'" "true" +// "Create member function 'FooIterator.next'" "true" class FooIterator { operator 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 be12dc24f85e..26118ae3ce5b 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 member function 'next'" "true" +// "Create member function 'FooIterator.next'" "true" class FooIterator { operator fun hasNext(): Boolean { return false } operator fun next(): T { 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 6715fe50d14b..03f0eff94dd0 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 member function 'set'" "true" +// "Create member function 'Foo.set'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { 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 5564b879af4c..77eafb372bc3 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 member function 'set'" "true" +// "Create member function 'Foo.set'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { 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 99e411cc933e..7ba03e70471a 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 member function 'set'" "true" +// "Create member function 'A.set'" "true" class A { operator 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 f64a10cd5ec2..e957be1cedc8 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 member function 'set'" "true" +// "Create member function 'A.set'" "true" class A { operator fun get(s: String): Int = 1 operator fun set(s: String, value: Int) { 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 1f50cce88575..231311988293 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 member function 'inc'" "true" +// "Create member function 'A.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 1baed4325cea..948c3a8bc8eb 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 member function 'inc'" "true" +// "Create member function 'A.inc'" "true" class A(val n: T) { operator 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 614972a27cd8..a465b06f35de 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 member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "true" class A(val n: T) { operator 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 a7c7a7277d19..930114d1dfa2 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 member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "true" class A(val n: T) { operator 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 eb7f03fe386b..61999368eba0 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 member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "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 a84642950d21..c2f2c899214c 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 member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "true" class A(val n: T) { operator fun unaryMinus(): 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 433ff038cd87..7b8325f6eecd 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 member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "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 c7eb6a998fb5..afac2a8cc43b 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 member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "true" class A(val n: T) { operator fun unaryMinus(): A { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt index af65ddffa184..fe71e2ae62a6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt @@ -1,6 +1,6 @@ // "Create local variable '-'" "false" // ACTION: Create extension function 'A.minus' -// ACTION: Create member function 'minus' +// ACTION: Create member function 'A.minus' // ACTION: Replace overloaded operator with function call // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch:
@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin
@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin
public operator fun Iterable.minus(elements: Array): List defined in kotlin.collections
public operator fun Iterable.minus(elements: Iterable): List defined in kotlin.collections
public operator fun Iterable.minus(elements: Sequence): List defined in kotlin.collections
public operator fun Iterable.minus(element: A): List defined in kotlin.collections
public operator fun Set.minus(elements: Array): Set defined in kotlin.collections
public operator fun Set.minus(elements: Iterable): Set defined in kotlin.collections
public operator fun Set.minus(elements: Sequence): Set defined in kotlin.collections
public operator fun Set.minus(element: A): Set defined in kotlin.collections
public operator fun Sequence.minus(elements: Array): Sequence defined in kotlin.sequences
public operator fun Sequence.minus(elements: Iterable): Sequence defined in kotlin.sequences
public operator fun Sequence.minus(elements: Sequence): Sequence defined in kotlin.sequences
public operator fun Sequence.minus(element: A): Sequence defined in kotlin.sequences class 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 65f626cefc54..98e676b13303 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 'A.foo' -// ACTION: Create member property 'foo' +// ACTION: Create member property 'A.foo' // ACTION: Create property 'foo' as constructor parameter // ACTION: Rename reference // ERROR: Unresolved reference: foo diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt index 2ba43d978442..b95a061b6bf8 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt @@ -1,6 +1,6 @@ // "Create parameter '-'" "false" // ACTION: Create extension function 'A.minus' -// ACTION: Create member function 'minus' +// ACTION: Create member function 'A.minus' // ACTION: Replace overloaded operator with function call // ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch:
@InlineOnly public operator inline fun BigDecimal.minus(other: BigDecimal): BigDecimal defined in kotlin
@InlineOnly public operator inline fun BigInteger.minus(other: BigInteger): BigInteger defined in kotlin
public operator fun Iterable.minus(elements: Array): List defined in kotlin.collections
public operator fun Iterable.minus(elements: Iterable): List defined in kotlin.collections
public operator fun Iterable.minus(elements: Sequence): List defined in kotlin.collections
public operator fun Iterable.minus(element: A): List defined in kotlin.collections
public operator fun Set.minus(elements: Array): Set defined in kotlin.collections
public operator fun Set.minus(elements: Iterable): Set defined in kotlin.collections
public operator fun Set.minus(elements: Sequence): Set defined in kotlin.collections
public operator fun Set.minus(element: A): Set defined in kotlin.collections
public operator fun Sequence.minus(elements: Array): Sequence defined in kotlin.sequences
public operator fun Sequence.minus(elements: Iterable): Sequence defined in kotlin.sequences
public operator fun Sequence.minus(elements: Sequence): Sequence defined in kotlin.sequences
public operator fun Sequence.minus(element: A): Sequence defined in kotlin.sequences 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 4a2a122e86e8..b9f47b1faebb 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 'A.foo' -// ACTION: Create member property 'foo' +// ACTION: Create member property 'A.foo' // ACTION: Create property 'foo' as constructor parameter // ACTION: Rename reference // ERROR: Unresolved reference: foo diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt index 4acd046bfa1d..9052a339a98c 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt @@ -1,5 +1,5 @@ // "Create member property 'foo' as constructor parameter" "false" -// ACTION: Create member property 'foo' +// ACTION: Create member property 'J.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt index 6840502080bf..ea2ce9f800b6 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt @@ -1,5 +1,5 @@ // "Create member property 'foo' as constructor parameter" "false" -// ACTION: Create member property 'foo' +// ACTION: Create member property 'A.Companion.foo' // ACTION: Create extension property 'A.Companion.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt index ac4ccee9ee9e..f1771bab4a8f 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt @@ -1,5 +1,5 @@ // "Create property 'foo' as constructor parameter" "false" -// ACTION: Create member property 'foo' +// ACTION: Create member property 'A.foo' // ACTION: Convert to expression body // ACTION: Create extension property 'A.foo' // ACTION: Rename reference diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt index 309eef476ca6..98c22647b714 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt @@ -1,7 +1,7 @@ // "Create abstract property 'foo'" "false" // ACTION: Convert to expression body // ACTION: Create extension property 'B.foo' -// ACTION: Create member property 'foo' +// ACTION: Create member property 'B.foo' // ACTION: Create property 'foo' as constructor parameter // ACTION: Rename reference // ERROR: Unresolved reference: foo 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 82c3ab68d311..e188c075ccf4 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 'A.bar' -// ACTION: Create member function 'bar' +// ACTION: Create member function 'A.bar' // ACTION: Rename reference // 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 6684bc679d04..745b8025a6db 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 member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Type mismatch: inferred type is A but Int was expected // 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 0d41703539dc..60130d3d17c1 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 member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Type mismatch: inferred type is A but Int was expected // 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 1b075857b8ae..bf097d86dece 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 member property 'foo'" "true" +// "Create member property 'A.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 1b862f5e8359..b65bd1353d76 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 member property 'foo'" "true" +// "Create member property 'A.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 ac6ede148bfe..a26c34fe3d6f 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 member property 'foo' +// ACTION: Create member property 'J.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo 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 70e6b01dc47b..8add1edf554b 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 member property 'foo'" "true" +// "Create member property 'J.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 f2cc489083f2..17199db81ed7 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 member property 'foo'" "true" +// "Create member property 'J.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 70e6b01dc47b..8add1edf554b 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 member property 'foo'" "true" +// "Create member property 'J.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 f2cc489083f2..17199db81ed7 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 member property 'foo'" "true" +// "Create member property 'J.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 07eb5a2749f7..f43baf0c83c1 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 member property 'foo'" "true" +// "Create member property 'A.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 936df6d3e511..8c46b5d12a48 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 member property 'foo'" "true" +// "Create member property 'A.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 ec393f902792..4fbcc6faeefa 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 member property 'foo'" "true" +// "Create member property 'A.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 4e98f21462cf..5594f797bee1 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 member property 'foo'" "true" +// "Create member property 'A.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 bbb96bf70ff1..0eb5b6597d54 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 member property 'foo'" "true" +// "Create member property 'A.B.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 ddb306d0603c..30c37e642be3 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 member property 'foo'" "true" +// "Create member property 'A.B.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 6e86e30edb53..2bcdc2dc2968 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 member property 'foo'" "true" +// "Create member property 'A.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 190442bbb56e..79430841082c 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 member property 'foo'" "true" +// "Create member property 'A.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 cb18b14a66f5..9a4d35249b77 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 member property 'foo'" "true" +// "Create member property 'A.Companion.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 d9faad87634f..28a429a91d3c 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 member property 'foo'" "true" +// "Create member property 'A.Companion.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 0c1038f639da..78739e6d720a 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 member property 'foo'" "true" +// "Create member property 'A.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 1852e73106ce..f2618699845b 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 member property 'foo'" "true" +// "Create member property 'A.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 aa62faa405fd..a4d58033579a 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 member property 'foo'" "true" +// "Create member property 'A.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 c0b1a8dfb170..3fb1beba6e46 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 member property 'foo'" "true" +// "Create member property 'A.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 fccc642f7eaf..86c4d25e5cb6 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 member property 'foo'" "true" +// "Create member property 'A.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 a2875b827b27..1684b2bf9209 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 member property 'foo'" "true" +// "Create member property 'A.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 63dfb149e73e..0ebae4421ee3 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 member property 'foo'" "true" +// "Create member property 'A.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 e47fab7d2495..53236d78872b 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 member property 'foo'" "true" +// "Create member property 'A.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 61167584c27c..98703a0dc307 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 member property 'foo'" "true" +// "Create member property 'A.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 3521ca89a383..c8f5ba83d57d 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 member property 'foo'" "true" +// "Create member property 'A.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 1fb04e878ee3..e0e73e168d02 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 member property 'foo'" "true" +// "Create member property 'A.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 92f5050bda70..8aee468d8094 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 member property 'foo'" "true" +// "Create member property 'A.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 3a84129f79a9..840c15e06c8a 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 member property 'foo'" "true" +// "Create member property 'A.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 3403b1049c5b..5cd6001f86c5 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 member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) {