jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-17 00:21:28 +00:00
Code Issues 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

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class ArrayType : R|kotlin/Any| {
public open operator fun foo(): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
public open operator fun foo(): R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|
public constructor(): R|test/ArrayType|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithNewTypeParams<T> : R|kotlin/Any| {
public constructor<T, U>(first: R|ft<U, U?>|!): R|test/ConstructorWithNewTypeParams<T>|
public constructor<T, U>(first: R|ft<U, U?>!|): R|test/ConstructorWithNewTypeParams<T>|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithParentTypeParams<T> : R|kotlin/Any| {
public constructor<T>(first: R|ft<T, T?>|!): R|test/ConstructorWithParentTypeParams<T>|
public constructor<T>(first: R|ft<T, T?>!|): R|test/ConstructorWithParentTypeParams<T>|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public open class ConstructorWithSeveralParams : R|kotlin/Any| {
public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>|!, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): R|test/ConstructorWithSeveralParams|
public constructor(integer: R|ft<kotlin/Int, kotlin/Int?>!|, intBasic: R|kotlin/Int|, collection: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|): R|test/ConstructorWithSeveralParams|
}

2
compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class CustomProjectionKind : R|kotlin/Any| {
public open operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
public open operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>!>?>!|
public constructor(): R|test/CustomProjectionKind|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class MethodWithFunctionTypes : R|kotlin/Any| {
public open operator fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|!): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>>, kotlin/Function0<ft<kotlin/String, kotlin/String?>>?>|!
public open operator fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/Function1<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!|): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>!>, kotlin/Function0<ft<kotlin/String, kotlin/String?>!>?>!|
public constructor(): R|test/MethodWithFunctionTypes|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class MethodWithGenerics : R|kotlin/Any| {
public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
public constructor(): R|test/MethodWithGenerics|

4
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt vendored
View File

@@ -1,7 +1,7 @@
public open class MethodWithMappedClasses : R|kotlin/Any| {
public open operator fun <T> copy(dest: R|ft<kotlin/collections/MutableList<in T>, kotlin/collections/List<in T>?>|!, src: R|ft<kotlin/collections/MutableList<ft<T, T?>>, kotlin/collections/List<ft<T, T?>>?>|!): R|kotlin/Unit|
public open operator fun <T> copy(dest: R|ft<kotlin/collections/MutableList<in T>, kotlin/collections/List<in T>?>!|, src: R|ft<kotlin/collections/MutableList<ft<T, T?>!>, kotlin/collections/List<ft<T, T?>!>?>!|): R|kotlin/Unit|
public open operator fun <T> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, in T>?>|!, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|!): R|kotlin/Unit|
public open operator fun <T> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, in T>?>!|, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>!, ft<T, T?>!>?>!|): R|kotlin/Unit|
public constructor(): R|test/MethodWithMappedClasses|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class MethodWithTypeParameters : R|kotlin/Any| {
public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<in kotlin/String>?>|!): R|kotlin/Unit|
public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<in kotlin/String>?>!|): R|kotlin/Unit|
public constructor(): R|test/MethodWithTypeParameters|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class MethodWithVararg : R|kotlin/Any| {
public open operator fun foo(vararg s: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
public open operator fun foo(vararg s: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
public constructor(): R|test/MethodWithVararg|

6
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt vendored
View File

@@ -1,9 +1,9 @@
public open class PropertyArrayTypes<T> : R|kotlin/Any| {
public open field arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<ft<kotlin/String, kotlin/String?>>?>>|
public open field arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<ft<kotlin/String, kotlin/String?>!>?>!>|
public open field array: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
public open field array: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|
public open field genericArray: R|kotlin/Array<ft<T, T?>>|
public open field genericArray: R|kotlin/Array<ft<T, T?>!>|
public constructor<T>(): R|test/PropertyArrayTypes<T>|

8
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt vendored
View File

@@ -1,11 +1,11 @@
public open class PropertyComplexTypes<T> : R|kotlin/Any| {
public open field genericType: R|ft<T, T?>|!
public open field genericType: R|ft<T, T?>!|
public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>!>?>!|
public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!|
public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>!>, java/util/ArrayList<ft<T, T?>!>?>!>?>!|
public constructor<T>(): R|test/PropertyComplexTypes<T>|

4
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt vendored
View File

@@ -1,7 +1,7 @@
public open class PropertySimpleType : R|kotlin/Any| {
public open field fieldOne: R|ft<kotlin/String, kotlin/String?>|!
public open field fieldOne: R|ft<kotlin/String, kotlin/String?>!|
public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>|!
public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>!|
public constructor(): R|test/PropertySimpleType|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public final class StarProjection : R|kotlin/Any| {
public final operator fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>|!
public final operator fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>!|
public constructor(): R|test/StarProjection|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class WrongProjectionKind : R|kotlin/Any| {
public open operator fun copy(from: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>>|, to: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
public open operator fun copy(from: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>|, to: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>!>?>!|
public constructor(): R|test/WrongProjectionKind|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class WrongReturnTypeStructure : R|kotlin/Any| {
public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
public constructor(): R|test/WrongReturnTypeStructure|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!): R|kotlin/Unit|
public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>!|): R|kotlin/Unit|
public constructor(): R|test/WrongTypeParameterBoundStructure1|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt vendored
View File

@@ -1,5 +1,5 @@
public open class WrongValueParameterStructure1 : R|kotlin/Any| {
public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>!|, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>!, ft<kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<kotlin/String, kotlin/String?>!|
public constructor(): R|test/WrongValueParameterStructure1|

2
compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.fir.txt vendored
View File

@@ -1,4 +1,4 @@
public abstract interface SubclassOfCollection<E> : R|kotlin/collections/MutableCollection<E>| {
public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<ft<E, E?>>|
public abstract operator fun iterator(): R|kotlin/collections/MutableIterator<ft<E, E?>!>|
}