Refactoring & clarification: implement new FIR tower resolver
This commit is contained in:
@@ -23,6 +23,6 @@ class Outer {
|
||||
|
||||
fun Outer.foo() {
|
||||
Outer()
|
||||
Nested()
|
||||
<!UNRESOLVED_REFERENCE!>Nested<!>()
|
||||
Inner()
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@ class Test {
|
||||
fun more(): InnerClass {
|
||||
val b = InnerClass()
|
||||
|
||||
val testVal = inClass
|
||||
foo()
|
||||
val testVal = <!UNRESOLVED_REFERENCE!>inClass<!>
|
||||
<!UNRESOLVED_REFERENCE!>foo<!>()
|
||||
|
||||
return b
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@ class Test {
|
||||
fun more(): InnerClass {
|
||||
val b = InnerClass()
|
||||
|
||||
val testVal = inClass
|
||||
foo()
|
||||
val testVal = <!UNRESOLVED_REFERENCE!>inClass<!>
|
||||
<!UNRESOLVED_REFERENCE!>foo<!>()
|
||||
|
||||
return b
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ class Outer {
|
||||
class Nested {
|
||||
fun foo() {
|
||||
class Local {
|
||||
val state = outerState
|
||||
val state = <!UNRESOLVED_REFERENCE!>outerState<!>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+9
-9
@@ -24,30 +24,30 @@ object Obj {
|
||||
}
|
||||
|
||||
fun test(with: WithClassObject, without: WithoutClassObject, obj: Obj) {
|
||||
with.Nested()
|
||||
with.<!UNRESOLVED_REFERENCE!>Nested<!>()
|
||||
with.NestedWithClassObject
|
||||
with.NestedWithClassObject()
|
||||
with.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>()
|
||||
with.NestedWithClassObject.foo()
|
||||
with.NestedEnum.A
|
||||
with.NestedObj
|
||||
with.<!INAPPLICABLE_CANDIDATE!>NestedObj<!>()
|
||||
with.<!UNRESOLVED_REFERENCE!>NestedObj<!>()
|
||||
with.NestedObj.foo()
|
||||
|
||||
without.Nested()
|
||||
without.<!UNRESOLVED_REFERENCE!>Nested<!>()
|
||||
without.NestedWithClassObject
|
||||
without.NestedWithClassObject()
|
||||
without.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>()
|
||||
without.NestedWithClassObject.foo()
|
||||
without.NestedEnum.A
|
||||
without.NestedObj
|
||||
without.<!INAPPLICABLE_CANDIDATE!>NestedObj<!>()
|
||||
without.<!UNRESOLVED_REFERENCE!>NestedObj<!>()
|
||||
without.NestedObj.foo()
|
||||
|
||||
obj.Nested()
|
||||
obj.<!UNRESOLVED_REFERENCE!>Nested<!>()
|
||||
obj.NestedWithClassObject
|
||||
obj.NestedWithClassObject()
|
||||
obj.<!UNRESOLVED_REFERENCE!>NestedWithClassObject<!>()
|
||||
obj.NestedWithClassObject.foo()
|
||||
obj.NestedEnum.A
|
||||
obj.NestedObj
|
||||
obj.<!INAPPLICABLE_CANDIDATE!>NestedObj<!>()
|
||||
obj.<!UNRESOLVED_REFERENCE!>NestedObj<!>()
|
||||
obj.NestedObj.foo()
|
||||
}
|
||||
+2
-2
@@ -5,8 +5,8 @@ class Outer {
|
||||
val property = ""
|
||||
|
||||
class Nested {
|
||||
fun f() = function()
|
||||
fun g() = property
|
||||
fun f() = <!UNRESOLVED_REFERENCE!>function<!>()
|
||||
fun g() = <!UNRESOLVED_REFERENCE!>property<!>
|
||||
fun h() = this@Outer.function()
|
||||
fun i() = this@Outer.property
|
||||
}
|
||||
|
||||
@@ -4,6 +4,6 @@ open class Base {
|
||||
|
||||
class Derived : Base() {
|
||||
class Nested {
|
||||
fun bar() = foo()
|
||||
fun bar() = <!UNRESOLVED_REFERENCE!>foo<!>()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user