jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-08 15:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-11 19:37:38 +02:00
parent 25959fefdc
commit 9975bb8935
704 changed files with 1684 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.txt
View File

@@ -1,6 +1,6 @@
package test
internal trait TheTrait {
internal interface TheTrait {
internal companion object Companion {
/*primary*/ private constructor Companion()

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
View File

@@ -3,17 +3,17 @@ package test
public final class InheritMethodsDifferentReturnTypes {
/*primary*/ public constructor InheritMethodsDifferentReturnTypes()
public trait Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 {
public interface Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 {
public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String?
public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String?
}
public trait Super1 {
public interface Super1 {
public abstract fun bar(): kotlin.String?
public abstract fun foo(): kotlin.CharSequence?
}
public trait Super2 {
public interface Super2 {
public abstract fun bar(): kotlin.CharSequence?
public abstract fun foo(): kotlin.String?
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
View File

@@ -3,17 +3,17 @@ package test
public final class InheritMethodsDifferentReturnTypesGeneric {
/*primary*/ public constructor InheritMethodsDifferentReturnTypesGeneric()
public trait Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin.String, kotlin.CharSequence>, test.InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin.CharSequence, kotlin.String> {
public interface Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin.String, kotlin.CharSequence>, test.InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin.CharSequence, kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String?
public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String?
}
public trait Super1</*0*/ F, /*1*/ B> {
public interface Super1</*0*/ F, /*1*/ B> {
public abstract fun bar(): B?
public abstract fun foo(): F?
}
public trait Super2</*0*/ FF, /*1*/ BB> {
public interface Super2</*0*/ FF, /*1*/ BB> {
public abstract fun bar(): BB?
public abstract fun foo(): FF?
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
View File

@@ -1,6 +1,6 @@
package test
public trait RemoveRedundantProjectionKind {
public interface RemoveRedundantProjectionKind {
public abstract fun f(/*0*/ p0: kotlin.Collection<kotlin.CharSequence?>?): kotlin.Unit
public abstract fun f(/*0*/ p0: kotlin.Comparable<kotlin.CharSequence?>?): kotlin.Unit
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.txt
View File

@@ -4,6 +4,6 @@ public final class UnboundWildcard {
/*primary*/ public constructor UnboundWildcard()
public final fun foo(): test.UnboundWildcard.MyClass<*>?
public trait MyClass</*0*/ T : kotlin.CharSequence?> {
public interface MyClass</*0*/ T : kotlin.CharSequence?> {
}
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
View File

@@ -4,6 +4,6 @@ public final class StarProjection {
/*primary*/ public constructor StarProjection()
public final fun foo(): test.StarProjection.MyClass<*>
public trait MyClass</*0*/ T : kotlin.CharSequence?> {
public interface MyClass</*0*/ T : kotlin.CharSequence?> {
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
View File

@@ -1,8 +1,8 @@
package test
public trait PropagateTypeArgumentNullable {
public interface PropagateTypeArgumentNullable {
public trait Sub : test.PropagateTypeArgumentNullable.Super {
public interface Sub : test.PropagateTypeArgumentNullable.Super {
public abstract override /*1*/ fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract override /*1*/ fun invR(): kotlin.MutableList<kotlin.String?>
@@ -11,7 +11,7 @@ public trait PropagateTypeArgumentNullable {
public abstract override /*1*/ fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
public abstract fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
public abstract fun invR(): kotlin.MutableList<kotlin.String?>

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
View File

@@ -1,13 +1,13 @@
package test
public trait ChangeProjectionKind1 {
public interface ChangeProjectionKind1 {
public trait Sub : test.ChangeProjectionKind1.Super {
public interface Sub : test.ChangeProjectionKind1.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
View File

@@ -1,13 +1,13 @@
package test
public trait ChangeProjectionKind2 {
public interface ChangeProjectionKind2 {
public trait Sub : test.ChangeProjectionKind2.Super {
public interface Sub : test.ChangeProjectionKind2.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
View File

@@ -1,18 +1,18 @@
package test
public trait DeeplySubstitutedClassParameter {
public interface DeeplySubstitutedClassParameter {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: E): kotlin.Unit
}
public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public interface Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
View File

@@ -1,18 +1,18 @@
package test
public trait DeeplySubstitutedClassParameter2 {
public interface DeeplySubstitutedClassParameter2 {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
}
public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public interface Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritMutability {
public interface InheritMutability {
public trait Sub : test.InheritMutability.Super {
public interface Sub : test.InheritMutability.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNotVararg {
public interface InheritNotVararg {
public trait Sub : test.InheritNotVararg.Super {
public interface Sub : test.InheritNotVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNotVarargInteger {
public interface InheritNotVarargInteger {
public trait Sub : test.InheritNotVarargInteger.Super {
public interface Sub : test.InheritNotVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNotVarargNotNull {
public interface InheritNotVarargNotNull {
public trait Sub : test.InheritNotVarargNotNull.Super {
public interface Sub : test.InheritNotVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNotVarargPrimitive {
public interface InheritNotVarargPrimitive {
public trait Sub : test.InheritNotVarargPrimitive.Super {
public interface Sub : test.InheritNotVarargPrimitive.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNullability {
public interface InheritNullability {
public trait Sub : test.InheritNullability.Super {
public interface Sub : test.InheritNullability.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritProjectionKind {
public interface InheritProjectionKind {
public trait Sub : test.InheritProjectionKind.Super {
public interface Sub : test.InheritProjectionKind.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritReadOnliness {
public interface InheritReadOnliness {
public trait Sub : test.InheritReadOnliness.Super {
public interface Sub : test.InheritReadOnliness.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritVararg {
public interface InheritVararg {
public trait Sub : test.InheritVararg.Super {
public interface Sub : test.InheritVararg.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<out kotlin.String?>*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<out kotlin.String?>*/): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritVarargInteger {
public interface InheritVarargInteger {
public trait Sub : test.InheritVarargInteger.Super {
public interface Sub : test.InheritVarargInteger.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<out kotlin.Int?>*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<out kotlin.Int?>*/): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritVarargNotNull {
public interface InheritVarargNotNull {
public trait Sub : test.InheritVarargNotNull.Super {
public interface Sub : test.InheritVarargNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritVarargPrimitive {
public interface InheritVarargPrimitive {
public trait Sub : test.InheritVarargPrimitive.Super {
public interface Sub : test.InheritVarargPrimitive.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
View File

@@ -1,18 +1,18 @@
package test
public trait Kt3302 {
public interface Kt3302 {
public trait BSONObject {
public interface BSONObject {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any?
}
public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
public interface BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any?
}
public trait LinkedHashMap</*0*/ K, /*1*/ V> {
public interface LinkedHashMap</*0*/ K, /*1*/ V> {
public abstract fun dummy(): kotlin.Unit
public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
View File

@@ -1,13 +1,13 @@
package test
public trait MutableToReadOnly {
public interface MutableToReadOnly {
public trait Sub : test.MutableToReadOnly.Super {
public interface Sub : test.MutableToReadOnly.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.txt
View File

@@ -1,13 +1,13 @@
package test
public trait NotNullToNullable {
public interface NotNullToNullable {
public trait Sub : test.NotNullToNullable.Super {
public interface Sub : test.NotNullToNullable.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
View File

@@ -1,13 +1,13 @@
package test
public trait NullableToNotNull {
public interface NullableToNotNull {
public trait Sub : test.NullableToNotNull.Super {
public interface Sub : test.NullableToNotNull.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
View File

@@ -1,13 +1,13 @@
package test
public trait NullableToNotNullKotlinSignature {
public interface NullableToNotNullKotlinSignature {
public trait Sub : test.NullableToNotNullKotlinSignature.Super {
public interface Sub : test.NullableToNotNullKotlinSignature.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
View File

@@ -1,13 +1,13 @@
package test
public trait OverrideWithErasedParameter {
public interface OverrideWithErasedParameter {
public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
public interface Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: T?): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
View File

@@ -1,13 +1,13 @@
package test
public trait ReadOnlyToMutable {
public interface ReadOnlyToMutable {
public trait Sub : test.ReadOnlyToMutable.Super {
public interface Sub : test.ReadOnlyToMutable.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
View File

@@ -1,18 +1,18 @@
package test
public trait SubclassFromGenericAndNot {
public interface SubclassFromGenericAndNot {
public trait Generic</*0*/ T> {
public interface Generic</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ key: T): kotlin.Unit
}
public trait NonGeneric {
public interface NonGeneric {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
}
public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
View File

@@ -1,13 +1,13 @@
package test
public trait SubstitutedClassParameter {
public interface SubstitutedClassParameter {
public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public interface Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
View File

@@ -1,18 +1,18 @@
package test
public trait SubstitutedClassParameters {
public interface SubstitutedClassParameters {
public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public interface Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
}
public trait Super1</*0*/ T> {
public interface Super1</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: T): kotlin.Unit
}
public trait Super2</*0*/ E> {
public interface Super2</*0*/ E> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(/*0*/ t: E): kotlin.Unit
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
View File

@@ -1,13 +1,13 @@
package test
public trait AddNotNullJavaSubtype {
public interface AddNotNullJavaSubtype {
public trait Sub : test.AddNotNullJavaSubtype.Super {
public interface Sub : test.AddNotNullJavaSubtype.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence?
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
View File

@@ -1,13 +1,13 @@
package test
public trait AddNotNullSameJavaType {
public interface AddNotNullSameJavaType {
public trait Sub : test.AddNotNullSameJavaType.Super {
public interface Sub : test.AddNotNullSameJavaType.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.CharSequence
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence?
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
View File

@@ -1,13 +1,13 @@
package test
public trait AddNullabilityJavaSubtype {
public interface AddNullabilityJavaSubtype {
public trait Sub : test.AddNullabilityJavaSubtype.Super {
public interface Sub : test.AddNullabilityJavaSubtype.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
View File

@@ -1,13 +1,13 @@
package test
public trait AddNullabilitySameGenericType1 {
public interface AddNullabilitySameGenericType1 {
public trait Sub : test.AddNullabilitySameGenericType1.Super {
public interface Sub : test.AddNullabilitySameGenericType1.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableList<kotlin.String>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
View File

@@ -1,13 +1,13 @@
package test
public trait AddNullabilitySameGenericType2 {
public interface AddNullabilitySameGenericType2 {
public trait Sub : test.AddNullabilitySameGenericType2.Super {
public interface Sub : test.AddNullabilitySameGenericType2.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableList<kotlin.String>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
View File

@@ -1,13 +1,13 @@
package test
public trait AddNullabilitySameJavaType {
public interface AddNullabilitySameJavaType {
public trait Sub : test.AddNullabilitySameJavaType.Super {
public interface Sub : test.AddNullabilitySameJavaType.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.CharSequence
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
View File

@@ -1,13 +1,13 @@
package test
public trait CantMakeImmutableInSubclass {
public interface CantMakeImmutableInSubclass {
public trait Sub : test.CantMakeImmutableInSubclass.Super {
public interface Sub : test.CantMakeImmutableInSubclass.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
View File

@@ -1,18 +1,18 @@
package test
public trait DeeplySubstitutedClassParameter {
public interface DeeplySubstitutedClassParameter {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): E
}
public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public interface Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
View File

@@ -1,18 +1,18 @@
package test
public trait DeeplySubstitutedClassParameter2 {
public interface DeeplySubstitutedClassParameter2 {
public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public interface Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(): E
}
public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public interface Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
View File

@@ -1,18 +1,18 @@
package test
public trait HalfSubstitutedTypeParameters {
public interface HalfSubstitutedTypeParameters {
public trait Sub : test.HalfSubstitutedTypeParameters.Super {
public interface Sub : test.HalfSubstitutedTypeParameters.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<kotlin.Int, kotlin.String?>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableList<kotlin.String?>
}
public trait TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E> {
public interface TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E> {
public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNullabilityGenericSubclassSimple {
public interface InheritNullabilityGenericSubclassSimple {
public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super {
public interface Sub : test.InheritNullabilityGenericSubclassSimple.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNullabilityJavaSubtype {
public interface InheritNullabilityJavaSubtype {
public trait Sub : test.InheritNullabilityJavaSubtype.Super {
public interface Sub : test.InheritNullabilityJavaSubtype.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNullabilitySameGenericType {
public interface InheritNullabilitySameGenericType {
public trait Sub : test.InheritNullabilitySameGenericType.Super {
public interface Sub : test.InheritNullabilitySameGenericType.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableList<kotlin.String>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritNullabilitySameJavaType {
public interface InheritNullabilitySameJavaType {
public trait Sub : test.InheritNullabilitySameJavaType.Super {
public interface Sub : test.InheritNullabilitySameJavaType.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.CharSequence
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritProjectionKind {
public interface InheritProjectionKind {
public trait Sub : test.InheritProjectionKind.Super {
public interface Sub : test.InheritProjectionKind.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableList<out kotlin.Number>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritReadOnlinessOfArgument {
public interface InheritReadOnlinessOfArgument {
public trait Sub : test.InheritReadOnlinessOfArgument.Super {
public interface Sub : test.InheritReadOnlinessOfArgument.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.List<kotlin.List<kotlin.String>>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritReadOnlinessSameClass {
public interface InheritReadOnlinessSameClass {
public trait Sub : test.InheritReadOnlinessSameClass.Super {
public interface Sub : test.InheritReadOnlinessSameClass.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.String>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
View File

@@ -1,13 +1,13 @@
package test
public trait InheritReadOnlinessSubclass {
public interface InheritReadOnlinessSubclass {
public trait Sub : test.InheritReadOnlinessSubclass.Super {
public interface Sub : test.InheritReadOnlinessSubclass.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.Collection<kotlin.String>
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
View File

@@ -1,13 +1,13 @@
package test
public trait SameProjectionKind {
public interface SameProjectionKind {
public trait Sub : test.SameProjectionKind.Super {
public interface Sub : test.SameProjectionKind.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
View File

@@ -1,18 +1,18 @@
package test
public trait SubclassFromGenericAndNot {
public interface SubclassFromGenericAndNot {
public trait Generic</*0*/ T> {
public interface Generic</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}
public trait NonGeneric {
public interface NonGeneric {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.String?
}
public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public interface Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.String
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
View File

@@ -1,6 +1,6 @@
package test
public trait SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E> {
public interface SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E> {
public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
View File

@@ -1,6 +1,6 @@
package test
public trait SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K, V> {
public interface SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K, V> {
public abstract override /*1*/ /*fake_override*/ fun getKey(): K
public abstract override /*1*/ /*fake_override*/ fun getValue(): V
public abstract override /*1*/ fun setValue(/*0*/ value: V): V

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
View File

@@ -1,13 +1,13 @@
package test
public trait SubstitutedClassParameter {
public interface SubstitutedClassParameter {
public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public interface Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
View File

@@ -1,18 +1,18 @@
package test
public trait SubstitutedClassParameters {
public interface SubstitutedClassParameters {
public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public interface Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.String
}
public trait Super1</*0*/ T> {
public interface Super1</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}
public trait Super2</*0*/ E> {
public interface Super2</*0*/ E> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): E
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesConflictingProjectionKinds {
public interface TwoSuperclassesConflictingProjectionKinds {
public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
public interface Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<out kotlin.CharSequence>
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesInvariantAndCovariantInferMutability {
public interface TwoSuperclassesInvariantAndCovariantInferMutability {
public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesInvariantAndCovariantInferNullability {
public interface TwoSuperclassesInvariantAndCovariantInferNullability {
public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.String?>
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableList<kotlin.String>
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesMutableAndNot {
public interface TwoSuperclassesMutableAndNot {
public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
public interface Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.String>
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesReturnJavaSubtype {
public interface TwoSuperclassesReturnJavaSubtype {
public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
public interface Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.String
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence?
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesReturnSameJavaType {
public interface TwoSuperclassesReturnSameJavaType {
public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
public interface Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.CharSequence
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence?
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.CharSequence
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
View File

@@ -1,18 +1,18 @@
package test
public trait TwoSuperclassesSupplementNotNull {
public interface TwoSuperclassesSupplementNotNull {
public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
public interface Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*2*/ fun foo(): kotlin.List<kotlin.String>
}
public trait Super1 {
public interface Super1 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.String?>
}
public trait Super2 {
public interface Super2 {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): kotlin.List<kotlin.String>?
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.txt
View File

@@ -1,13 +1,13 @@
package test
public trait TypeParamOfClass {
public interface TypeParamOfClass {
public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T> {
public interface Sub</*0*/ T> : test.TypeParamOfClass.Super<T> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): T
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
View File

@@ -1,13 +1,13 @@
package test
public trait TypeParamOfClassSubstituted {
public interface TypeParamOfClassSubstituted {
public trait Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String> {
public interface Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun foo(): kotlin.String
}
public trait Super</*0*/ T> {
public interface Super</*0*/ T> {
public abstract fun dummy(): kotlin.Unit
public abstract fun foo(): T
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.txt
View File

@@ -1,13 +1,13 @@
package test
public trait TypeParamOfFun {
public interface TypeParamOfFun {
public trait Sub : test.TypeParamOfFun.Super {
public interface Sub : test.TypeParamOfFun.Super {
public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
public abstract override /*1*/ fun </*0*/ E> foo(): E
}
public trait Super {
public interface Super {
public abstract fun dummy(): kotlin.Unit
public abstract fun </*0*/ T> foo(): T
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
View File

@@ -1,12 +1,12 @@
package test
public trait InheritMutability {
public interface InheritMutability {
public trait Sub : test.InheritMutability.Super {
public interface Sub : test.InheritMutability.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.txt
View File

@@ -1,12 +1,12 @@
package test
public trait InheritNullability {
public interface InheritNullability {
public trait Sub : test.InheritNullability.Super {
public interface Sub : test.InheritNullability.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
View File

@@ -1,12 +1,12 @@
package test
public trait InheritReadOnliness {
public interface InheritReadOnliness {
public trait Sub : test.InheritReadOnliness.Super {
public interface Sub : test.InheritReadOnliness.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.List<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A : kotlin.List<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.txt
View File

@@ -1,12 +1,12 @@
package test
public trait TwoBounds {
public interface TwoBounds {
public trait Sub : test.TwoBounds.Super {
public interface Sub : test.TwoBounds.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit where B : kotlin.Cloneable
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit where A : kotlin.Cloneable
}
}

8
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
View File

@@ -1,16 +1,16 @@
package test
public trait TwoSuperclasses {
public interface TwoSuperclasses {
public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
public interface Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence> foo(/*0*/ a: C): kotlin.Unit
}
public trait Super1 {
public interface Super1 {
public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
}
public trait Super2 {
public interface Super2 {
public abstract fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
View File

@@ -1,12 +1,12 @@
package test
public trait TwoTypeParameters {
public interface TwoTypeParameters {
public trait Sub : test.TwoTypeParameters.Super {
public interface Sub : test.TwoTypeParameters.Super {
public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence, /*1*/ A : kotlin.Cloneable> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A : kotlin.CharSequence, /*1*/ B : kotlin.Cloneable> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
View File

@@ -1,12 +1,12 @@
package test
public trait UseParameterAsUpperBound {
public interface UseParameterAsUpperBound {
public trait Sub : test.UseParameterAsUpperBound.Super {
public interface Sub : test.UseParameterAsUpperBound.Super {
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
View File

@@ -1,12 +1,12 @@
package test
public trait UseParameterInUpperBound {
public interface UseParameterInUpperBound {
public trait Sub : test.UseParameterInUpperBound.Super {
public interface Sub : test.UseParameterInUpperBound.Super {
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}

6
compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
View File

@@ -1,12 +1,12 @@
package test
public trait UseParameterInUpperBoundWithKotlinSignature {
public interface UseParameterInUpperBoundWithKotlinSignature {
public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
public interface Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ b: B, /*1*/ a: A): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
}
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.txt
View File

@@ -1,6 +1,6 @@
package test
public trait LoadIterable</*0*/ T> {
public interface LoadIterable</*0*/ T> {
public abstract fun getIterable(): kotlin.MutableIterable<T>?
public abstract fun setIterable(/*0*/ p0: kotlin.Iterable<T>?): kotlin.Unit
}

2
compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.txt
View File

@@ -1,6 +1,6 @@
package test
public trait LoadIterator</*0*/ T> {
public interface LoadIterator</*0*/ T> {
public abstract fun getIterator(): kotlin.MutableIterator<T>?
public abstract fun setIterator(/*0*/ p0: kotlin.Iterator<T>?): kotlin.Unit
}