[FIR] Fix enhancement of java array type

This commit is contained in:
Dmitriy Novozhilov
2019-11-18 15:25:54 +03:00
parent d56412e397
commit 950d1f4fe4
21 changed files with 81 additions and 38 deletions
@@ -1,5 +1,5 @@
public final class ArrayTypeVariance : R|kotlin/Any| {
public final operator fun toArray(p0: R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>|): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>|
public final operator fun toArray(p0: R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|
public constructor(): R|test/ArrayTypeVariance|
@@ -1,5 +1,5 @@
public open class FieldOfArrayType : R|kotlin/Any| {
public open field files: R|kotlin/Array<ft<java/io/File, java/io/File?>!>|
public open field files: R|ft<kotlin/Array<ft<java/io/File, java/io/File?>!>, kotlin/Array<out ft<java/io/File, java/io/File?>!>?>!|
public constructor(): R|test/FieldOfArrayType|
@@ -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|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|
public constructor(): R|test/ArrayType|
@@ -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|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
public constructor(): R|test/MethodWithVararg|
@@ -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|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<ft<kotlin/String, kotlin/String?>!>?>!>, kotlin/Array<out 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|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|
public open field genericArray: R|kotlin/Array<ft<T, T?>!>|
public open field genericArray: R|ft<kotlin/Array<ft<T, T?>!>, kotlin/Array<out ft<T, T?>!>?>!|
public constructor<T>(): R|test/PropertyArrayTypes<T>|
@@ -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|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|
@@ -1,5 +1,5 @@
public open class NotNullIntArray : R|kotlin/Any| {
@R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/IntArray|
@R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|ft<kotlin/IntArray, kotlin/IntArray?>!|
public constructor(): R|test/NotNullIntArray|
@@ -1,5 +1,5 @@
public open class NotNullObjectArray : R|kotlin/Any| {
@R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>|
@R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|ft<kotlin/Array<ft<kotlin/Any, kotlin/Any?>!>, kotlin/Array<out ft<kotlin/Any, kotlin/Any?>!>?>!|
public constructor(): R|test/NotNullObjectArray|
@@ -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|ft<kotlin/Array<ft<A, A?>!>, kotlin/Array<out ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
}
@@ -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|ft<kotlin/Array<ft<A, A?>!>, kotlin/Array<out ft<A, A?>!>?>!|, b: R|ft<B, B?>!|): R|kotlin/Unit|
}
@@ -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|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
}
@@ -1,5 +1,5 @@
public open class VarargInt : R|kotlin/Any| {
public open operator fun vararg(vararg p: R|kotlin/IntArray|): R|kotlin/Unit|
public open operator fun vararg(vararg p: R|ft<kotlin/IntArray, kotlin/IntArray?>!|): R|kotlin/Unit|
public constructor(): R|test/VarargInt|
@@ -1,5 +1,5 @@
public open class VarargString : R|kotlin/Any| {
public open operator fun vararg(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>!>|): R|kotlin/Unit|
public open operator fun vararg(vararg strings: R|ft<kotlin/Array<ft<kotlin/String, kotlin/String?>!>, kotlin/Array<out ft<kotlin/String, kotlin/String?>!>?>!|): R|kotlin/Unit|
public constructor(): R|test/VarargString|