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

[FIR] Don't report duplicated errors on default accessor error type refs

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-07-27 13:09:42 +03:00
parent e0d25876b0
commit 749346b73b
22 changed files with 83 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/inheritance/nestedClassesFromInterface.fir.kt
Vendored
+4 -4
View File
@@ -9,19 +9,19 @@ interface B {
}
class X: A {
val a: <!OTHER_ERROR, OTHER_ERROR!>A_<!> = <!UNRESOLVED_REFERENCE!>A_<!>()
val a: <!OTHER_ERROR!>A_<!> = <!UNRESOLVED_REFERENCE!>A_<!>()
val b: A.A_ = A.A_()
companion object {
val a: <!OTHER_ERROR, OTHER_ERROR!>A_<!> = <!UNRESOLVED_REFERENCE!>A_<!>()
val a: <!OTHER_ERROR!>A_<!> = <!UNRESOLVED_REFERENCE!>A_<!>()
}
}
class Y: B {
val a: <!OTHER_ERROR, OTHER_ERROR!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
val a: <!OTHER_ERROR!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
val b: B.B_ = B.B_()
companion object {
val b: <!OTHER_ERROR, OTHER_ERROR!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
val b: <!OTHER_ERROR!>B_<!> = <!UNRESOLVED_REFERENCE!>B_<!>()
}
}
compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.fir.kt
Vendored
+4 -4
View File
@@ -7,14 +7,14 @@ open class A {
}
class C: A() {
val b: <!OTHER_ERROR, OTHER_ERROR!>B<!> = null!!
val b: <!OTHER_ERROR!>B<!> = null!!
init {
<!UNRESOLVED_REFERENCE!>B<!>()
}
object O {
val b: <!OTHER_ERROR, OTHER_ERROR!>B<!> = null!!
val b: <!OTHER_ERROR!>B<!> = null!!
init {
<!UNRESOLVED_REFERENCE!>B<!>()
@@ -22,7 +22,7 @@ class C: A() {
}
class K {
val b: <!OTHER_ERROR, OTHER_ERROR!>B<!> = null!!
val b: <!OTHER_ERROR!>B<!> = null!!
init {
<!UNRESOLVED_REFERENCE!>B<!>()
@@ -30,7 +30,7 @@ class C: A() {
}
inner class I {
val b: <!OTHER_ERROR, OTHER_ERROR!>B<!> = null!!
val b: <!OTHER_ERROR!>B<!> = null!!
init {
<!UNRESOLVED_REFERENCE!>B<!>()
compiler/testData/diagnostics/tests/scopes/inheritance/nestedFromJava.fir.kt
Vendored
+4 -4
View File
@@ -23,7 +23,7 @@ public class C extends B implements A {
// FILE: 1.kt
class X: A {
val a_s: <!OTHER_ERROR, OTHER_ERROR!>A_S<!> = null!!
val a_s: <!OTHER_ERROR!>A_S<!> = null!!
init {
<!UNRESOLVED_REFERENCE!>A_S<!>()
@@ -32,7 +32,7 @@ class X: A {
}
object xD {
val a_: <!OTHER_ERROR, OTHER_ERROR!>A_S<!> = null!!
val a_: <!OTHER_ERROR!>A_S<!> = null!!
init {
<!UNRESOLVED_REFERENCE!>A_S<!>()
@@ -66,7 +66,7 @@ class Y: B() {
}
class Z: C() {
val a_s: <!OTHER_ERROR, OTHER_ERROR!>A_S<!> = null!!
val a_s: <!OTHER_ERROR!>A_S<!> = null!!
val b_: B_ = null!!
val b_s: B_S = null!!
@@ -77,7 +77,7 @@ class Z: C() {
}
object X {
val a_s: <!OTHER_ERROR, OTHER_ERROR!>A_S<!> = null!!
val a_s: <!OTHER_ERROR!>A_S<!> = null!!
val b_: B_ = null!!
val b_s: B_S = null!!