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

compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.kt

@@ -0,0 +1,51 @@
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+class CustomDelegate {
+    fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
+}
+
+class OkDelegate {
+    fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    fun setValue(thisRef: Any?, prop: PropertyMetadata, value: String) {}
+}
+
+class CustomDelegate2 {
+    fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
+
+    fun getValue(thisRef: Any?, prop: PropertyMetadata): Int = 5
+    fun setValue(thisRef: Any?, prop: PropertyMetadata, value: Int) {}
+}
+
+class CustomDelegate3 {
+    fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
+}
+
+fun OkDelegate.get(thisRef: Any?, prop: PropertyMetadata): Int = 4
+fun OkDelegate.set(thisRef: Any?, prop: PropertyMetadata, value: Int) {}
+
+fun CustomDelegate3.getValue(thisRef: Any?, prop: PropertyMetadata): Int = 4
+fun CustomDelegate3.setValue(thisRef: Any?, prop: PropertyMetadata, value: Int) {}
+
+class Example {
+
+    var a by <!DELEGATE_RESOLVED_TO_DEPRECATED_CONVENTION, DELEGATE_RESOLVED_TO_DEPRECATED_CONVENTION!>CustomDelegate()<!>
+    val aval by <!DELEGATE_RESOLVED_TO_DEPRECATED_CONVENTION!>CustomDelegate()<!>
+    var b by OkDelegate()
+    var c by CustomDelegate2()
+    var d by CustomDelegate3()
+
+    fun test() {
+        requireString(a)
+        requireString(aval)
+        requireString(b)
+        requireInt(c)
+        requireInt(d)
+    }
+
+    fun requireString(s: String) {}
+    fun requireInt(n: Int) {}
+
+}

compiler/testData/diagnostics/tests/DeprecatedGetSetPropertyDelegateConvention.txt

@@ -0,0 +1,59 @@
+package
+
+public fun OkDelegate.get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.Int
+public fun CustomDelegate3.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.Int
+public fun OkDelegate.set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.Int): kotlin.Unit
+public fun CustomDelegate3.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.Int): kotlin.Unit
+
+public final class CustomDelegate {
+    public constructor CustomDelegate()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class CustomDelegate2 {
+    public constructor CustomDelegate2()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+    public final fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.Int): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class CustomDelegate3 {
+    public constructor CustomDelegate3()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class Example {
+    public constructor Example()
+    public final var a: kotlin.String
+    public final val aval: kotlin.String
+    public final var b: kotlin.String
+    public final var c: kotlin.Int
+    public final var d: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun requireInt(/*0*/ n: kotlin.Int): kotlin.Unit
+    public final fun requireString(/*0*/ s: kotlin.String): kotlin.Unit
+    public final fun test(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public final class OkDelegate {
+    public constructor OkDelegate()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public final fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/diagnostics/tests/LateInit.kt

@@ -1,5 +1,5 @@
 class CustomDelegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
 }
 
 public abstract class A<T: Any, V: String?>(<!INAPPLICABLE_LATEINIT_MODIFIER_PRIMARY_CONSTRUCTOR_PARAMETER!>lateinit<!> var p2: String) {

compiler/testData/diagnostics/tests/LateInit.txt

@@ -56,7 +56,7 @@ public final class B {
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/UnusedParameters.kt

@@ -14,17 +14,17 @@ fun f(a: Int, b: Int, <!UNUSED_PARAMETER!>c<!>: Int = b) {
     a + a
 }
 
-fun Any.get(thisRef: Any?, prop: PropertyMetadata): String = ":)"
-fun Any.set(thisRef: Any?, prop: PropertyMetadata, value: String) {
+fun Any.getValue(thisRef: Any?, prop: PropertyMetadata): String = ":)"
+fun Any.setValue(thisRef: Any?, prop: PropertyMetadata, value: String) {
 }
 
 fun Any.propertyDelegated(prop: PropertyMetadata) {
 }
 
-fun get(p: Any) {
+fun get(<!UNUSED_PARAMETER!>p<!>: Any) {
 }
 
-fun set(p: Any) {
+fun set(<!UNUSED_PARAMETER!>p<!>: Any) {
 }
 
 fun foo(s: String) {

compiler/testData/diagnostics/tests/UnusedParameters.txt

@@ -4,9 +4,9 @@ public fun f(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.Int = ...
 public fun foo(/*0*/ s: kotlin.String): kotlin.Unit
 public fun get(/*0*/ p: kotlin.Any): kotlin.Unit
 public fun set(/*0*/ p: kotlin.Any): kotlin.Unit
-public fun kotlin.Any.get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+public fun kotlin.Any.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
 public fun kotlin.Any.propertyDelegated(/*0*/ prop: kotlin.PropertyMetadata): kotlin.Unit
-public fun kotlin.Any.set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+public fun kotlin.Any.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
 
 public final class C {
     public constructor C(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int, /*2*/ c: kotlin.Int, /*3*/ d: kotlin.Int, /*4*/ e: kotlin.Int = ..., /*5*/ f: kotlin.String)

compiler/testData/diagnostics/tests/Variance.kt

@@ -19,8 +19,8 @@ fun foo(c: Consumer<Int>, p: Producer<Int>, u: Usual<Int>) {
 
 //Arrays copy example
 class Array<T>(val length : Int, val t : T) {
-    fun get(index : Int) : T { return t }
-    fun set(index : Int, value : T) { /* ... */ }
+    fun get(<!UNUSED_PARAMETER!>index<!> : Int) : T { return t }
+    fun set(<!UNUSED_PARAMETER!>index<!> : Int, <!UNUSED_PARAMETER!>value<!> : T) { /* ... */ }
 }
 
 fun copy1(<!UNUSED_PARAMETER!>from<!> : Array<Any>, <!UNUSED_PARAMETER!>to<!> : Array<Any>) {}
@@ -37,4 +37,4 @@ fun f(ints: Array<Int>, any: Array<Any>, numbers: Array<Number>) {
     copy2(ints, <!TYPE_MISMATCH!>numbers<!>)
     copy3<Int>(ints, numbers)
     copy4(ints, numbers) //ok
-}
+}

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.kt

@@ -1,7 +1,7 @@
 annotation class Ann
 
 class CustomDelegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
 }
 
 <!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@field:Ann<!>

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/FieldAnnotations.txt

@@ -10,7 +10,7 @@ package
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.kt

@@ -1,7 +1,7 @@
 annotation class Ann
 
 class CustomDelegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
 }
 
 <!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@get:Ann<!>

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/GetterAnnotations.txt

@@ -10,7 +10,7 @@ package
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.kt

@@ -2,7 +2,7 @@ annotation class Ann
 annotation class Second
 
 class CustomDelegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
 }
 
 <!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@property:Ann<!>

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/PropertyAnnotations.txt

@@ -10,7 +10,7 @@ package
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.kt

@@ -1,8 +1,8 @@
 annotation class Ann
 
 class CustomDelegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
-    fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    fun setValue(thisRef: Any?, prop: PropertyMetadata, value: String) {}
 }
 
 <!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@set:Ann<!>

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SetterAnnotations.txt

@@ -10,9 +10,9 @@ package
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+    public final fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.kt

@@ -1,8 +1,8 @@
 annotation class Ann
 
 class CustomDelegate {
-    public fun get(thisRef: Any?, prop: PropertyMetadata): String = prop.name
-    fun set(thisRef: Any?, prop: PropertyMetadata, value: String) {}
+    public fun getValue(thisRef: Any?, prop: PropertyMetadata): String = prop.name
+    fun setValue(thisRef: Any?, prop: PropertyMetadata, value: String) {}
 }
 
 <!INAPPLICABLE_TARGET_ON_PROPERTY, WRONG_ANNOTATION_TARGET_WITH_USE_SITE_TARGET!>@setparam:Ann<!>

compiler/testData/diagnostics/tests/annotations/withUseSiteTarget/SparamAnnotations.txt

@@ -10,9 +10,9 @@ package
 public final class CustomDelegate {
     public constructor CustomDelegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
+    public final fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ prop: kotlin.PropertyMetadata, /*2*/ value: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.kt

@@ -1,5 +1,5 @@
 class Del {
-  fun get(_this: Any?, p: PropertyMetadata): Int = 0
+  fun getValue(_this: Any?, p: PropertyMetadata): Int = 0
 }
 
 fun df(del: Del): Del = del

compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.txt

@@ -6,7 +6,7 @@ public fun test(/*0*/ del: kotlin.Any?): kotlin.Unit
 public final class Del {
     public constructor Del()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ _this: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ _this: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.kt

@@ -3,7 +3,7 @@
 val a: Int by Delegate()
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.kt

@@ -3,7 +3,7 @@
 val a by Delegate()
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.kt

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

compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.txt

@@ -11,7 +11,7 @@ public abstract class A {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/backingField.kt

@@ -7,7 +7,7 @@ class B {
 }
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/backingField.txt

@@ -12,7 +12,7 @@ public final class B {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/defaultGetter.kt

@@ -4,7 +4,7 @@ val a: Int by Delegate()
     get
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/defaultGetter.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/defaultSetter.kt

@@ -4,9 +4,9 @@ var a: Int by Delegate()
     private set
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 
-    fun set(t: Any?, p: PropertyMetadata, i: Int) {}
+    fun setValue(t: Any?, p: PropertyMetadata, i: Int) {}
 }

compiler/testData/diagnostics/tests/delegatedProperty/defaultSetter.txt

@@ -5,8 +5,8 @@ public var a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit
+    public final fun setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.kt

@@ -13,7 +13,7 @@ fun foo() {
 }
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.txt

@@ -20,7 +20,7 @@ public final class AImpl : A {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.kt

@@ -13,7 +13,7 @@ fun foo() {
 }
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): String {
+    fun getValue(t: Any?, p: PropertyMetadata): String {
         return ""
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.txt

@@ -20,7 +20,7 @@ public final class AImpl : A {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.String
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/disallowImplInTypeParameter.kt

@@ -1,5 +1,5 @@
 val a: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>A()<!>
 
 class A {
-    fun get(t: Any?, p: PropertyMetadataImpl): Int = 1
+    fun getValue(t: Any?, p: PropertyMetadataImpl): Int = 1
 }

compiler/testData/diagnostics/tests/delegatedProperty/disallowImplInTypeParameter.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadataImpl): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadataImpl): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.kt

@@ -3,7 +3,7 @@
 val a: Int by A(1)
 
 class A<T: Any>(i: T) {
-  fun get(t: Any?, p: PropertyMetadata): T {
+  fun getValue(t: Any?, p: PropertyMetadata): T {
     throw Exception()
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class A</*0*/ T : kotlin.Any> {
     public constructor A</*0*/ T : kotlin.Any>(/*0*/ i: T)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.kt

@@ -6,7 +6,7 @@ class Derived: Base()
 val a: Base by A()
 
 class A {
-  fun get(t: Any?, p: PropertyMetadata): Derived {
+  fun getValue(t: Any?, p: PropertyMetadata): Derived {
     return Derived()
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.txt

@@ -5,7 +5,7 @@ public val a: Base
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): Derived
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): Derived
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/inTrait.kt

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

compiler/testData/diagnostics/tests/delegatedProperty/inTrait.txt

@@ -3,7 +3,7 @@ package
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt

@@ -21,12 +21,12 @@ fun getMyConcreteProperty() = MyProperty<Any?, String>()
 
 class MyProperty<R, T> {
 
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         println("get $thisRef ${desc.name}")
         return null as T
     }
 
-    public fun set(thisRef: R, desc: PropertyMetadata, value: T) {
+    public fun setValue(thisRef: R, desc: PropertyMetadata, value: T) {
         println("set $thisRef ${desc.name} $value")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.txt

@@ -26,9 +26,9 @@ package baz {
     public final class MyProperty</*0*/ R, /*1*/ T> {
         public constructor MyProperty</*0*/ R, /*1*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final fun set(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
+        public final fun setValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 

compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.kt

@@ -5,7 +5,7 @@ class A1 {
 }
 
 class MyProperty1 {}
-fun MyProperty1.get(thisRef: Any?, desc: PropertyMetadata): String {
+fun MyProperty1.getValue(thisRef: Any?, desc: PropertyMetadata): String {
     throw Exception("$thisRef $desc")
 }
 
@@ -16,7 +16,7 @@ class A2 {
 }
 
 class MyProperty2<T> {}
-fun <T> MyProperty2<T>.get(thisRef: Any?, desc: PropertyMetadata): T {
+fun <T> MyProperty2<T>.getValue(thisRef: Any?, desc: PropertyMetadata): T {
     throw Exception("$thisRef $desc")
 }
 
@@ -27,7 +27,7 @@ class A3 {
 
     class MyProperty3<T> {}
 
-    fun <T> MyProperty3<T>.get(thisRef: Any?, desc: PropertyMetadata): T {
+    fun <T> MyProperty3<T>.getValue(thisRef: Any?, desc: PropertyMetadata): T {
         throw Exception("$thisRef $desc")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.txt

@@ -1,8 +1,8 @@
 package
 
 package foo {
-    public fun foo.MyProperty1.get(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): kotlin.String
-    public fun </*0*/ T> foo.MyProperty2<T>.get(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
+    public fun foo.MyProperty1.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): kotlin.String
+    public fun </*0*/ T> foo.MyProperty2<T>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
 
     public final class A1 {
         public constructor A1()
@@ -26,7 +26,7 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        public final fun </*0*/ T> foo.A3.MyProperty3<T>.get(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun </*0*/ T> foo.A3.MyProperty3<T>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
 
         public final class MyProperty3</*0*/ T> {
             public constructor MyProperty3</*0*/ T>()

compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt

@@ -13,7 +13,7 @@ class B {
 }
 
 class MyProperty<R : A, T> {
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         throw Exception("$thisRef $desc")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.txt

@@ -23,7 +23,7 @@ package foo {
     public final class MyProperty</*0*/ R : foo.A, /*1*/ T> {
         public constructor MyProperty</*0*/ R : foo.A, /*1*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }

compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt

@@ -1,24 +1,24 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<R>() {
-    fun <T> get(t: Any?, p: PropertyMetadata): T = null!!
-    fun <T> set(t: Any?, p: PropertyMetadata, x: T) = Unit
+    fun <T> getValue(t: Any?, p: PropertyMetadata): T = null!!
+    fun <T> setValue(t: Any?, p: PropertyMetadata, x: T) = Unit
 }
 
 var a1: Int by <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>A<!>()
 var a2: Int by A<String>()
 
 class B<R>() {
-    fun <T> get(t: Any?, p: PropertyMetadata): T = null!!
-    fun set(t: Any?, p: PropertyMetadata, x: R) = Unit
+    fun <T> getValue(t: Any?, p: PropertyMetadata): T = null!!
+    fun setValue(t: Any?, p: PropertyMetadata, x: R) = Unit
 }
 
 var b1: Int by B()
 var b2: Int by B<Number>()
 
 class C<R>() {
-    fun get(t: Any?, p: PropertyMetadata): R = null!!
-    fun <T> set(t: Any?, p: PropertyMetadata, x: T) = Unit
+    fun getValue(t: Any?, p: PropertyMetadata): R = null!!
+    fun <T> setValue(t: Any?, p: PropertyMetadata, x: T) = Unit
 }
 
 var c1: Int by C()

compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.txt

@@ -10,26 +10,26 @@ public var c2: kotlin.Int
 public final class A</*0*/ R> {
     public constructor A</*0*/ R>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun </*0*/ T> get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
+    public final fun </*0*/ T> getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun </*0*/ T> set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
+    public final fun </*0*/ T> setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class B</*0*/ R> {
     public constructor B</*0*/ R>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun </*0*/ T> get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
+    public final fun </*0*/ T> getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: R): kotlin.Unit
+    public final fun setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: R): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class C</*0*/ R> {
     public constructor C</*0*/ R>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): R
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): R
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun </*0*/ T> set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
+    public final fun </*0*/ T> setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt

@@ -8,16 +8,16 @@ val cObj = C()
 var c: String by cObj
 
 class A {
-  fun <T> get(t: Any?, p: PropertyMetadata): T = null!!
-  fun <T> set(t: Any?, p: PropertyMetadata, x: T) = Unit
+  fun <T> getValue(t: Any?, p: PropertyMetadata): T = null!!
+  fun <T> setValue(t: Any?, p: PropertyMetadata, x: T) = Unit
 }
 
 class B
 
-fun <T> B.get(t: Any?, p: PropertyMetadata): T = null!!
-fun <T> B.set(t: Any?, p: PropertyMetadata, x: T) = Unit
+fun <T> B.getValue(t: Any?, p: PropertyMetadata): T = null!!
+fun <T> B.setValue(t: Any?, p: PropertyMetadata, x: T) = Unit
 
 class C
 
-inline fun <reified T> C.get(t: Any?, p: PropertyMetadata): T = null!!
-inline fun <reified T> C.set(t: Any?, p: PropertyMetadata, x: T) = Unit
+inline fun <reified T> C.getValue(t: Any?, p: PropertyMetadata): T = null!!
+inline fun <reified T> C.setValue(t: Any?, p: PropertyMetadata, x: T) = Unit

compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.txt

@@ -5,17 +5,17 @@ public var a1: [ERROR : Type from delegate]
 public var b: kotlin.Int
 public var c: kotlin.String
 public val cObj: C
-public fun </*0*/ T> B.get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
-@kotlin.inline() public fun </*0*/ reified T> C.get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
-public fun </*0*/ T> B.set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
-@kotlin.inline() public fun </*0*/ reified T> C.set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
+public fun </*0*/ T> B.getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
+@kotlin.inline() public fun </*0*/ reified T> C.getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
+public fun </*0*/ T> B.setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
+@kotlin.inline() public fun </*0*/ reified T> C.setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
 
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun </*0*/ T> get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
+    public final fun </*0*/ T> getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun </*0*/ T> set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
+    public final fun </*0*/ T> setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 

compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.kt

@@ -3,7 +3,7 @@ class A3 {
 
     class MyProperty<T> {}
 
-    fun <T> MyProperty<T>.get(thisRef: Any?, desc: PropertyMetadata): T {
+    fun <T> MyProperty<T>.getValue(thisRef: Any?, desc: PropertyMetadata): T {
         throw Exception("$thisRef $desc")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.txt

@@ -6,7 +6,7 @@ public final class A3 {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public final fun </*0*/ T> A3.MyProperty<T>.get(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
+    public final fun </*0*/ T> A3.MyProperty<T>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
 
     public final class MyProperty</*0*/ T> {
         public constructor MyProperty</*0*/ T>()

compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt

@@ -9,11 +9,11 @@ fun <A, B> getMyProperty1() = MyProperty1<A, B>()
 
 class MyProperty1<T, R> {
 
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         throw Exception()
     }
 
-    public fun set(i: Int, j: Int, k: Int) {
+    public fun setValue(i: Int, j: Int, k: Int) {
         println("set")
     }
 }
@@ -29,11 +29,11 @@ fun <A, B> getMyProperty2() = MyProperty2<A, B>()
 
 class MyProperty2<T, R> {
 
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         throw Exception()
     }
 
-    public fun set(i: Int) {
+    public fun setValue(i: Int) {
         println("set")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.txt

@@ -26,18 +26,18 @@ package foo {
     public final class MyProperty1</*0*/ T, /*1*/ R> {
         public constructor MyProperty1</*0*/ T, /*1*/ R>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final fun set(/*0*/ i: kotlin.Int, /*1*/ j: kotlin.Int, /*2*/ k: kotlin.Int): kotlin.Unit
+        public final fun setValue(/*0*/ i: kotlin.Int, /*1*/ j: kotlin.Int, /*2*/ k: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
     public final class MyProperty2</*0*/ T, /*1*/ R> {
         public constructor MyProperty2</*0*/ T, /*1*/ R>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final fun set(/*0*/ i: kotlin.Int): kotlin.Unit
+        public final fun setValue(/*0*/ i: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt

@@ -4,11 +4,11 @@ class A {
 
 class MyProperty<T, R> {
 
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         throw Exception("$thisRef $desc")
     }
 
-    public fun set(thisRef: R, desc: PropertyMetadata, t: T) {
+    public fun setValue(thisRef: R, desc: PropertyMetadata, t: T) {
         throw Exception("$thisRef $desc $t")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.txt

@@ -11,8 +11,8 @@ public final class A {
 public final class MyProperty</*0*/ T, /*1*/ R> {
     public constructor MyProperty</*0*/ T, /*1*/ R>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+    public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ t: T): kotlin.Unit
+    public final fun setValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ t: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.kt

@@ -9,5 +9,5 @@ class A {
 }
 
 class MyProperty<R> {
-    public fun get(thisRef: R, desc: PropertyMetadata): Int = throw Exception("$thisRef $desc")
+    public fun getValue(thisRef: R, desc: PropertyMetadata): Int = throw Exception("$thisRef $desc")
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.txt

@@ -12,7 +12,7 @@ public final class A {
 public final class MyProperty</*0*/ R> {
     public constructor MyProperty</*0*/ R>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.kt

@@ -12,12 +12,12 @@ fun <A, B> getMyProperty1() = MyProperty1<A, B>()
 
 class MyProperty1<R, T> {
 
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         println("get $thisRef ${desc.name}")
         throw Exception()
     }
 
-    public fun set(thisRef: R, desc: PropertyMetadata, value: T) {
+    public fun setValue(thisRef: R, desc: PropertyMetadata, value: T) {
         println("set $thisRef ${desc.name} $value")
     }
 }
@@ -36,12 +36,12 @@ fun <A> getMyProperty2() = MyProperty2<A>()
 
 class MyProperty2<T> {
 
-    public fun get(thisRef: Any?, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: Any?, desc: PropertyMetadata): T {
         println("get $thisRef ${desc.name}")
         throw Exception()
     }
 
-    public fun set(thisRef: Any?, desc: PropertyMetadata, value: T) {
+    public fun setValue(thisRef: Any?, desc: PropertyMetadata, value: T) {
         println("set $thisRef ${desc.name} $value")
     }
 }
@@ -60,12 +60,12 @@ fun <A> getMyProperty3() = MyProperty3<A>()
 
 class MyProperty3<T> {
 
-    public fun get(thisRef: T, desc: PropertyMetadata): String {
+    public fun getValue(thisRef: T, desc: PropertyMetadata): String {
         println("get $thisRef ${desc.name}")
         return ""
     }
 
-    public fun set(thisRef: Any?, desc: PropertyMetadata, value: T) {
+    public fun setValue(thisRef: Any?, desc: PropertyMetadata, value: T) {
         println("set $thisRef ${desc.name} $value")
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.txt

@@ -42,27 +42,27 @@ package foo {
     public final class MyProperty1</*0*/ R, /*1*/ T> {
         public constructor MyProperty1</*0*/ R, /*1*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final fun set(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
+        public final fun setValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
     public final class MyProperty2</*0*/ T> {
         public constructor MyProperty2</*0*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
+        public final fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
     public final class MyProperty3</*0*/ T> {
         public constructor MyProperty3</*0*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: T, /*1*/ desc: kotlin.PropertyMetadata): kotlin.String
+        public final fun getValue(/*0*/ thisRef: T, /*1*/ desc: kotlin.PropertyMetadata): kotlin.String
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public final fun set(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
+        public final fun setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.kt

@@ -12,7 +12,7 @@ fun <A, B> getMyProperty1() = MyProperty1<A, B>()
 
 class MyProperty1<R, T> {
 
-    public fun get(thisRef: R, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: R, desc: PropertyMetadata): T {
         println("get $thisRef ${desc.name}")
         throw Exception()
     }
@@ -32,7 +32,7 @@ fun <A> getMyProperty2() = MyProperty2<A>()
 
 class MyProperty2<T> {
 
-    public fun get(thisRef: Any?, desc: PropertyMetadata): T {
+    public fun getValue(thisRef: Any?, desc: PropertyMetadata): T {
         println("get $thisRef ${desc.name}")
         throw Exception()
     }
@@ -52,7 +52,7 @@ fun <A> getMyProperty3() = MyProperty3<A>()
 
 class MyProperty3<T> {
 
-    public fun get(thisRef: T, desc: PropertyMetadata): String {
+    public fun getValue(thisRef: T, desc: PropertyMetadata): String {
         println("get $thisRef ${desc.name}")
         return ""
     }

compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.txt

@@ -42,7 +42,7 @@ package foo {
     public final class MyProperty1</*0*/ R, /*1*/ T> {
         public constructor MyProperty1</*0*/ R, /*1*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: R, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -50,7 +50,7 @@ package foo {
     public final class MyProperty2</*0*/ T> {
         public constructor MyProperty2</*0*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
+        public final fun getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ desc: kotlin.PropertyMetadata): T
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
@@ -58,7 +58,7 @@ package foo {
     public final class MyProperty3</*0*/ T> {
         public constructor MyProperty3</*0*/ T>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final fun get(/*0*/ thisRef: T, /*1*/ desc: kotlin.PropertyMetadata): kotlin.String
+        public final fun getValue(/*0*/ thisRef: T, /*1*/ desc: kotlin.PropertyMetadata): kotlin.String
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }

compiler/testData/diagnostics/tests/delegatedProperty/kt4640.kt

@@ -2,10 +2,10 @@
 
 class ValueWrapper()
 {
-    var value: Int = 0
+    var backingValue: Int = 0
 
-    fun get() = value
-    fun set(v: Int) { value = v }
+    fun getValue() = backingValue
+    fun setValue(v: Int) { backingValue = v }
 }
 
 val foo by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>ValueWrapper()<!>

compiler/testData/diagnostics/tests/delegatedProperty/kt4640.txt

@@ -4,10 +4,10 @@ public val foo: [ERROR : Type from delegate]
 
 public final class ValueWrapper {
     public constructor ValueWrapper()
-    public final var value: kotlin.Int
+    public final var backingValue: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(): kotlin.Int
+    public final fun getValue(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ v: kotlin.Int): kotlin.Unit
+    public final fun setValue(/*0*/ v: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/localVariable.kt

@@ -7,7 +7,7 @@ class Local {
 }
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/localVariable.txt

@@ -3,7 +3,7 @@ package
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt

@@ -1,3 +1,3 @@
-val a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(get\(kotlin.Nothing?, kotlin.PropertyMetadata\); A)!>A()<!>
+val a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(getValue\(kotlin.Nothing?, kotlin.PropertyMetadata\); A)!>A()<!>
 
 class A

compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt

@@ -1,9 +1,9 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-var a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(set\(kotlin.Nothing?, kotlin.PropertyMetadata, kotlin.Int\); A)!>A()<!>
+var a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING(setValue\(kotlin.Nothing?, kotlin.PropertyMetadata, kotlin.Int\); A)!>A()<!>
 
 class A {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
       return 1
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.txt

@@ -5,7 +5,7 @@ public var a: kotlin.Int
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt

@@ -5,5 +5,5 @@ class B {
 }
 
 class Delegate<T: Any>(val init: T) {
-  fun get(t: Any?, p: PropertyMetadata): Int = null!!
+  fun getValue(t: Any?, p: PropertyMetadata): Int = null!!
 }

compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.txt

@@ -12,7 +12,7 @@ public final class Delegate</*0*/ T : kotlin.Any> {
     public constructor Delegate</*0*/ T : kotlin.Any>(/*0*/ init: T)
     public final val init: T
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.kt

@@ -3,7 +3,7 @@
 val a: Int by <!DELEGATE_SPECIAL_FUNCTION_AMBIGUITY!>Delegate()<!>
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun propertyDelegated(/*0*/ p: kotlin.PropertyMetadata, /*1*/ i: kotlin.Int = ...): kotlin.Unit
     public final fun propertyDelegated(/*0*/ p: kotlin.PropertyMetadata, /*1*/ s: kotlin.String = ...): kotlin.Unit

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.kt

@@ -3,7 +3,7 @@
 val a: Int by  <!DELEGATE_PD_METHOD_NONE_APPLICABLE!>Delegate()<!>
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun </*0*/ T> propertyDelegated(/*0*/ p: kotlin.PropertyMetadata): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.kt

@@ -3,7 +3,7 @@
 val a: Int by Delegate()
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 }

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.kt

@@ -3,7 +3,7 @@
 val a: Int by <!DELEGATE_PD_METHOD_NONE_APPLICABLE!>Delegate()<!>
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     private final fun propertyDelegated(/*0*/ p: kotlin.PropertyMetadata): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.kt

@@ -3,7 +3,7 @@
 val a: Int by <!DELEGATE_PD_METHOD_NONE_APPLICABLE!>Delegate()<!>
 
 class Delegate {
-    fun get(t: Any?, p: PropertyMetadata): Int {
+    fun getValue(t: Any?, p: PropertyMetadata): Int {
         return 1
     }
 

compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun propertyDelegated(): kotlin.Unit
     public final fun propertyDelegated(/*0*/ a: kotlin.Int): kotlin.Unit

compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt

@@ -8,7 +8,7 @@ val c by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>d<!>
 val d by <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>c<!>
 
 class Delegate(i: Int) {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.txt

@@ -8,7 +8,7 @@ public val d: [ERROR : <ERROR FUNCTION RETURN TYPE>]
 public final class Delegate {
     public constructor Delegate(/*0*/ i: kotlin.Int)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.kt

@@ -4,7 +4,7 @@ val a: Int by Delegate()
   <!ACCESSOR_FOR_DELEGATED_PROPERTY!>get() = 1<!>
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.txt

@@ -5,7 +5,7 @@ public val a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.kt

@@ -5,9 +5,9 @@ var a: Int by Delegate()
   <!ACCESSOR_FOR_DELEGATED_PROPERTY!>set(i) {}<!>
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
 
-  fun set(t: Any?, p: PropertyMetadata, i: Int) {}
+  fun setValue(t: Any?, p: PropertyMetadata, i: Int) {}
 }

compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.txt

@@ -5,8 +5,8 @@ public var a: kotlin.Int
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit
+    public final fun setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt

@@ -9,8 +9,8 @@ var cTopLevel: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>Delegate()<!>
 class A
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
-  fun set(t: A, p: PropertyMetadata, i: Int) {}
+  fun setValue(t: A, p: PropertyMetadata, i: Int) {}
 }

compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.txt

@@ -20,8 +20,8 @@ public final class D {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: A, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit
+    public final fun setValue(/*0*/ t: A, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.kt

@@ -6,10 +6,10 @@ class Derived: Base()
 var a: Derived by A()
 
 class A {
-  fun get(t: Any?, p: PropertyMetadata): Derived {
+  fun getValue(t: Any?, p: PropertyMetadata): Derived {
     return Derived()
   }
 
-  fun set(t: Any?, p: PropertyMetadata, i: Base) {}
+  fun setValue(t: Any?, p: PropertyMetadata, i: Base) {}
 }
 

compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.txt

@@ -5,9 +5,9 @@ public var a: Derived
 public final class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): Derived
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): Derived
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: Base): kotlin.Unit
+    public final fun setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ i: Base): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 

compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.kt

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

compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.txt

@@ -13,7 +13,7 @@ public final class A {
 public final class Delegate {
     public constructor Delegate(/*0*/ i: kotlin.Int)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.kt

@@ -7,8 +7,8 @@ class A {
 var aTopLevel: Int by Delegate()
 
 class Delegate {
-  fun get(t: Any?, p: PropertyMetadata): Int {
+  fun getValue(t: Any?, p: PropertyMetadata): Int {
     return 1
   }
-  fun set(t: Any?, p: PropertyMetadata, a: Int) {}
+  fun setValue(t: Any?, p: PropertyMetadata, a: Int) {}
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.txt

@@ -13,8 +13,8 @@ public final class A {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ a: kotlin.Int): kotlin.Unit
+    public final fun setValue(/*0*/ t: kotlin.Any?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ a: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt

@@ -5,11 +5,11 @@ class A {
 var aTopLevel: Int by Delegate()
 
 class Delegate {
-  fun get(t: Nothing?, p: PropertyMetadata): Int {
+  fun getValue(t: Nothing?, p: PropertyMetadata): Int {
     p.equals(null) // to avoid UNUSED_PARAMETER warning
     return 1
   }
-  fun set(t: Nothing?, p: PropertyMetadata, a: Int) {
+  fun setValue(t: Nothing?, p: PropertyMetadata, a: Int) {
     p.equals(a) // to avoid UNUSED_PARAMETER warning
   }
 }

compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.txt

@@ -13,8 +13,8 @@ public final class A {
 public final class Delegate {
     public constructor Delegate()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun get(/*0*/ t: kotlin.Nothing?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
+    public final fun getValue(/*0*/ t: kotlin.Nothing?, /*1*/ p: kotlin.PropertyMetadata): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun set(/*0*/ t: kotlin.Nothing?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ a: kotlin.Int): kotlin.Unit
+    public final fun setValue(/*0*/ t: kotlin.Nothing?, /*1*/ p: kotlin.PropertyMetadata, /*2*/ a: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }