Create from usage (function/property): Suggest separate actions for extensions and non-extension declarations

#KT-6023 Fixed

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

@@ -1,4 +1,5 @@
 // "Import" "false"
+// ACTION: Create extension function 'inc'
 // ACTION: Create function 'inc'
 // ACTION: Create local variable '++'
 // ACTION: Create parameter '++'

idea/testData/quickfix/createFromUsage/createClass/callExpression/beforeCallWithLibClassQualifier.kt

@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "false"
-// ACTION: Create function 'Foo'
+// ACTION: Create extension function 'Foo'
 // ACTION: Replace with infix function call
 // ACTION: Split property declaration
 // ERROR: Unresolved reference: Foo

idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithJavaClassReceiver.before.Main.kt

@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "false"
-// ACTION: Create function 'Foo'
+// ACTION: Create extension function 'Foo'
 // ACTION: Convert to expression body
 // ERROR: Unresolved reference: Foo
 

idea/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/beforeExtension.kt

@@ -1,5 +1,5 @@
 // "Create class 'Foo'" "false"
-// ACTION: Create function 'Foo'
+// ACTION: Create extension function 'Foo'
 // ERROR: Unresolved reference: Foo
 
 class A<T>(val items: List<T>) {

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

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

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

@@ -1,4 +1,5 @@
 // "Create enum constant 'A'" "false"
+// ACTION: Create extension property 'A'
 // ACTION: Create property 'A'
 // ERROR: Unresolved reference: A
 package p

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

@@ -1,4 +1,5 @@
 // "Create object 'A'" "false"
+// ACTION: Create extension property 'A'
 // ACTION: Create property 'A'
 // ERROR: Unresolved reference: A
 package p

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

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

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 fun test() {
     val a: Int = Unit.foo(2)

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

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

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

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 fun test() {
     val a: Int = Unit.<caret>foo(2)

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

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

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

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

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

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

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 class A<T>(val items: List<T>) {
     fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 class A<T>(val items: List<T>) {
     fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 class A<T>(val items: List<T>) {
     fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtension.kt

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 class A<T>(val items: List<T>) {
     fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionPartialSubstitution.kt

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 class A<T>(val items: List<T>) {
     fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/beforeExtensionWithReceiverArg.kt

@@ -1,4 +1,4 @@
-// "Create function 'foo'" "true"
+// "Create extension function 'foo'" "true"
 
 class A<T>(val items: List<T>) {
     fun test(): Int {

idea/testData/quickfix/createFromUsage/createFunction/component/afterCreateComponentFromUsage3.kt

@@ -1,4 +1,4 @@
-// "Create function 'component2'" "true"
+// "Create extension function 'component2'" "true"
 class FooIterator<T> {
     fun hasNext(): Boolean { return false }
     fun next(): Any {

idea/testData/quickfix/createFromUsage/createFunction/component/beforeCreateComponentFromUsage3.kt

@@ -1,4 +1,4 @@
-// "Create function 'component2'" "true"
+// "Create extension function 'component2'" "true"
 class FooIterator<T> {
     fun hasNext(): Boolean { return false }
     fun next(): Any {

idea/testData/quickfix/createFromUsage/createFunction/get/afterCreateGetFromUsage2.kt

@@ -1,4 +1,4 @@
-// "Create function 'get'" "true"
+// "Create extension function 'get'" "true"
 fun x (y: Any) {
     val z: Any = y[""]
 }

idea/testData/quickfix/createFromUsage/createFunction/get/beforeCreateGetFromUsage2.kt

@@ -1,4 +1,4 @@
-// "Create function 'get'" "true"
+// "Create extension function 'get'" "true"
 fun x (y: Any) {
     val z: Any = y<caret>[""]
 }

idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnLibType.kt

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

idea/testData/quickfix/createFromUsage/createFunction/invoke/beforeInvokeOnLibType.kt

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

idea/testData/quickfix/createFromUsage/createFunction/set/afterCreateSetFromUsage2.kt

@@ -1,4 +1,4 @@
-// "Create function 'set'" "true"
+// "Create extension function 'set'" "true"
 
 import java.util.ArrayList
 

idea/testData/quickfix/createFromUsage/createFunction/set/beforeCreateSetFromUsage2.kt

@@ -1,4 +1,4 @@
-// "Create function 'set'" "true"
+// "Create extension function 'set'" "true"
 
 class Foo<T> {
     fun <T> x (y: Any, w: java.util.ArrayList<T>) {

idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/afterMinusOnLibType.kt

@@ -1,4 +1,4 @@
-// "Create function 'minus'" "true"
+// "Create extension function 'minus'" "true"
 
 fun test() {
     val a = -false

idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/beforeMinusOnLibType.kt

@@ -1,4 +1,4 @@
-// "Create function 'minus'" "true"
+// "Create extension function 'minus'" "true"
 
 fun test() {
     val a = <caret>-false

idea/testData/quickfix/createFromUsage/createVariable/localVariable/beforeQualifiedInFun.kt

@@ -1,4 +1,5 @@
 // "Create local variable 'foo'" "false"
+// ACTION: Create extension property 'foo'
 // ACTION: Create property 'foo'
 // ACTION: Split property declaration
 // ERROR: Unresolved reference: foo

idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeQualifiedInFun.kt

@@ -1,5 +1,6 @@
 // "Create parameter 'foo'" "false"
 // ACTION: Split property declaration
+// ACTION: Create extension property 'foo'
 // ACTION: Create property 'foo'
 // ERROR: Unresolved reference: foo
 

idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnLibObject.kt

@@ -1,4 +1,4 @@
-// "Create property 'foo'" "true"
+// "Create extension property 'foo'" "true"
 // ERROR: Property must be initialized
 
 fun test() {

idea/testData/quickfix/createFromUsage/createVariable/property/afterValOnLibType.kt

@@ -1,4 +1,4 @@
-// "Create property 'foo'" "true"
+// "Create extension property 'foo'" "true"
 // ERROR: Property must be initialized
 
 class A<T>(val n: T)

idea/testData/quickfix/createFromUsage/createVariable/property/afterVarOnLibType.kt

@@ -1,4 +1,4 @@
-// "Create property 'foo'" "true"
+// "Create extension property 'foo'" "true"
 // ERROR: Property must be initialized
 
 class A<T>(val n: T)

idea/testData/quickfix/createFromUsage/createVariable/property/beforeCallOnUserType.kt

@@ -1,4 +1,5 @@
 // "Create property 'foo'" "false"
+// ACTION: Create extension function 'bar'
 // ACTION: Create function 'bar'
 // ACTION: Replace with infix function call
 // ERROR: Unresolved reference: bar

idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibObject.kt

@@ -1,4 +1,4 @@
-// "Create property 'foo'" "true"
+// "Create extension property 'foo'" "true"
 // ERROR: Property must be initialized
 
 fun test() {

idea/testData/quickfix/createFromUsage/createVariable/property/beforeValOnLibType.kt

@@ -1,4 +1,4 @@
-// "Create property 'foo'" "true"
+// "Create extension property 'foo'" "true"
 // ERROR: Property must be initialized
 
 class A<T>(val n: T)

idea/testData/quickfix/createFromUsage/createVariable/property/beforeVarOnLibType.kt

@@ -1,4 +1,4 @@
-// "Create property 'foo'" "true"
+// "Create extension property 'foo'" "true"
 // ERROR: Property must be initialized
 
 class A<T>(val n: T)