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

[FIR] Render nullability in type renderer, not in fir renderer

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-07-29 11:47:20 +03:00
parent 3e44bc805f
commit e6bf3b3263
220 changed files with 441 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public abstract interface Comparator<T> : R|kotlin/Any| {
public abstract operator fun compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
public abstract operator fun compare(o1: R|ft<T, T?>!|, o2: R|ft<T, T?>!|): R|kotlin/Int|
public abstract operator fun equals(obj: R|kotlin/Any|?): R|kotlin/Boolean|
public abstract operator fun equals(obj: R|kotlin/Any?|): R|kotlin/Boolean|
}
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface FilenameFilter : R|kotlin/Any| {
public abstract operator fun accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
public abstract operator fun accept(dir: R|ft<java/io/File, java/io/File?>!|, name: R|ft<kotlin/String, kotlin/String?>!|): R|kotlin/Boolean|
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface GenericInterfaceParameterWithSelfBound<T : R|test/GenericInterfaceParameterWithSelfBound<T>|> : R|kotlin/Any| {
public abstract operator fun method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
public abstract operator fun method(t: R|ft<T, T?>!|): R|ft<T, T?>!|
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface GenericInterfaceParametersWithBounds<A : R|kotlin/Comparable<A>|, R|kotlin/Cloneable|, B : R|kotlin/collections/MutableList<A>|> : R|kotlin/Any| {
public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, B?>!|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface GenericMethodParameters : R|kotlin/Any| {
public abstract operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
public abstract operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|kotlin/Array<ft<A, A?>!>|, b: R|ft<B, B?>!|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface VarargParameter : R|kotlin/Any| {
public abstract operator fun f(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
public abstract operator fun f(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
}
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 operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open operator fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
public open operator fun foo(c: R|ft<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 operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|): R|kotlin/Unit|
public open static operator fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open static operator fun bar(r: R|ft<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<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|kotlin/String|): R|test/ConstructorWithAnnotations|
public constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>!|, @R|org/jetbrains/annotations/NotNull|() s: R|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 operator fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
public open operator fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>!|): R|kotlin/Unit|
public open operator 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 operator 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 operator fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
public open operator fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>!|): R|kotlin/Unit|
public open operator fun wildcardBound(comparator: R|ft<java/util/Comparator<in kotlin/CharSequence>, java/util/Comparator<in kotlin/CharSequence>?>|!): R|kotlin/Unit|
public open operator fun wildcardBound(comparator: R|ft<java/util/Comparator<in kotlin/CharSequence>, java/util/Comparator<in 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 operator fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
private open operator fun samAdapter(r: R|ft<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 operator fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|!): R|kotlin/Unit|
public abstract operator fun foo(p: R|ft<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 operator 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 operator 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 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|kotlin/Any| {
public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>!>, java/util/Comparator<ft<T, T?>!>?>!|): R|kotlin/Unit|
public constructor<T>(): 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 operator fun <T> 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 operator fun <T> 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 operator fun <T : R|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 operator fun <T : R|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 operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<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 operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<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 constructor(): R|test/TypeParameterOfMethod|