Allow resolve class declarations in class objects
Use INACCESSIBLE_OUTER_CLASS_EXPRESSION error for marking already resolved elements #KT-3261 Fixed
This commit is contained in:
@@ -4,6 +4,6 @@ class A() {
|
||||
val x = 1
|
||||
|
||||
class object {
|
||||
val y = <!UNRESOLVED_REFERENCE!>x<!>
|
||||
val y = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>x<!>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ class A {
|
||||
|
||||
class object {
|
||||
fun main() {
|
||||
::<!UNRESOLVED_REFERENCE!>Inner<!>
|
||||
::<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>Inner<!>
|
||||
val y = A::Inner
|
||||
|
||||
y : KMemberFunction0<A, A.Inner>
|
||||
|
||||
@@ -11,7 +11,7 @@ class A {
|
||||
|
||||
class object {
|
||||
fun main() {
|
||||
::<!UNRESOLVED_REFERENCE!>Nested<!> // KT-3261
|
||||
::Nested
|
||||
val y = A::Nested
|
||||
|
||||
y : KFunction0<A.Nested>
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
class Test {
|
||||
[`InnerAnnotation`InnerAnnotation]
|
||||
class object : StaticClass(), <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!><!MANY_CLASSES_IN_SUPERTYPE_LIST!>InnerClass<!>()<!> {
|
||||
|
||||
}
|
||||
|
||||
annotation class InnerAnnotation
|
||||
open class StaticClass
|
||||
|
||||
open inner class InnerClass
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
class Test {
|
||||
class object {
|
||||
fun test(<!UNUSED_PARAMETER!>t<!>: TestInner) = 42
|
||||
}
|
||||
|
||||
class TestStatic {
|
||||
fun test(<!UNUSED_PARAMETER!>t<!>: TestInner) = 42
|
||||
}
|
||||
|
||||
inner class TestInner
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
open class SomeClass<T>
|
||||
class TestSome<P> {
|
||||
class object : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
|
||||
}
|
||||
}
|
||||
|
||||
class Test {
|
||||
class object : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
|
||||
val a = object: <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
|
||||
}
|
||||
|
||||
fun more(): InnerClass {
|
||||
val b = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!>
|
||||
|
||||
val <!UNUSED_VARIABLE!>testVal<!> = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>inClass<!>
|
||||
<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>foo()<!>
|
||||
|
||||
return b
|
||||
}
|
||||
}
|
||||
|
||||
val inClass = 12
|
||||
fun foo() {}
|
||||
|
||||
open inner class InnerClass
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
open class SomeClass<T>
|
||||
class TestSome<P> {
|
||||
object Some : SomeClass<<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>P<!>>() {
|
||||
}
|
||||
}
|
||||
|
||||
class Test {
|
||||
object Some : <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
|
||||
val a = object: <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!> {
|
||||
}
|
||||
|
||||
fun more(): InnerClass {
|
||||
val b = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>InnerClass()<!>
|
||||
|
||||
val <!UNUSED_VARIABLE!>testVal<!> = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>inClass<!>
|
||||
<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>foo()<!>
|
||||
|
||||
return b
|
||||
}
|
||||
}
|
||||
|
||||
val inClass = 12
|
||||
fun foo() {
|
||||
}
|
||||
|
||||
open inner class InnerClass
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
open class PackageTest
|
||||
|
||||
class MoreTest() {
|
||||
class object: PackageTest() {
|
||||
|
||||
}
|
||||
|
||||
object Some: PackageTest()
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
class Test {
|
||||
[ClassObjectAnnotation]
|
||||
[NestedAnnotation]
|
||||
class object {
|
||||
annotation class ClassObjectAnnotation
|
||||
}
|
||||
|
||||
annotation class NestedAnnotation
|
||||
}
|
||||
Reference in New Issue
Block a user