diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 829767264df..e7521dc8d1b 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -230,7 +230,7 @@ public abstract trait jet.CharSequence : jet.Any { } public abstract trait jet.Collection : jet.Iterable, jet.Hashable { public abstract fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int public abstract fun isEmpty(): jet.Boolean @@ -737,7 +737,7 @@ public abstract trait jet.Iterator : jet.Any { } public abstract trait jet.List : jet.Collection { public abstract override /*1*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract fun get(/*0*/ index: jet.Int): E public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int @@ -882,17 +882,17 @@ public abstract trait jet.Map : jet. } public abstract trait jet.MutableCollection : jet.Collection, jet.MutableIterable { public abstract fun add(/*0*/ e: E): jet.Boolean - public abstract fun addAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract fun addAll(/*0*/ c: jet.Collection): jet.Boolean public abstract fun clear(): jet.Tuple0 public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean public abstract override /*2*/ fun iterator(): jet.MutableIterator public abstract fun remove(/*0*/ o: jet.Any?): jet.Boolean - public abstract fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract fun retainAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract fun removeAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract fun retainAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int public abstract override /*1*/ /*fake_override*/ fun toArray(): jet.Array public abstract override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: jet.Array): jet.Array @@ -908,11 +908,11 @@ public abstract trait jet.MutableIterator : jet.Iterator public abstract trait jet.MutableList : jet.List, jet.MutableCollection { public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean public abstract fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Tuple0 - public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ fun clear(): jet.Tuple0 public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: jet.Int): E public abstract override /*2*/ /*fake_override*/ fun hashCode(): jet.Int @@ -924,8 +924,8 @@ public abstract trait jet.MutableList : jet.List, jet.Mut public abstract override /*1*/ fun listIterator(/*0*/ index: jet.Int): jet.MutableListIterator public abstract fun remove(/*0*/ index: jet.Int): E public abstract override /*1*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean public abstract fun set(/*0*/ index: jet.Int, /*1*/ element: E): E public abstract override /*2*/ /*fake_override*/ fun size(): jet.Int public abstract override /*1*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList @@ -966,17 +966,17 @@ public abstract trait jet.MutableMap : j } public abstract trait jet.MutableSet : jet.Set, jet.MutableCollection { public abstract override /*1*/ fun add(/*0*/ e: E): jet.Boolean - public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ fun clear(): jet.Tuple0 public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*2*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract override /*2*/ /*fake_override*/ fun hashCode(): jet.Int public abstract override /*2*/ /*fake_override*/ fun isEmpty(): jet.Boolean public abstract override /*2*/ fun iterator(): jet.MutableIterator public abstract override /*1*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*2*/ /*fake_override*/ fun size(): jet.Int public abstract override /*2*/ /*fake_override*/ fun toArray(): jet.Array public abstract override /*2*/ /*fake_override*/ fun toArray(/*0*/ a: jet.Array): jet.Array @@ -1001,7 +1001,7 @@ public abstract trait jet.Range> : jet.Any { } public abstract trait jet.Set : jet.Collection { public abstract override /*1*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun equals(/*0*/ other: jet.Any?): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun hashCode(): jet.Int public abstract override /*1*/ fun isEmpty(): jet.Boolean diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt index 8fff27422fb..1b129935af4 100644 --- a/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt +++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt @@ -10,11 +10,11 @@ public abstract trait test.HalfSubstitutedTypeParameters : java.lang.Object { public abstract trait test.HalfSubstitutedTypeParameters.TrickyList : jet.MutableList { public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: jet.Int, /*1*/ element: E): jet.Tuple0 - public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: jet.Int, /*1*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0 public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: jet.Int): E public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: jet.Any?): jet.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean @@ -24,8 +24,8 @@ public abstract trait test.HalfSubstitutedTypeParameters : java.lang.Object { public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: jet.Int): jet.MutableListIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ index: jet.Int): E public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: jet.Any?): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean - public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: jet.Collection): jet.Boolean + public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: jet.Collection): jet.Boolean public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: jet.Int, /*1*/ element: E): E public abstract override /*1*/ /*fake_override*/ fun size(): jet.Int public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: jet.Int, /*1*/ toIndex: jet.Int): jet.MutableList diff --git a/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt index 13d902434f1..4a777958df5 100644 --- a/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt @@ -4,11 +4,11 @@ public open class test.ModalityOfFakeOverrides : java.util.AbstractList(): test.ModalityOfFakeOverrides public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.Tuple0 public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.String): jet.Boolean - public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Collection): jet.Boolean - public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection): jet.Boolean + public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Collection): jet.Boolean + public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection): jet.Boolean public open override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0 public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean - public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ p0: jet.Collection): jet.Boolean + public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ p0: jet.Collection): jet.Boolean public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int public open override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean @@ -19,9 +19,9 @@ public open class test.ModalityOfFakeOverrides : java.util.AbstractList): jet.Boolean + public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ p0: jet.Collection): jet.Boolean protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0 - public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0: jet.Collection): jet.Boolean + public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0: jet.Collection): jet.Boolean public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String public open override /*1*/ fun size(): jet.Int public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList diff --git a/compiler/testData/loadKotlin/prop/CollectionSize.txt b/compiler/testData/loadKotlin/prop/CollectionSize.txt index 05920c82011..ef6dfc6f774 100644 --- a/compiler/testData/loadKotlin/prop/CollectionSize.txt +++ b/compiler/testData/loadKotlin/prop/CollectionSize.txt @@ -1,3 +1,3 @@ namespace test -internal final val jet.Collection.anotherSize: jet.Int +internal final val jet.Collection.anotherSize: jet.Int diff --git a/compiler/testData/loadKotlin/type/ListOfStar.txt b/compiler/testData/loadKotlin/type/ListOfStar.txt index aea0118211d..5b7317e34c7 100644 --- a/compiler/testData/loadKotlin/type/ListOfStar.txt +++ b/compiler/testData/loadKotlin/type/ListOfStar.txt @@ -1,3 +1,3 @@ namespace test -internal final fun listOfStar(): jet.List +internal final fun listOfStar(): jet.List