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

FIR: rename HIDDEN to INVISIBLE_REFERENCE

Browse Source 
Some of them should be INVISIBLE_MEMBER though
This commit is contained in:
pyos
2021-04-19 10:14:16 +02:00
committed by Mikhail Glukhikh
parent f1cf6b54e7
commit e6d923f65c
139 changed files with 284 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.kt
Vendored
+1 -1
View File
@@ -15,5 +15,5 @@ class B : A() {
}
fun test(b: B) {
b.<!HIDDEN!>foo<!>("")
b.<!INVISIBLE_REFERENCE!>foo<!>("")
}
compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
sealed class A
val b = <!HIDDEN!>A<!>()
val b = <!INVISIBLE_REFERENCE!>A<!>()
compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.kt
Vendored
+6 -6
View File
@@ -11,8 +11,8 @@ open class Outer {
class Derived : Outer() {
fun foo() {
Outer.<!HIDDEN!>PrivateNested<!>()
super.<!HIDDEN!>PrivateInner<!>()
Outer.<!INVISIBLE_REFERENCE!>PrivateNested<!>()
super.<!INVISIBLE_REFERENCE!>PrivateInner<!>()
Outer.ProtectedNested()
super.ProtectedInner()
@@ -23,11 +23,11 @@ class Derived : Outer() {
}
fun foo() {
Outer.<!HIDDEN!>PrivateNested<!>()
Outer().<!HIDDEN!>PrivateInner<!>()
Outer.<!INVISIBLE_REFERENCE!>PrivateNested<!>()
Outer().<!INVISIBLE_REFERENCE!>PrivateInner<!>()
Outer.<!HIDDEN!>ProtectedNested<!>()
Outer().<!HIDDEN!>ProtectedInner<!>()
Outer.<!INVISIBLE_REFERENCE!>ProtectedNested<!>()
Outer().<!INVISIBLE_REFERENCE!>ProtectedInner<!>()
Outer.PublicNested()
Outer().PublicInner()
compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.kt
Vendored
+9 -9
View File
@@ -9,21 +9,21 @@ private class Private {
bar()
Nested()
fromCompanion()
NotCompanion.<!HIDDEN!>foo<!>() // hidden
NotCompanion.<!INVISIBLE_REFERENCE!>foo<!>() // hidden
}
inner class Inner {
fun foo() {
bar()
fromCompanion()
NotCompanion.<!HIDDEN!>foo<!>() // hidden
NotCompanion.<!INVISIBLE_REFERENCE!>foo<!>() // hidden
}
}
private class Nested {
fun foo() {
fromCompanion()
NotCompanion.<!HIDDEN!>foo<!>() // hidden
NotCompanion.<!INVISIBLE_REFERENCE!>foo<!>() // hidden
}
}
@@ -54,7 +54,7 @@ fun withLocals() {
Local().baz()
Local().<!HIDDEN!>bar<!>() // hidden
Local().<!INVISIBLE_REFERENCE!>bar<!>() // hidden
}
fun test() {
@@ -62,14 +62,14 @@ fun test() {
Private().baz()
Private().Inner()
Private().<!HIDDEN!>bar<!>() // hidden
Private.<!HIDDEN!>Nested<!>() // hidden
Private.<!HIDDEN!>fromCompanion<!>() // hidden
Private().<!INVISIBLE_REFERENCE!>bar<!>() // hidden
Private.<!INVISIBLE_REFERENCE!>Nested<!>() // hidden
Private.<!INVISIBLE_REFERENCE!>fromCompanion<!>() // hidden
}
// FILE: second.kt
fun secondTest() {
<!HIDDEN!>foo<!>() // hidden
<!HIDDEN!>Private<!>() // hidden
<!INVISIBLE_REFERENCE!>foo<!>() // hidden
<!INVISIBLE_REFERENCE!>Private<!>() // hidden
}
compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.kt
Vendored
+3 -3
View File
@@ -31,7 +31,7 @@ class Derived : Protected() {
fun foo() {
bar()
Nested().foo()
Nested().<!HIDDEN!>bar<!>() // hidden
Nested().<!INVISIBLE_REFERENCE!>bar<!>() // hidden
fromCompanion()
protectedFromCompanion()
@@ -48,8 +48,8 @@ fun test() {
Protected().baz()
Protected().Inner()
Protected().<!HIDDEN!>bar<!>() // hidden
Protected.<!HIDDEN!>Nested<!>() // hidden
Protected().<!INVISIBLE_REFERENCE!>bar<!>() // hidden
Protected.<!INVISIBLE_REFERENCE!>Nested<!>() // hidden
}
open class Generic<T>(val x: T) {
compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.kt
Vendored
+2 -2
View File
@@ -2,12 +2,12 @@ class A {
companion object Comp {}
fun foo() {
<!HIDDEN!>Comp<!>()
<!INVISIBLE_REFERENCE!>Comp<!>()
}
}
object B {
private val x = <!HIDDEN!>B<!>()
private val x = <!INVISIBLE_REFERENCE!>B<!>()
}
class D {
compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.kt
Vendored
+1 -1
View File
@@ -19,5 +19,5 @@ abstract class A {
// FILE: main.kt
fun test(b: B): String {
return b <!HIDDEN!>foo<!> "hello" // should be an error
return b <!INVISIBLE_REFERENCE!>foo<!> "hello" // should be an error
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.kt
Vendored
+7 -7
View File
@@ -22,24 +22,24 @@ import j.JavaProtected
import j.JavaPackageLocal
class A {
val p1 = JavaPackageLocal.<!HIDDEN!>javaPPackage<!>
val p2 = JavaProtected.<!HIDDEN!>javaPProtectedStatic<!>
val p3 = JavaProtected().<!HIDDEN!>javaPProtectedPackage<!>
val p1 = JavaPackageLocal.<!INVISIBLE_REFERENCE!>javaPPackage<!>
val p2 = JavaProtected.<!INVISIBLE_REFERENCE!>javaPProtectedStatic<!>
val p3 = JavaProtected().<!INVISIBLE_REFERENCE!>javaPProtectedPackage<!>
fun test() {
JavaProtected.<!HIDDEN!>javaMProtectedStatic<!>()
JavaPackageLocal.<!HIDDEN!>javaMPackage<!>()
JavaProtected.<!INVISIBLE_REFERENCE!>javaMProtectedStatic<!>()
JavaPackageLocal.<!INVISIBLE_REFERENCE!>javaMPackage<!>()
}
}
class B : JavaProtected() {
val p1 = JavaPackageLocal.<!HIDDEN!>javaPPackage<!>
val p1 = JavaPackageLocal.<!INVISIBLE_REFERENCE!>javaPPackage<!>
val p2 = JavaProtected.javaPProtectedStatic
val p3 = javaPProtectedPackage
fun test() {
JavaProtected.javaMProtectedStatic()
JavaPackageLocal.<!HIDDEN!>javaMPackage<!>()
JavaPackageLocal.<!INVISIBLE_REFERENCE!>javaMPackage<!>()
}
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/lowPriorityInResolution.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
<!CONFLICTING_OVERLOADS!>@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
<!HIDDEN!>@kotlin.internal.LowPriorityInOverloadResolution<!>
@kotlin.internal.LowPriorityInOverloadResolution
fun foo(): Int<!> = 1
<!CONFLICTING_OVERLOADS!>fun foo(): String<!> = ""