From 5b90c09ab16b7c36960481deabe537511c809bd5 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 26 Nov 2015 13:34:20 +0300
Subject: [PATCH] Create from Usage: Add operator modifier to indexing get/set
 functions  #KT-10185 Fixed

---
 .../createCallable/CreateGetFunctionActionFactory.kt            | 2 +-
 .../createCallable/CreateSetFunctionActionFactory.kt            | 2 +-
 .../createFunction/get/createGetFromUsage1.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage10.kt.after            | 2 +-
 .../createFunction/get/createGetFromUsage11.kt.after            | 2 +-
 .../createFunction/get/createGetFromUsage12.kt.after            | 2 +-
 .../createFunction/get/createGetFromUsage13.kt.after            | 2 +-
 .../createFunction/get/createGetFromUsage2.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage3.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage4.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage5.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage7.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage8.kt.after             | 2 +-
 .../createFunction/get/createGetFromUsage9.kt.after             | 2 +-
 .../createFunction/set/createSetFromUsage1.kt.after             | 2 +-
 .../createFunction/set/createSetFromUsage2.kt.after             | 2 +-
 .../createFunction/set/setterForIncrement.kt.after              | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateGetFunctionActionFactory.kt
index 0f69e0df38e..b064ebfadba 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateGetFunctionActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateGetFunctionActionFactory.kt
@@ -37,6 +37,6 @@ object CreateGetFunctionActionFactory : CreateCallableMemberFromUsageFactory<KtA
         val arrayType = TypeInfo(arrayExpr, Variance.IN_VARIANCE)
         val parameters = element.indexExpressions.map { ParameterInfo(TypeInfo(it, Variance.IN_VARIANCE)) }
         val returnType = TypeInfo(element, Variance.OUT_VARIANCE)
-        return FunctionInfo("get", arrayType, returnType, Collections.emptyList(), parameters)
+        return FunctionInfo("get", arrayType, returnType, Collections.emptyList(), parameters, isOperator = true)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt
index be2a5e4d695..11aa7d8f108 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt
@@ -65,6 +65,6 @@ object CreateSetFunctionActionFactory : CreateCallableMemberFromUsageFactory<KtA
         parameters.add(ParameterInfo(valType, "value"))
 
         val returnType = TypeInfo(builtIns.unitType, Variance.OUT_VARIANCE)
-        return FunctionInfo("set", arrayType, returnType, Collections.emptyList(), parameters)
+        return FunctionInfo("set", arrayType, returnType, Collections.emptyList(), parameters, isOperator = true)
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
index b867c1678eb..4ed55c29a22 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
         val z: Iterable<T> = y[""]
     }
 
-    private fun get(s: String): T {
+    private operator fun get(s: String): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
index 1de81a76e04..4fd4f3b5423 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
         val z: Iterable<T> = y["", w]
     }
 
-    private fun get(s: String, w: T): T {
+    private operator fun get(s: String, w: T): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
index 2c68bd9dfaf..26103fbdac7 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
@@ -1,6 +1,6 @@
 // "Create member function 'get'" "true"
 class Foo<T> {
-    fun get(s: String, w: T): T {
+    operator fun get(s: String, w: T): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
index 476930dd353..f8ebf5638e8 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
@@ -1,6 +1,6 @@
 // "Create member function 'get'" "true"
 class Foo<T> {
-    fun get(s: String, w: T): Any {
+    operator fun get(s: String, w: T): Any {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
index b82ba830801..31dc448b12f 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
@@ -8,7 +8,7 @@ class Foo<T> {
         bar(z)
     }
 
-    private fun <V> get(s: String, w: ArrayList<V>): String {
+    private operator fun <V> get(s: String, w: ArrayList<V>): String {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
index 5b03da62375..ae5baccb1b3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
@@ -3,6 +3,6 @@ fun x (y: Any) {
     val z: Any = y[""]
 }
 
-fun Any.get(s: String): Any {
+operator fun Any.get(s: String): Any {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
index f019aabee43..c2fbd56ad63 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
         val z: Iterable<S> = y[""]
     }
 
-    private fun get(s: String): T {
+    private operator fun get(s: String): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
index 988347628bf..ad68666126e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
@@ -4,7 +4,7 @@ class Foo<T, S: Iterable<T>> {
         val z: U = y[""]
     }
 
-    private fun get(s: String): T {
+    private operator fun get(s: String): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
index a5cb63d16f3..7446233adbf 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
         val z: Iterable<T> = y["", w]
     }
 
-    private fun <V> get(s: String, w: Iterable<V>): T {
+    private operator fun <V> get(s: String, w: Iterable<V>): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
index 5092fe6a4f1..d1e45e2eee0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
@@ -6,7 +6,7 @@ class Foo<T> {
         val z: Iterable<T> = y["", w, v]
     }
 
-    private fun <V, T1> get(s: String, w: ArrayList<V>, v: T1): T {
+    private operator fun <V, T1> get(s: String, w: ArrayList<V>, v: T1): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
index 3342cd635c0..89a38b760a1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
@@ -6,7 +6,7 @@ class Foo<T> {
         val z: Iterable<T> = y["", w]
     }
 
-    private fun get(s: String, w: T): T {
+    private operator fun get(s: String, w: T): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
index b2468a5bed1..afd5035a6af 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
@@ -6,7 +6,7 @@ class Foo<S> {
         val z: Iterable<T> = y["", w]
     }
 
-    private fun get(s: String, w: S): S {
+    private operator fun get(s: String, w: S): S {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
index c60ee492ac5..355f1e154b1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
@@ -4,7 +4,7 @@ class Foo<T> {
         y["", w] = w
     }
 
-    private fun set(s: String, w: T, value: T) {
+    private operator fun set(s: String, w: T, value: T) {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
index 9ffeb5266db..21a12da8b76 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
@@ -8,6 +8,6 @@ class Foo<T> {
     }
 }
 
-fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
+operator fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
index 70665d1a038..5da19a2a03c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
@@ -2,7 +2,7 @@
 class A {
     fun get(s: String): Int = 1
 
-    fun set(s: String, value: Int) {
+    operator fun set(s: String, value: Int) {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }