azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-05 20:18:58 +03:00
parent 2fee9d362c
commit 1f2b4e20fe
295 changed files with 718 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
Vendored
+2 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+6 -6
View File
@@ -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
Vendored
+6 -6
View File
@@ -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
Vendored
+6 -6
View File
@@ -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
Vendored
+6 -6
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+4 -4
View File
@@ -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
Vendored
+4 -4
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+2 -2
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+1 -1
View File
@@ -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
Vendored
+6 -6
View File
@@ -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
Vendored
+6 -6
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
Vendored
+3 -3
View File
@@ -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
}