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

[FIR] Fix enhancement of FlexibleNullability and EnhancedNullability

Browse Source 
- Add utilities to add new attribute to ConeAttributes
- Get rid of FlexibleNullability attribute (it can be easily inferred
    for any flexible type at any moment)
- Fix determining of EnhancedNullability attribute
This commit is contained in:
Dmitriy Novozhilov
2021-03-09 14:51:19 +03:00
parent 0108f8a1b4
commit 65ea4e184a
290 changed files with 1395 additions and 2037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class WrongProjectionKind : R|kotlin/Any| {
public open fun copy(from: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|, to: R|ft<@FlexibleNullability kotlin/Array<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|): R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Number, kotlin/Number?>!>?>!|
public open fun copy(from: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>, kotlin/Array<out ft<kotlin/Number, kotlin/Number?>!>?>!|, to: R|ft<kotlin/Array<ft<kotlin/Number, kotlin/Number?>!>, kotlin/Array<out 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|
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class WrongReturnTypeStructure : R|kotlin/Any| {
public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
public open 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|
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<@FlexibleNullability java/lang/Runnable, java/lang/Runnable?>!|, R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<@FlexibleNullability A, A?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<out ft<@FlexibleNullability B, B?>!>, kotlin/collections/List<out ft<@FlexibleNullability B, B?>!>?>!|): R|kotlin/Unit|
public open fun <A : R|ft<kotlin/Any, kotlin/Any?>!|, B : R|ft<java/lang/Runnable, java/lang/Runnable?>!|, R|ft<kotlin/collections/MutableList<ft<kotlin/Cloneable, kotlin/Cloneable?>!>, kotlin/collections/List<ft<kotlin/Cloneable, kotlin/Cloneable?>!>?>!|> foo(a: R|ft<A, A?>!|, b: R|ft<kotlin/collections/MutableList<out ft<B, B?>!>, kotlin/collections/List<out ft<B, B?>!>?>!|): R|kotlin/Unit|
public constructor(): R|test/WrongTypeParameterBoundStructure1|
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class WrongValueParameterStructure1 : R|kotlin/Any| {
public open fun foo(a: R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|, b: R|ft<@FlexibleNullability kotlin/collections/MutableList<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>, kotlin/collections/List<ft<@FlexibleNullability kotlin/collections/MutableMap.MutableEntry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>, kotlin/collections/Map.Entry<ft<@FlexibleNullability kotlin/String, kotlin/String?>!, ft<@FlexibleNullability kotlin/String, kotlin/String?>!>?>!>?>!|): R|ft<@FlexibleNullability kotlin/String, kotlin/String?>!|
public open 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|