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

FIR Java: record Java types with flexible nullability

Browse Source
This commit is contained in:
Jinseong Jeon
2020-11-12 15:40:21 -08:00
committed by teamcityserver
parent 1f48092ec1
commit fc7f589caa
175 changed files with 545 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/mutability/LoadIterable.fir.txt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
public abstract interface LoadIterable<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
@R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|
@R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>?>!|
public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/MutableIterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
@R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
@R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|ft<@FlexibleNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<kotlin/collections/Iterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() Iterable: R|ft<@FlexibleNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public abstract interface LoadIterableWithConflict<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|
@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|
public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<kotlin/collections/MutableIterable<ft<T, T?>!>, kotlin/collections/Iterable<ft<T, T?>!>?>!|): R|kotlin/Unit|
public abstract fun setIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|kotlin/annotations/jvm/Mutable|() Iterable: R|ft<@FlexibleNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>, kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.fir.txt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
public abstract interface LoadIterableWithNullability<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
@R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T, T?>!>|
@R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/Mutable|() public abstract fun getIterable(): R|@EnhancedNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>|
public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<ft<T, T?>!>|): R|kotlin/Unit|
public abstract fun setIterable(@R|kotlin/annotations/jvm/Mutable|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/MutableIterable<ft<@FlexibleNullability T, T?>!>|): R|kotlin/Unit|
@R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|kotlin/collections/Iterable<ft<T, T?>!>|
@R|org/jetbrains/annotations/NotNull|() @R|kotlin/annotations/jvm/ReadOnly|() public abstract fun getReadOnlyIterable(): R|@EnhancedNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>|
public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|kotlin/collections/Iterable<ft<T, T?>!>|): R|kotlin/Unit|
public abstract fun setReadOnlyIterable(@R|kotlin/annotations/jvm/ReadOnly|() @R|org/jetbrains/annotations/NotNull|() Iterable: R|@EnhancedNullability kotlin/collections/Iterable<ft<@FlexibleNullability T, T?>!>|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public abstract interface ReadOnlyExtendsWildcard : R|kotlin/Any| {
public abstract fun bar(): R|kotlin/Unit|
public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/List<out ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
public abstract fun foo(@R|kotlin/annotations/jvm/ReadOnly|() x: R|ft<@FlexibleNullability kotlin/collections/List<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, kotlin/collections/List<out ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|, @R|org/jetbrains/annotations/NotNull|() y: R|@EnhancedNullability kotlin/Comparable<in ft<@FlexibleNullability kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
}