From a1e86e8bfaa933b72331fc71b6605e3c1476771e 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) --- .../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/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt index 6416ff76969..c1c06e2de0f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt @@ -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/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt index 1c418270d84..074be421492 100644 --- a/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt +++ b/idea/testData/quickfix/autoImports/falsePostfixOperator.before.Main.kt @@ -1,6 +1,6 @@ // "Import" "false" // ACTION: Create extension function '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/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test index 93d745c2e9a..ad6811a5cdc 100644 --- a/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test +++ b/idea/testData/quickfix/autoImports/indexCallExtensionGetNoOperator.test @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo()["str"] // ERROR: No get method providing array access // ACTION: Create extension function 'Some.get' -// ACTION: Create member function 'get' +// ACTION: Create member function 'Some.get' // ACTION: Replace overloaded operator with function call diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test index bf37e3a51d5..075001b6402 100644 --- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test +++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenGetNeededButSetAvailable.test @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo()["str"] // ERROR: No set method providing array access // ACTION: Create extension function 'Some.set' -// ACTION: Create member function 'set' +// ACTION: Create member function 'Some.set' // ACTION: Replace overloaded operator with function call diff --git a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test index eafa01f4de9..8b847899de9 100644 --- a/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test +++ b/idea/testData/quickfix/autoImports/indexCallNoImportWhenSetNeededButGetAvailable.test @@ -3,7 +3,7 @@ // ERROR: Unresolved reference: foo()["str"] // ERROR: No get method providing array access // ACTION: Create extension function 'Some.get' -// ACTION: Create member function 'get' +// ACTION: Create member function 'Some.get' // ACTION: Replace overloaded operator with function call diff --git a/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt b/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt index 85a4bb5a86c..220150f8f64 100644 --- a/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt +++ b/idea/testData/quickfix/autoImports/infixCall2.before.Main.kt @@ -1,7 +1,7 @@ // "Import" "false" // ERROR: Unresolved reference: foo // ACTION: Create extension function 'H.foo' -// ACTION: Create member function 'foo' +// ACTION: Create member function 'H.foo' // ACTION: Replace infix call with ordinary call package h diff --git a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test index b4a4b3725a3..b73f2fffeab 100644 --- a/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test +++ b/idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test @@ -2,7 +2,7 @@ // "Import" "false" // ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function 'invoke()' is not found // ACTION: Create extension function 'Some.invoke' -// ACTION: Create member function 'invoke' +// ACTION: Create member function 'Some.invoke' package testing diff --git a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test index d884bd4aba2..6b5587b24ad 100644 --- a/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test +++ b/idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test @@ -2,7 +2,7 @@ // "Import" "false" // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function // ACTION: Create extension function 'Some.component1' -// ACTION: Create member function 'component1' +// ACTION: Create member function 'Some.component1' package testing diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt index cb7370d74b8..2cf24540221 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/classWithReceiver.kt @@ -1,6 +1,6 @@ // "Create class 'A'" "false" // ACTION: Create extension property '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/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt index a5470fdd8cd..8f43f905764 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumQualifier.before.Main.kt @@ -1,5 +1,5 @@ // "Create enum constant 'A'" "false" -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A fun foo() = J.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt index 630bc03138c..93ea7e21de4 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaEnumSuperclass.before.Main.kt @@ -1,6 +1,6 @@ // "Create enum constant 'A'" "false" // ACTION: Convert to block body -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A internal fun foo(): J = J.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt index a5470fdd8cd..8f43f905764 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumQualifier.before.Main.kt @@ -1,5 +1,5 @@ // "Create enum constant 'A'" "false" -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A fun foo() = J.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt index e3a4135d9d1..4983e2725fb 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithJavaNonEnumSuperclass.before.Main.kt @@ -1,6 +1,6 @@ // "Create enum constant 'A'" "false" // ACTION: Convert to block body -// ACTION: Create member property 'A' +// ACTION: Create member property 'E.A' // ACTION: Rename reference // ERROR: Unresolved reference: A internal fun foo(): X = E.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt index 5bb13530d9b..4b12eeaa306 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/enumEntryWithReceiver.kt @@ -1,6 +1,6 @@ // "Create enum constant 'A'" "false" // ACTION: Create extension property '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/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt index 1f2b969ce2c..548f18f9812 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithJavaQualifier.before.Main.kt @@ -1,5 +1,5 @@ // "Create object 'A'" "false" -// ACTION: Create member property 'A' +// ACTION: Create member property 'J.A' // ACTION: Rename reference // ERROR: Unresolved reference: A fun foo() = J.A diff --git a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt index a9dfe7e88ca..f5befe96549 100644 --- a/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt +++ b/idea/testData/quickfix/createFromUsage/createClass/referenceExpression/objectWithReceiver.kt @@ -1,6 +1,6 @@ // "Create object 'A'" "false" // ACTION: Create extension property '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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt index ff542e35aa4..42bec74492b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after index 8f98e44d615..09817cb6b80 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { infix fun foo(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt index 3bf56a55fae..b620ff4d5d9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'compareTo'" "true" +// "Create member function 'A.compareTo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after index e42d3a802e5..9103e5846b8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt index 6f6518db59c..e2c9dccc542 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after index a2c5877b71a..7678a489c14 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt index c7fef627942..dc39919912e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'compareTo'" "true" +// "Create member function 'A.compareTo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after index 1e743d76bcb..0158eb0ec4c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt index 4751421bf20..fea99688dfd 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after index ca3d31fd6da..1e15b717525 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt index e3d7447ef57..a5a44f8a3f2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'plusAssign'" "true" +// "Create member function 'A.plusAssign'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after index 56ba072c9d2..f2a4d0b470b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'plusAssign'" "true" +// "Create member function 'A.plusAssign'" "true" class A(val n: T) { infix operator fun plusAssign(t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt index c43c5aa59dd..f3a47a49b5b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt @@ -1,4 +1,4 @@ -// "Create member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { operator fun unaryPlus(): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after index 512e119385f..7b1013506e7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { operator fun unaryPlus(): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt index 927723a26d0..77da2173ee7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after index db1c9d74ca2..3263b14b151 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt index 211b0b682a0..666c6d641a0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt @@ -1,4 +1,4 @@ -// "Create member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) { fun plus(i: Int, s: String): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after index 334fec23a8f..faca0579ea2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt index 18c376d3bc9..32956c57b61 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after index 130081a8cb1..4dfc901ae23 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt index 38c0565681b..5e3984df7a8 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create member function 'plus'" "true" +// "Create member function 'A.plus'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after index 938ac1f7031..5584258d240 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt index 4063d6dd80c..a8ca8fc01a3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after index 498451a1863..9163aa1cb1f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt index 1698181d4ca..6231ca87826 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'contains'" "true" +// "Create member function 'A.contains'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after index c04ccdb644b..bb8c4f68581 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt index 303944ea9eb..5d141b5a9c3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/abstract/otherExplicitReceiver.kt @@ -1,7 +1,7 @@ // "Create abstract function 'foo'" "false" // ACTION: Convert to expression body // ACTION: Create extension function 'B.foo' -// ACTION: Create member function 'foo' +// ACTION: Create member function 'B.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo abstract class A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt index 12431c47c52..fe37a87e500 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after index 302743fcb04..a63e1feb665 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt index 2bf3286753b..33e461c5811 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after index bc1713a254c..1ea04a5e83f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(function: (T) -> T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt index 34c2ae6e920..b81053f28ea 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'C.foo'" "true" class Settings fun isModified(settings: Settings, c: C) = c.foo(settings) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after index 47ce30377e5..5bf89810911 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'C.foo'" "true" class Settings fun isModified(settings: Settings, c: C) = c.foo(settings) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt index d9c2d281091..2959edadfeb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(a: Int): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after index 037a661210a..6263bb5c379 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt index 8171163203c..0d4e8df58bf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(i: Int, s: String): A = throw Exception() diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after index b3a0b92e113..ab771a0f575 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt index 9a4bac4dd1a..9e9c7057eb9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.Companion.foo'" "true" class A(val n: T) { companion object { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after index cfe62ceb228..ad74836f306 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.Companion.foo'" "true" class A(val n: T) { companion object { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt index 96e5aa36287..ca9ef3bd83c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo internal fun test(a: A): Int? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt index d1a7f2dab2c..bca86869022 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaInterface.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo internal fun test(a: A): Int? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt index 2d8b5cce57a..16c1af770e0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test(): Int? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt index 1a93261d1e6..46f8a02b11d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnJavaType.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test(): Int? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt index f2d16a11cb7..3c4e2fc0bdf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'T.foo'" "true" interface T diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after index 76a520eb7b9..fdc65eae7ba 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'T.foo'" "true" interface T { fun foo(s: String, i: Int): Boolean diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt index 5423e589e86..55ecea16b0b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" object A diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after index 13258dfcd34..afb7e43e8c2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" object A { fun foo(i: Int): Int { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt index 9189f0b4d2e..cc42fc336cf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after index fff27a05b76..809ef3c29b3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt index 2f9f2d98724..f4d46f42468 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'F.foo'" "true" class F { fun bar() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after index ad49e54aa5c..50f25472156 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'F.foo'" "true" class F { fun bar() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt index 2cc630cc998..6c3e7afc08a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after index ef50047dcd3..03ec451c552 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(u: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt index 1333dfada9a..5aa09e757d5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after index e7e832ab760..1b9ff45021a 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt index 1d97e2da303..90f57e3cd8f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after index 61acf2f0abd..79e5ba8498d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(t: T?): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt index a9e9139ddbb..a59b1898313 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after index 4b33d8f486b..2cc12cca10f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(t: T): A? { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt index 417088be13b..cdf48f47686 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after index 076fd0eceb0..7b56ef251ab 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun foo(t: T): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt index 0c06161746f..91ada08c0c1 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test(): Int { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt index e5195845196..72ec900634f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/genericFunOnJavaType.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test(): Int { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt index b34a5413967..7a83ae1a96f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Type mismatch: inferred type is A but Int was expected class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after index d06ed7734a5..8f6dfe86fb3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt index ef7f9a1acd6..009c077937e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after index 8330c78d308..ffa1f7caa63 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A { fun foo(): String { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt index 0a67286da88..8dbbee6bee1 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/staticExtensionFunOnJavaClass.before.Main.kt @@ -1,5 +1,5 @@ -// "Create extension function 'foo'" "false" -// ACTION: Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt index 32357f66fbe..5902606e2c5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'J.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt index 0597850bee8..1555eccd501 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/staticFunOnJavaClass.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'J.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt index 99b105ab863..ffc06baa4de 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'C.foo'" "true" class SetOptions fun isModified(setOptions: SetOptions, c: C) = c.foo(setOptions) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after index d9f351011a7..6749ece5ccd 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'C.foo'" "true" class SetOptions fun isModified(setOptions: SetOptions, c: C) = c.foo(setOptions) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt index 84f18043112..67f585585ac 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun test(): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after index 9cc728a5e5e..8dae9264e64 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { fun test(): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt index 0abf591a8ce..583a904781f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after index d8f6bec55e8..2736a429913 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt index bdb14b3061d..46aa8819177 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.B.foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after index 2aaf326e9e0..4f4d8833109 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt index a8d93c42b6c..c276d688e6c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after index c488f2353a5..8a93f9c27b5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" class A(val n: T) { inner class B(val m: U) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt index c8642d99b10..03e7f6b9c66 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" class B(val t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after index 4d11570753c..a50b6631fe3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt index c2eef0253bd..c169768abad 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" class B(val t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after index 9ec75c6c776..02b70bad814 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt index b95ba7b2681..5c755f9853c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" class B(val t: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after index 4d11570753c..a50b6631fe3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt index 665c40a423e..ebc3a95cc97 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt index 45d3c9ccd90..0c990c906ba 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt index c6ea6830a52..7a7b1758819 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt index 7ad795d23c6..c1a57bfbb18 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt index 665c40a423e..ebc3a95cc97 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt index 1b6fb73f1db..d8428c3b7d3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'B.foo'" "true" // ERROR: Unresolved reference: foo class A internal constructor(val b: B) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt index 3aabe94a6e4..6d40cedab41 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after index 37b4f57ab86..52cbb8e2923 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: s class A(val n: T) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt index 080be2c7ec5..79308d8dc0e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after index 2f3859c3515..a95f4484d16 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'foo'" "true" +// "Create member function 'A.foo'" "true" // ERROR: Unresolved reference: B class A: B { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt index 0dffde81f0e..787c185767e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after index 902e32a257a..393b00932db 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt index 3fe003d3c27..4092ea337bf 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after index fd040400f1d..e58a93e74c2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt index 94154830c5b..335d577a9d9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after index 6b9274bb3f2..46d0dd03d88 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt index c152b01e5e6..a789825d46c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after index 138a8244204..416ab5e9f54 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt index 0069f811b55..bd06878ee20 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after index a544486ec4c..89620ef6380 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'getValue'" "true" +// "Create member function 'F.getValue'" "true" import kotlin.reflect.KProperty class F { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt index 60e3a0179c9..70c129e1074 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after index b697b26db94..3f9e96d3426 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'setValue'" "true" +// "Create member function 'F.setValue'" "true" import kotlin.reflect.KProperty class F { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt index d86b348c640..28130542f96 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after index 013d3348106..295c54adaec 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt index 5200b372537..e72d1ea3576 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after index 3e6cd272f95..4c56327e8d4 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt index 680721b7d71..de10e1406ef 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after index 33703f57483..b35e9e1d3ed 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { operator fun get(s: String, w: T): T { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt index 328484a644e..1e55a364dc0 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after index f15fba44794..a506f22361f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { operator fun get(s: String, w: T): Any { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt index f5f12ad6eb7..a574c536643 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after index b1a892c2e3a..cd7e6a3fc9f 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt index 84851a2434c..5ab217cf9cc 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after index d67a00cbdc4..fe59141de0c 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt index e643de937a9..38b8d94b5aa 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after index 7f2a573f726..6ab64dba583 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo> { fun x (y: Foo>) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt index 5aec7a8c8f4..e799a4b3164 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after index 41c8c998f4e..0bdc764ab9e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" class Foo { fun x (y: Foo>, w: Iterable) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt index c407ee18ebc..c39fd0c771d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after index 899f706e012..9b5b0f7a1ff 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt index 6c454ac50a0..fdd3fa7ac45 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after index 748cd41c746..d93272dcb60 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt index b9ae8d5b19b..69e5152bb11 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after index a7e402d7c2e..f56cf3104c9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'get'" "true" +// "Create member function 'Foo.get'" "true" import java.util.ArrayList diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt index c346a2ff1b5..e8554411d95 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after index 5b95242ac01..1944d27ac0d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'hasNext'" "true" +// "Create member function 'FooIterator.hasNext'" "true" class FooIterator { operator fun next(): Int { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt index 18473c23046..db95e3c3eb9 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after index 0ccf3a2f861..bd18e6b64bd 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'hasNext'" "true" +// "Create member function 'FooIterator.hasNext'" "true" class FooIterator { operator fun next(): T { throw Exception("not implemented") diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt index e4d11733630..284482e3c10 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after index 8d4b042102c..1d0f2b4edfb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt index 2a0f05f9f19..02c2dd159f3 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after index bbf15f19dd3..aa4a1bc6bf2 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt index d1999c2ef08..2f5c2f8ce43 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after index 6dbb7480bd1..9d289394f3b 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt index 28127ffb471..eafe7521df7 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after index a5dc06a211d..ea47bd3abcc 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt index 732ee0f7fc0..ac205b96201 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after index d071dafa27c..494d9c68a8e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt index 0f0cf4d7d3d..8e6375ffa8d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after index 9879417e243..897907ef74e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt index aba53622514..10421a883eb 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after index 4aff8d4ba75..4f1b4445498 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt index 67794a26d1a..4553807c978 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after index be12dc24f85..26118ae3ce5 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt index 6715fe50d14..03f0eff94dd 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after index 5564b879af4..77eafb372bc 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'set'" "true" +// "Create member function 'Foo.set'" "true" class Foo { fun x (y: Foo>, w: java.util.ArrayList) { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt index 99e411cc933..7ba03e70471 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after index f64a10cd5ec..e957be1cedc 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt index 1f50cce8857..23131198829 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after index 1baed4325ce..948c3a8bc8e 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'inc'" "true" +// "Create member function 'A.inc'" "true" class A(val n: T) { operator fun inc(): A { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt index 614972a27cd..a465b06f35d 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after index a7c7a7277d1..930114d1dfa 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt index eb7f03fe386..61999368eba 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after index a84642950d2..c2f2c899214 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "true" class A(val n: T) { operator fun unaryMinus(): Any { diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt index 433ff038cd8..7b8325f6eec 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after index c7eb6a998fb..afac2a8cc43 100644 --- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create member function 'unaryMinus'" "true" +// "Create member function 'A.unaryMinus'" "true" class A(val n: T) { operator fun unaryMinus(): A { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt index af65ddffa18..fe71e2ae62a 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/nonIdentifier.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt index 65f626cefc5..98e676b1330 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/localVariable/qualifiedInFun.kt @@ -1,6 +1,6 @@ // "Create local variable 'foo'" "false" // ACTION: Create extension property '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/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt index 2ba43d97844..b95a061b6bf 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/nonIdentifier.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt index 4a2a122e86e..b9f47b1faeb 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/qualifiedInFun.kt @@ -1,6 +1,6 @@ // "Create parameter 'foo'" "false" // ACTION: Create extension property '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/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt index 4acd046bfa1..9052a339a98 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/staticValOnJavaClass.before.Main.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt index 6840502080b..ea2ce9f800b 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnCompanionObject.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt index ac4ccee9ee9..f1771bab4a8 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/primaryParameter/valOnJavaType.before.Main.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt index 309eef476ca..98c22647b71 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/abstract/otherExplicitReceiver.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt index 82c3ab68d31..e188c075ccf 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/callOnUserType.kt @@ -1,6 +1,6 @@ // "Create property 'foo'" "false" // ACTION: Create extension function '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/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt index 6684bc679d0..745b8025a6d 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after index 0d41703539d..60130d3d17c 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/inconsistentTypes.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt index 1b075857b8a..bf097d86dec 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after index 1b862f5e835..b65bd1353d7 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/qualifiedRefInStringTemplateRuntime.kt.after @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Property must be initialized or be abstract class A { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt index ac6ede148bf..a26c34fe3d6 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticExtensionValOnJavaType.before.Main.kt @@ -1,5 +1,5 @@ // "Create extension property 'foo'" "false" -// ACTION: Create member property 'foo' +// ACTION: Create member property 'J.foo' // ACTION: Rename reference // ERROR: Unresolved reference: foo diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt index 70e6b01dc47..8add1edf554 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.after.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'J.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt index f2cc489083f..17199db81ed 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaClass.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'J.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt index 70e6b01dc47..8add1edf554 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.after.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'J.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt index f2cc489083f..17199db81ed 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/staticValOnJavaInterface.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'J.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt index 07eb5a2749f..f43baf0c83c 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after index 936df6d3e51..8c46b5d12a4 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInClass.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt index ec393f90279..4fbcc6faeef 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after index 4e98f21462c..5594f797bee 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInExtension.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt index bbb96bf70ff..0eb5b6597d5 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after index ddb306d0603..30c37e642be 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass1.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt index 6e86e30edb5..2bcdc2dc296 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after index 190442bbb56..79430841082 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/thisInNestedClass2.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt index cb18b14a66f..9a4d35249b7 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after index d9faad87634..28a429a91d3 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnClassObject.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt index 0c1038f639d..78739e6d720 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.after.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test(): String? { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt index 1852e73106c..f2618699845 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnJavaType.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test(): String? { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt index aa62faa405f..a4d58033579 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after index c0b1a8dfb17..3fb1beba6e4 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserObject.kt.after @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Property must be initialized or be abstract object A { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt index fccc642f7ea..86c4d25e5cb 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after index a2875b827b2..1684b2bf920 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt index 63dfb149e73..0ebae4421ee 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after index e47fab7d249..53236d78872 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt index 61167584c27..98703a0dc30 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after index 3521ca89a38..c8f5ba83d57 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valWithNullableType.kt.after @@ -1,4 +1,4 @@ -// "Create 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/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt index 1fb04e878ee..e0e73e168d0 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.after.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt index 92f5050bda7..8aee468d809 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Unresolved reference: foo fun test() { diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt index 3a84129f79a..840c15e06c8 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt +++ b/idea/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/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after index 3403b1049c5..5cd6001f86c 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after +++ b/idea/testData/quickfix/createFromUsage/createVariable/property/varOnUserType.kt.after @@ -1,4 +1,4 @@ -// "Create member property 'foo'" "true" +// "Create member property 'A.foo'" "true" // ERROR: Property must be initialized or be abstract class A(val n: T) {