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

Change resolution priority about implicit receivers and synthesized member-like descriptors.

Browse Source 
Change resolution to consider extensions to implicit receiver before members of another implicit receiver.
Make synthesized member-like extensions resolve right after the members.

#KT-10510 Fixed
#KT-10219 Fixed
This commit is contained in:
Stanislav Erokhin
2016-01-13 16:34:16 +03:00
parent dee040a5b5
commit 3a9ecf0bce
28 changed files with 357 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/resolve/priority/invokeExtensionVsOther.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
class A
class B {
fun foo() = this
}
fun test(foo: A.() -> Int) {
with(A()) {
foo() checkType { _<Int>() }
with(B()) {
foo() checkType { _<B>() }
this.foo() checkType { _<B>() }
}
}
}
fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
compiler/testData/diagnostics/tests/resolve/priority/invokeExtensionVsOther.txt
Vendored
+19
View File
@@ -0,0 +1,19 @@
package
public fun test(/*0*/ foo: A.() -> kotlin.Int): kotlin.Unit
public fun </*0*/ T, /*1*/ R> with(/*0*/ receiver: T, /*1*/ f: T.() -> R): R
public final class A {
public constructor A()
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 class B {
public constructor B()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): B
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/resolve/priority/invokeExtensionVsOther2.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
class A {
fun foo() = this
}
fun test(foo: A.() -> Int) {
with(A()) {
foo() checkType { _<A>() }
this.foo() checkType { _<A>() }
}
}
fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
compiler/testData/diagnostics/tests/resolve/priority/invokeExtensionVsOther2.txt
Vendored
+12
View File
@@ -0,0 +1,12 @@
package
public fun test(/*0*/ foo: A.() -> kotlin.Int): kotlin.Unit
public fun </*0*/ T, /*1*/ R> with(/*0*/ receiver: T, /*1*/ f: T.() -> R): R
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): A
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/resolve/priority/kt10219.kt
Vendored
+23
View File
@@ -0,0 +1,23 @@
// FILE: Calendar.java
public class Calendar {
public void setTimeInMillis(long millis) {}
public long getTimeInMillis() { return 1; }
}
// FILE: 1.kt
class A
var A.timeInMillis: String
get() = ""
set(v) {}
fun a(c: Calendar) {
A().apply {
c.apply {
timeInMillis = 5 // synthesized variable for get|setTimeInMillis
timeInMillis = <!TYPE_MISMATCH!>""<!>
}
timeInMillis = ""
}
}
fun <T> T.apply(f: T.() -> Unit): T { f(); return this }
compiler/testData/diagnostics/tests/resolve/priority/kt10219.txt
Vendored
+21
View File
@@ -0,0 +1,21 @@
package
public var A.timeInMillis: kotlin.String
public fun a(/*0*/ c: Calendar): kotlin.Unit
public fun </*0*/ T> T.apply(/*0*/ f: T.() -> kotlin.Unit): T
public final class A {
public constructor A()
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 open class Calendar {
public constructor Calendar()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open fun getTimeInMillis(): kotlin.Long
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open fun setTimeInMillis(/*0*/ millis: kotlin.Long): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/resolve/priority/kt10510.kt
Vendored
+13
View File
@@ -0,0 +1,13 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
class ClassA {
fun method1() = this
fun String.method2() {
method1() checkType { _<String>() }
this.method1() checkType { _<String>() }
}
}
fun String.method1() = this
compiler/testData/diagnostics/tests/resolve/priority/kt10510.txt
Vendored
+12
View File
@@ -0,0 +1,12 @@
package
public fun kotlin.String.method1(): kotlin.String
public final class ClassA {
public constructor ClassA()
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 method1(): ClassA
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final fun kotlin.String.method2(): kotlin.Unit
}
compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
class A
fun A.foo() = this
fun test(a: A) {
fun A.foo() = 3
a.foo() checkType { _<Int>() }
with(a) {
foo() checkType { _<Int>() }
}
}
fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
compiler/testData/diagnostics/tests/resolve/priority/localExtVsNonLocalExt.txt
Vendored
+12
View File
@@ -0,0 +1,12 @@
package
public fun test(/*0*/ a: A): kotlin.Unit
public fun </*0*/ T, /*1*/ R> with(/*0*/ receiver: T, /*1*/ f: T.() -> R): R
public fun A.foo(): A
public final class A {
public constructor A()
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
}
compiler/testData/diagnostics/tests/resolve/priority/memberVsLocalExt.kt
Vendored
+20
View File
@@ -0,0 +1,20 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
class A {
fun foo() = this
}
fun test(a: A) {
fun A.foo() = 4
a.foo() checkType { _<A>() }
with(a) {
foo() checkType { _<A>() }
this.foo() checkType { _<A>() }
}
}
fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
compiler/testData/diagnostics/tests/resolve/priority/memberVsLocalExt.txt
Vendored
+12
View File
@@ -0,0 +1,12 @@
package
public fun test(/*0*/ a: A): kotlin.Unit
public fun </*0*/ T, /*1*/ R> with(/*0*/ receiver: T, /*1*/ f: T.() -> R): R
public final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): A
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.kt
Vendored
+19
View File
@@ -0,0 +1,19 @@
// !CHECK_TYPE
// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
// FILE: A.java
public class A {
public static void foo() {}
}
// FILE: 1.kt
class C {
fun foo() = this
inner class B : A() {
fun test() {
foo() checkType { _<Unit>() }
}
}
}
compiler/testData/diagnostics/tests/resolve/priority/staticVsImplicitReceiverMember.txt
Vendored
+27
View File
@@ -0,0 +1,27 @@
package
public open class A {
public constructor A()
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
// Static members
public open fun foo(): kotlin.Unit
}
public final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): C
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final inner class B : A {
public constructor B()
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 test(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsExtensions.kt
Vendored
+2 -2
View File
@@ -21,9 +21,9 @@ class B {
private val A.foo: B get() = this@B
fun test(a: A) {
a.foo checkType { _<B>() } // todo
a.foo checkType { _<A>() }
with(a) {
foo checkType { _<B>() } // todo
foo checkType { _<A>() }
}
}
}
compiler/testData/diagnostics/tests/resolve/priority/syntheticPropertiesVsMembers.kt
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@ fun test(a: A, b: B, c: C) {
with(c) {
with(a) {
foo checkType { _<C>() } // todo
foo checkType { _<A>() }
}
}
}