Replace get() and set() to getValue() and setValue() (property delegates)

compiler/testData/codegen/box/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.kt

@@ -1,7 +1,7 @@
 // KT-5612
 
 class Delegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String {
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String {
         return "OK"
     }
 }

compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 class B {

compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int = 1
+    fun getValue(t: Any?, p: PropertyMetadata): Int = 1
 }
 
 class AImpl {

compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt

@@ -1,10 +1,10 @@
 class Delegate {
     var inner = Derived()
-    fun get(t: Any?, p: PropertyMetadata): Derived {
+    fun getValue(t: Any?, p: PropertyMetadata): Derived {
         inner = Derived(inner.a + "-get")
         return inner
     }
-    fun set(t: Any?, p: PropertyMetadata, i: Base) { inner = Derived(inner.a + "-" + i.a + "-set") }
+    fun setValue(t: Any?, p: PropertyMetadata, i: Base) { inner = Derived(inner.a + "-" + i.a + "-set") }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata, s: String = ""): Int = 1
+    fun getValue(t: Any?, p: PropertyMetadata, s: String = ""): Int = 1
 }
 
 val prop: Int by Delegate()

compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt

@@ -3,8 +3,8 @@ class A {
 
     class Delegate {
         var inner = 1
-        fun get(t: Any?, p: PropertyMetadata): Int = inner
-        fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+        fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+        fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
     }
 }
 

compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 fun foo() = Delegate()

compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 val p = Delegate()

compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt

@@ -1,5 +1,5 @@
 class Delegate {
-  fun get(t: A, p: PropertyMetadata): Int = 1
+  fun getValue(t: A, p: PropertyMetadata): Int = 1
 }
 
 val A.prop: Int by Delegate()

compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: F.A, p: PropertyMetadata): Int = 1
+    fun getValue(t: F.A, p: PropertyMetadata): Int = 1
 }
 
 class F {

compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt

@@ -1,6 +1,6 @@
 class Delegate<T>(var inner: T) {
-    fun get(t: Any?, p: PropertyMetadata): T = inner
-    fun set(t: Any?, p: PropertyMetadata, i: T) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): T = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: T) { inner = i }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt

@@ -1,7 +1,7 @@
 class Delegate {
 }
 
-fun Delegate.get(t: Any?, p: PropertyMetadata): Int = 1
+fun Delegate.getValue(t: Any?, p: PropertyMetadata): Int = 1
 
 class A {
     val prop: Int by Delegate()

compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt

@@ -2,7 +2,7 @@ class Delegate {
 }
 
 class A {
-    fun Delegate.get(t: Any?, p: PropertyMetadata): Int = 1
+    fun Delegate.getValue(t: Any?, p: PropertyMetadata): Int = 1
     val prop: Int by Delegate()
 }
 

compiler/testData/codegen/box/delegatedProperty/inClassVal.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int = 1
+    fun getValue(t: Any?, p: PropertyMetadata): Int = 1
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/inClassVar.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/inTrait.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int = 1
+    fun getValue(t: Any?, p: PropertyMetadata): Int = 1
 }
 
 interface A {

compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt

@@ -1,6 +1,6 @@
 class Delegate<T>(var inner: T) {
-    fun get(t: Any?, p: PropertyMetadata): T = inner
-    fun set(t: Any?, p: PropertyMetadata, i: T) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): T = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: T) { inner = i }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/kt4138.kt

@@ -1,6 +1,6 @@
 class Delegate<T>(var inner: T) {
-    fun get(t: Any?, p: PropertyMetadata): T = inner
-    fun set(t: Any?, p: PropertyMetadata, i: T) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): T = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: T) { inner = i }
 }
 
 

compiler/testData/codegen/box/delegatedProperty/privateVar.kt

@@ -1,7 +1,7 @@
 class Delegate {
    var inner = 1
-   fun get(t: Any?, p: PropertyMetadata): Int = inner
-   fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+   fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+   fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/defaultArgs.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata, s: String = "is OK") { name = "${p.name} $s" }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateAsInnerClass.kt

@@ -3,7 +3,7 @@ class A {
 
     inner class Delegate {
         var name = ""
-        fun get(t: Any?, p: PropertyMetadata): String = name
+        fun getValue(t: Any?, p: PropertyMetadata): String = name
         fun propertyDelegated(p: PropertyMetadata) { name = p.name }
     }
 }

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByOtherProperty.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelFun.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateByTopLevelProperty.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtProperty.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: A, p: PropertyMetadata): String = name
+    fun getValue(t: A, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/delegateForExtPropertyInClass.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: F.A, p: PropertyMetadata): String = name
+    fun getValue(t: F.A, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/inTrait.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/noneApplicable.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var inner = "OK"
-    fun get(t: Any?, p: PropertyMetadata): String = inner
+    fun getValue(t: Any?, p: PropertyMetadata): String = inner
 
     private fun propertyDelegated(p: PropertyMetadata) { inner = "fail" }
     fun propertyDelegated() { inner = "fail" }

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/pdAsExtensionFun.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
 }
 
 fun Delegate.propertyDelegated(p: PropertyMetadata) { name = p.name }

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/privateProperty.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/topLevel.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/twoPropsByOneDelegate.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var count = 0
-    fun get(t: Any?, p: PropertyMetadata) {}
+    fun getValue(t: Any?, p: PropertyMetadata) {}
     fun propertyDelegated(vararg p: PropertyMetadata) { count++ }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/valInInnerClass.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(p: PropertyMetadata) { name = p.name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyDelegatedMethod/vararg.kt

@@ -1,6 +1,6 @@
 class Delegate {
     var name = ""
-    fun get(t: Any?, p: PropertyMetadata): String = name
+    fun getValue(t: Any?, p: PropertyMetadata): String = name
     fun propertyDelegated(vararg p: PropertyMetadata) { name = p[0].name }
 }
 

compiler/testData/codegen/box/delegatedProperty/propertyMetadataEqualsHashCodeToString.kt

@@ -13,7 +13,7 @@ val Int.foo: String by O
 object O {
     val metadatas = HashSet<PropertyMetadata>()
 
-    fun get(t: Any?, p: PropertyMetadata): String {
+    fun getValue(t: Any?, p: PropertyMetadata): String {
         metadatas.add(p)
         return ""
     }

compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt

@@ -17,18 +17,18 @@ val metadatas = IdentityHashMap<PropertyMetadata, Unit>()
 fun record(p: PropertyMetadata) = metadatas.put(p, Unit)
 
 object IntHandler {
-    fun get(t: Any?, p: PropertyMetadata): Int { record(p); return 42 }
-    fun set(t: Any?, p: PropertyMetadata, value: Int) { record(p) }
+    fun getValue(t: Any?, p: PropertyMetadata): Int { record(p); return 42 }
+    fun setValue(t: Any?, p: PropertyMetadata, value: Int) { record(p) }
 }
 
 object AnyHandler {
-    fun get(t: Any?, p: PropertyMetadata): Any? { record(p); return 3.14 }
-    fun set(t: Any?, p: PropertyMetadata, value: Any?) { record(p) }
+    fun getValue(t: Any?, p: PropertyMetadata): Any? { record(p); return 3.14 }
+    fun setValue(t: Any?, p: PropertyMetadata, value: Any?) { record(p) }
 }
 
 object StringHandler {
-    fun get(t: Any?, p: PropertyMetadata): String { record(p); return p.name }
-    fun set(t: Any?, p: PropertyMetadata, value: String) { record(p) }
+    fun getValue(t: Any?, p: PropertyMetadata): String { record(p); return p.name }
+    fun setValue(t: Any?, p: PropertyMetadata, value: String) { record(p) }
 }
 
 fun box(): String {

compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt

@@ -1,9 +1,9 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
 }
 
-fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+fun Delegate.setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 
 class A {
     var prop: Int by Delegate()

compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt

@@ -1,10 +1,10 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
 }
 
 class A {
-  fun Delegate.set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+  fun Delegate.setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 
   var prop: Int by Delegate()
 }

compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int = 1
+    fun getValue(t: Any?, p: PropertyMetadata): Int = 1
 }
 
 val prop: Int by Delegate()

compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 var prop: Int by Delegate()

compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt

@@ -1,5 +1,5 @@
 class Delegate<T>(val f: (T) -> Int) {
-    fun get(t: T, p: PropertyMetadata): Int = f(t)
+    fun getValue(t: T, p: PropertyMetadata): Int = f(t)
 }
 
 val p = Delegate<A> { t -> t.foo() }

compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt

@@ -1,5 +1,5 @@
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int = 1
+  fun getValue(t: Any?, p: PropertyMetadata): Int = 1
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt

@@ -1,7 +1,7 @@
 class Delegate {
     var inner = 1
-    fun get(t: Any?, p: PropertyMetadata): Int = inner
-    fun set(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
+    fun getValue(t: Any?, p: PropertyMetadata): Int = inner
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) { inner = i }
 }
 
 class A {

compiler/testData/codegen/box/delegatedProperty/vararg.kt

@@ -1,5 +1,5 @@
 class Delegate {
-    fun get(t: Any?, vararg p: PropertyMetadata): Int = 1
+    fun getValue(t: Any?, vararg p: PropertyMetadata): Int = 1
 }
 
 val prop: Int by Delegate()