FIR: Adjust FirTypeEnhancement test data

This commit is contained in:
Denis.Zharkov
2022-04-22 08:53:59 +03:00
committed by teamcity
parent ce1229038d
commit be3c9ceacb
72 changed files with 141 additions and 139 deletions
@@ -1,6 +1,6 @@
public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E, E?>>| {
public abstract fun foo(p: R|ft<E, E?>|): R|kotlin/Unit|
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
}
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
@@ -8,7 +8,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,12 +1,12 @@
public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E, E?>>| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
}
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
public abstract fun foo(p: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -10,7 +10,7 @@ public abstract interface Kt3302 : R|kotlin/Any| {
}
public abstract interface LinkedHashMap<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun put(key: R|ft<K, K?>|, value: R|ft<V, V?>|): R|ft<V, V?>|
public abstract fun put(key: R|ft<K & Any, K?>|, value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,10 +1,12 @@
public abstract interface OverrideWithErasedParameter : R|kotlin/Any| {
public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/OverrideWithErasedParameter.Super<ft<T, T?>>| {
public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/OverrideWithErasedParameter.Super<ft<T & Any, T?>>| {
public abstract fun foo(o: R|ft<kotlin/Any, kotlin/Any?>|): R|kotlin/Unit|
public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(t: R|ft<T, T?>|): R|kotlin/Unit|
public abstract fun foo(t: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,6 +1,6 @@
public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(key: R|ft<T, T?>|): R|kotlin/Unit|
public abstract fun foo(key: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -4,13 +4,13 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
}
public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<T, T?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<T & Any, T?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
}
public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(p: R|ft<E, E?>|): R|kotlin/Unit|
public abstract fun foo(p: R|ft<E & Any, E?>|): R|kotlin/Unit|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,6 +1,6 @@
public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E, E?>>| {
public abstract fun foo(): R|ft<E, E?>|
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter.Super<ft<E & Any, E?>>| {
public abstract fun foo(): R|ft<E & Any, E?>|
}
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter.Middle<ft<kotlin/String, kotlin/String?>>| {
@@ -8,7 +8,7 @@ public abstract interface DeeplySubstitutedClassParameter : R|kotlin/Any| {
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<T, T?>|
public abstract fun foo(): R|ft<T & Any, T?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,12 +1,12 @@
public abstract interface DeeplySubstitutedClassParameter2 : R|kotlin/Any| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E, E?>>| {
public abstract interface Middle<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/DeeplySubstitutedClassParameter2.Super<ft<E & Any, E?>>| {
}
public abstract interface Sub : R|test/DeeplySubstitutedClassParameter2.Middle<ft<kotlin/String, kotlin/String?>>| {
public abstract fun foo(): R|ft<kotlin/String, kotlin/String?>|
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<T, T?>|
public abstract fun foo(): R|ft<T & Any, T?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -9,6 +9,6 @@ public abstract interface HalfSubstitutedTypeParameters : R|kotlin/Any| {
public abstract fun dummy(): R|kotlin/Unit|
}
public abstract interface TrickyList<X : R|ft<kotlin/Any, kotlin/Any?>|, E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableList<ft<E, E?>>| {
public abstract interface TrickyList<X : R|ft<kotlin/Any, kotlin/Any?>|, E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableList<ft<E & Any, E?>>| {
}
}
@@ -1,6 +1,6 @@
public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
public abstract interface Generic<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<T, T?>|
public abstract fun foo(): R|ft<T & Any, T?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,4 +1,4 @@
public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableCollection<ft<E, E?>>| {
public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator<ft<E, E?>>|
public abstract interface SubclassOfCollection<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableCollection<ft<E & Any, E?>>| {
public abstract operator fun iterator(): R|@EnhancedNullability kotlin/collections/MutableIterator<ft<E & Any, E?>>|
}
@@ -1,4 +1,4 @@
public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K, K?>, ft<V, V?>>| {
public abstract operator fun setValue(value: R|ft<V, V?>|): R|ft<V, V?>|
public abstract interface SubclassOfMapEntry<K : R|ft<kotlin/Any, kotlin/Any?>|, V : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/collections/MutableMap.MutableEntry<ft<K & Any, K?>, ft<V & Any, V?>>| {
public abstract operator fun setValue(value: R|ft<V & Any, V?>|): R|ft<V & Any, V?>|
}
@@ -4,7 +4,7 @@ public abstract interface SubstitutedClassParameter : R|kotlin/Any| {
}
public abstract interface Super<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<T, T?>|
public abstract fun foo(): R|ft<T & Any, T?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -4,13 +4,13 @@ public abstract interface SubstitutedClassParameters : R|kotlin/Any| {
}
public abstract interface Super1<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<T, T?>|
public abstract fun foo(): R|ft<T & Any, T?>|
public abstract fun dummy(): R|kotlin/Unit|
}
public abstract interface Super2<E : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract fun foo(): R|ft<E, E?>|
public abstract fun foo(): R|ft<E & Any, E?>|
public abstract fun dummy(): R|kotlin/Unit|
@@ -1,5 +1,5 @@
public abstract interface TypeParamOfClass : R|kotlin/Any| {
public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/TypeParamOfClass.Super<ft<T, T?>>| {
public abstract interface Sub<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|test/TypeParamOfClass.Super<ft<T & Any, T?>>| {
public abstract fun foo(): R|@EnhancedNullability T & Any|
}
@@ -1,10 +1,10 @@
public abstract interface InheritNullability : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritNullability.Super| {
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
}
}
@@ -1,10 +1,10 @@
public abstract interface TwoBounds : R|kotlin/Any| {
public abstract interface Sub : R|test/TwoBounds.Super| {
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
}
}
@@ -1,14 +1,14 @@
public abstract interface TwoSuperclasses : R|kotlin/Any| {
public abstract interface Sub : R|test/TwoSuperclasses.Super1|, R|test/TwoSuperclasses.Super2| {
public abstract fun <C : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(c: R|ft<C, C?>|): R|kotlin/Unit|
public abstract fun <C : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(c: R|ft<C & Any, C?>|): R|kotlin/Unit|
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<A & Any, A?>|): R|kotlin/Unit|
}
public abstract interface Super2 : R|kotlin/Any| {
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|> foo(a: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
}
@@ -1,10 +1,10 @@
public abstract interface TwoTypeParameters : R|kotlin/Any| {
public abstract interface Sub : R|test/TwoTypeParameters.Super| {
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, A : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, A : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/CharSequence, kotlin/CharSequence?>|, B : R|ft<kotlin/Cloneable, kotlin/Cloneable?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
}
@@ -1,12 +1,12 @@
public abstract interface UseParameterAsUpperBound : R|kotlin/Any| {
public abstract interface Sub : R|test/UseParameterAsUpperBound.Super| {
public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<B, B?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<B & Any, B?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A, A?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A, A?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<A & Any, A?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
}
@@ -1,10 +1,10 @@
public abstract interface UseParameterInUpperBound : R|kotlin/Any| {
public abstract interface Sub : R|test/UseParameterInUpperBound.Super| {
public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B, B?>>, kotlin/collections/List<ft<B, B?>>?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>>, kotlin/collections/List<ft<A, A?>>?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
}
@@ -1,10 +1,10 @@
public abstract interface UseParameterInUpperBoundWithKotlinSignature : R|kotlin/Any| {
public abstract interface Sub : R|test/UseParameterInUpperBoundWithKotlinSignature.Super| {
public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B, B?>>, kotlin/collections/List<ft<B, B?>>?>|> foo(b: R|ft<B, B?>|, a: R|ft<A, A?>|): R|kotlin/Unit|
public abstract fun <B : R|ft<kotlin/Any, kotlin/Any?>|, A : R|ft<kotlin/collections/MutableList<ft<B & Any, B?>>, kotlin/collections/List<ft<B & Any, B?>>?>|> foo(b: R|ft<B & Any, B?>|, a: R|ft<A & Any, A?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A, A?>>, kotlin/collections/List<ft<A, A?>>?>|> foo(a: R|ft<A, A?>|, b: R|ft<B, B?>|): R|kotlin/Unit|
public abstract fun <A : R|ft<kotlin/Any, kotlin/Any?>|, B : R|ft<kotlin/collections/MutableList<ft<A & Any, A?>>, kotlin/collections/List<ft<A & Any, A?>>?>|> foo(a: R|ft<A & Any, A?>|, b: R|ft<B & Any, B?>|): R|kotlin/Unit|
}
}