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

[FIR] Fix effective visibility calculation & relevant test data

Browse Source
This commit is contained in:
rapturemain
2020-04-14 14:08:28 +03:00
committed by Mikhail Glukhikh
parent d811f6f4a6
commit 6d63de01ac
34 changed files with 137 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/exposed/functional.fir.kt
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@ internal class My
class Your
// Both arguments should be exposed
fun foo(my: My, f: (My) -> Unit) = f(my)
fun foo(<!EXPOSED_PARAMETER_TYPE!>my: My<!>, <!EXPOSED_PARAMETER_TYPE!>f: (My) -> Unit<!>) = f(my)
// Ok
fun bar(your: Your, f: (Your) -> Unit) = f(your)
// Exposed, returns My
fun gav(f: () -> My) = f()
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun gav(<!EXPOSED_PARAMETER_TYPE!>f: () -> My<!>) = f()<!>
compiler/testData/diagnostics/tests/exposed/internal.fir.kt
Vendored
+2 -2
View File
@@ -10,13 +10,13 @@ internal open class Your: My() {
open class His: Your() {
protected open class Nested
// error, public from internal
val x = My()
<!EXPOSED_PROPERTY_TYPE!>val x = My()<!>
// valid, private from internal
private fun bar() = My()
// valid, internal from internal
internal var y: My? = null
// error, protected from internal
protected fun baz() = Your()
<!EXPOSED_FUNCTION_RETURN_TYPE!>protected fun baz() = Your()<!>
}
internal class Their: His() {
compiler/testData/diagnostics/tests/exposed/internalFromLocal.fir.kt
Vendored
+2 -2
View File
@@ -3,8 +3,8 @@ interface Your
class My {
internal val x = object : Your {}
internal fun foo() = {
<!EXPOSED_FUNCTION_RETURN_TYPE!>internal fun foo() = {
class Local
Local()
}()
}()<!>
}
compiler/testData/diagnostics/tests/exposed/local.fir.kt
Vendored
+4 -4
View File
@@ -1,14 +1,14 @@
// invalid, depends on local class
fun foo() = run {
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun foo() = run {
class A
A()
}
}<!>
// invalid, depends on local class
fun gav() = {
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun gav() = {
class B
B()
}
}<!>
abstract class My
compiler/testData/diagnostics/tests/exposed/localInFunReturnType.fir.kt
Vendored
+6 -6
View File
@@ -2,27 +2,27 @@ class My<T>(val value: T)
open class Base
fun invalid1() = run {
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun invalid1() = run {
class Local
My(Local())
}
}<!>
fun invalid2() = My(object {})
fun invalid3() = My(object : Base() {})
fun invalid4() = run {
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun invalid4() = run {
class Local
My(My(Local()))
}
}<!>
fun invalid5() = run {
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun invalid5() = run {
fun invalid5a() = run {
class Local
Local()
}
My(invalid5a())
}
}<!>
// Valid: effectively Any
fun valid1() = object {}
compiler/testData/diagnostics/tests/exposed/localInMemberType.fir.kt
Vendored
+6 -6
View File
@@ -4,9 +4,9 @@ class Something {
internal val internalVal1 = object { override fun toString() = "!" }
private val privateVal1 = object { override fun toString() = "!" }
public val publicVal2 = run { class A; A() }
protected val protectedVal2 = run { class A; A() }
internal val internalVal2 = run { class A; A() }
<!EXPOSED_PROPERTY_TYPE!>public val publicVal2 = run { class A; A() }<!>
<!EXPOSED_PROPERTY_TYPE!>protected val protectedVal2 = run { class A; A() }<!>
<!EXPOSED_PROPERTY_TYPE!>internal val internalVal2 = run { class A; A() }<!>
private val privateVal2 = run { class A; A() }
public fun publicFun1() = object { override fun toString() = "!" }
@@ -14,8 +14,8 @@ class Something {
internal fun internalFun1() = object { override fun toString() = "!" }
private fun privateFun1() = object { override fun toString() = "!" }
public fun publicFun2() = run { class A; A() }
protected fun protectedFun2() = run { class A; A() }
internal fun internalFun2() = run { class A; A() }
<!EXPOSED_FUNCTION_RETURN_TYPE!>public fun publicFun2() = run { class A; A() }<!>
<!EXPOSED_FUNCTION_RETURN_TYPE!>protected fun protectedFun2() = run { class A; A() }<!>
<!EXPOSED_FUNCTION_RETURN_TYPE!>internal fun internalFun2() = run { class A; A() }<!>
private fun privateFun2() = run { class A; A() }
}
compiler/testData/diagnostics/tests/exposed/localInPropertyType.fir.kt
Vendored
+6 -6
View File
@@ -2,27 +2,27 @@ class My<T>(val value: T)
open class Base
val invalid1 = run {
<!EXPOSED_PROPERTY_TYPE!>val invalid1 = run {
class Local
My(Local())
}
}<!>
val invalid2 = My(object {})
val invalid3 = My(object : Base() {})
val invalid4 = run {
<!EXPOSED_PROPERTY_TYPE!>val invalid4 = run {
class Local
My(My(Local()))
}
}<!>
val invalid5 = run {
<!EXPOSED_PROPERTY_TYPE!>val invalid5 = run {
fun invalid5a() = run {
class Local
Local()
}
My(invalid5a())
}
}<!>
// Valid: effectively Any
val valid1 = object {}
compiler/testData/diagnostics/tests/exposed/object.fir.kt
Vendored
+7 -7
View File
@@ -1,7 +1,7 @@
// From KT-10753
object My : Inter() {
fun foo(arg: Inter): Inter = arg
val x: Inter? = null
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun foo(<!EXPOSED_PARAMETER_TYPE!>arg: Inter<!>): Inter = arg<!>
<!EXPOSED_PROPERTY_TYPE!>val x: Inter? = null<!>
}
internal open class Inter
@@ -10,21 +10,21 @@ internal open class Inter
open class Test {
protected class Protected
fun foo(x: Protected) = x
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun foo(<!EXPOSED_PARAMETER_TYPE!>x: Protected<!>) = x<!>
interface NestedInterface {
fun create(x: Protected)
fun create(<!EXPOSED_PARAMETER_TYPE!>x: Protected<!>)
}
class NestedClass {
fun create(x: Protected) = x
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun create(<!EXPOSED_PARAMETER_TYPE!>x: Protected<!>) = x<!>
}
object NestedObject {
fun create(x: Protected) = x
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun create(<!EXPOSED_PARAMETER_TYPE!>x: Protected<!>) = x<!>
}
companion object {
fun create(x: Protected) = x
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun create(<!EXPOSED_PARAMETER_TYPE!>x: Protected<!>) = x<!>
}
}
compiler/testData/diagnostics/tests/exposed/propertyInPrivateConstructor.fir.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
private enum class Foo { A, B }
class Bar private constructor(val foo: Foo)
class Bar private constructor(<!EXPOSED_PROPERTY_TYPE!>val foo: Foo<!>)
compiler/testData/diagnostics/tests/exposed/propertyInSimpleConstructor.fir.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
private enum class Foo { A, B }
class Bar(val foo: Foo)
class Bar(<!EXPOSED_PARAMETER_TYPE, EXPOSED_PROPERTY_TYPE!>val foo: Foo<!>)
compiler/testData/diagnostics/tests/exposed/simple.fir.kt
Vendored
+6 -6
View File
@@ -6,18 +6,18 @@ public interface Your: My {
fun <T: Base> foo(): T
}
public class Derived<T: My>(val x: My): Base() {
public class Derived<T: My>(<!EXPOSED_PARAMETER_TYPE, EXPOSED_PROPERTY_TYPE!>val x: My<!>): Base() {
constructor(xx: My?, x: My): this(xx ?: x)
constructor(<!EXPOSED_PARAMETER_TYPE!>xx: My?<!>, <!EXPOSED_PARAMETER_TYPE!>x: My<!>): this(xx ?: x)
val y: Base? = null
<!EXPOSED_PROPERTY_TYPE!>val y: Base? = null<!>
val My.z: Int
val <!EXPOSED_RECEIVER_TYPE!>My<!>.z: Int
get() = 42
fun foo(m: My): My = m
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun foo(<!EXPOSED_PARAMETER_TYPE!>m: My<!>): My = m<!>
fun My.bar(): My = this
<!EXPOSED_FUNCTION_RETURN_TYPE!>fun <!EXPOSED_RECEIVER_TYPE!>My<!>.bar(): My = this<!>
}
compiler/testData/diagnostics/tests/exposed/typeArgs.fir.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ internal open class My
abstract class Your {
// invalid, List<My> is effectively internal
abstract fun give(): List<My>
<!EXPOSED_FUNCTION_RETURN_TYPE!>abstract fun give(): List<My><!>
}
// invalid, List<My> is effectively internal