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/sam/adapters/AmbiguousAdapters.fir.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
public open class AmbiguousAdapters : R|kotlin/Any| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open fun foo(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>!|): R|kotlin/Unit|
public open fun foo(c: R|ft<@FlexibleNullability java/io/Closeable, java/io/Closeable?>!|): R|kotlin/Unit|
public constructor(): R|test/AmbiguousAdapters|
compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
public open class Basic : R|kotlin/Any| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open fun foo(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open static fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open static fun bar(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public constructor(): R|test/Basic|
compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class Constructor : R|kotlin/Any| {
public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|test/Constructor|
public constructor(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|test/Constructor|
}
compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class ConstructorWithAnnotations : R|kotlin/Any| {
public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
public constructor(r: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|@EnhancedNullability kotlin/String|): R|test/ConstructorWithAnnotations|
}
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
public open class NonTrivialFunctionType : R|kotlin/Any| {
public open fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
public open fun foo(filenameFilter: R|ft<@FlexibleNullability java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
public open fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
public open fun foo(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
public open fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
public open fun wildcardUnbound(comparator: R|ft<@FlexibleNullability java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
public open fun wildcardBound(comparator: R|ft<java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>, java/util/Comparator<in ft<kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
public open fun wildcardBound(comparator: R|ft<@FlexibleNullability java/util/Comparator<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>, java/util/Comparator<in ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!>?>!|): R|kotlin/Unit|
public constructor(): R|test/NonTrivialFunctionType|
compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class PrivateSamAdapter : R|kotlin/Any| {
private open fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>!|): R|kotlin/Unit|
private open fun samAdapter(r: R|ft<@FlexibleNullability test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>!|): R|kotlin/Unit|
public constructor(): R|test/PrivateSamAdapter|
compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface SelfAsParameter : R|kotlin/Any| {
public abstract fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>!|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<@FlexibleNullability test/SelfAsParameter, test/SelfAsParameter?>!|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class SeveralSamParameters : R|kotlin/Any| {
public open static fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<kotlin/String, kotlin/String?>!>?>!|, a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/String, kotlin/String?>!|, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|ft<kotlin/String, kotlin/String?>!|
public open static fun findMaxAndInvokeCallback(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, java/util/Comparator<ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!|, a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, afterRunnable: R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
public constructor(): R|test/SeveralSamParameters|
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class TypeParameterOfClass<T : R|ft<kotlin/Any, kotlin/Any?>!|> : R|kotlin/Any| {
public open fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|): R|kotlin/Unit|
public open fun foo(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|): R|kotlin/Unit|
public constructor<T : R|ft<kotlin/Any, kotlin/Any?>!|>(): R|test/TypeParameterOfClass<T>|
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
public open class TypeParameterOfMethod : R|kotlin/Any| {
public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> max(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
public open static fun <T : R|ft<kotlin/Any, kotlin/Any?>!|> max(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|, value1: R|ft<@FlexibleNullability T, T?>!|, value2: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
public open static fun <T : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|> max2(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|, value1: R|ft<T, T?>!|, value2: R|ft<T, T?>!|): R|ft<T, T?>!|
public open static fun <T : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|> max2(comparator: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability T, T?>!>, java/util/Comparator<ft<@FlexibleNullability T, T?>!>?>!|, value1: R|ft<@FlexibleNullability T, T?>!|, value2: R|ft<@FlexibleNullability T, T?>!|): R|ft<@FlexibleNullability T, T?>!|
public open static fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>!>, kotlin/collections/List<ft<A, A?>!>?>!|> method(a: R|ft<java/util/Comparator<ft<A, A?>!>, java/util/Comparator<ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
public open static fun <A : R|ft<@FlexibleNullability kotlin/CharSequence, kotlin/CharSequence?>!|, B : R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability A, A?>!>, kotlin/collections/List<ft<@FlexibleNullability A, A?>!>?>!|> method(a: R|ft<@FlexibleNullability java/util/Comparator<ft<@FlexibleNullability A, A?>!>, java/util/Comparator<ft<@FlexibleNullability A, A?>!>?>!|, b: R|ft<@FlexibleNullability B, B?>!|): R|kotlin/Unit|
public constructor(): R|test/TypeParameterOfMethod|