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

FIR: Fix visibility check for protected within a companion

Browse Source
This commit is contained in:
Denis Zharkov
2020-03-16 12:50:42 +03:00
parent 170978a4f1
commit 7203499b7a
9 changed files with 87 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.fir.kt
Vendored
+2 -2
View File
@@ -28,6 +28,6 @@ class B: A() {
devNull(A.internal_val)
devNull(A.public_val)
devNull(A.<!INAPPLICABLE_CANDIDATE!>private_val<!>)
devNull(A.<!INAPPLICABLE_CANDIDATE!>protected_val<!>)
devNull(A.protected_val)
}
}
}
compiler/testData/diagnostics/testsWithStdLib/CallCompanionProtectedNonStatic.fir.kt
Vendored
+6 -6
View File
@@ -46,8 +46,8 @@ open class Base {
class Derived : Base() {
fun test() {
foo() // Ok
<!INAPPLICABLE_CANDIDATE!>gav<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>bar<!>()
gav() // Ok
bar()
<!INAPPLICABLE_CANDIDATE!>baz<!>()
prop = 0
}
@@ -55,8 +55,8 @@ class Derived : Base() {
inner class DerivedInner {
fun fromDerivedInner() {
foo() // Ok
<!INAPPLICABLE_CANDIDATE!>gav<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>bar<!>()
gav() // Ok
bar()
<!INAPPLICABLE_CANDIDATE!>baz<!>()
prop = 0
}
@@ -64,8 +64,8 @@ class Derived : Base() {
companion object {
fun test2() {
<!INAPPLICABLE_CANDIDATE!>gav<!>() // Ok
<!INAPPLICABLE_CANDIDATE!>bar<!>()
gav() // Ok
bar()
<!INAPPLICABLE_CANDIDATE!>baz<!>()
prop = 0
}