From cfc9d19825be3df9833d8d63358cc1f018635439 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 9 Oct 2015 11:29:53 +0300 Subject: [PATCH] Transform `Collection.isEmpty` and `Map.Entry.key/value` to properties --- compiler/testData/builtin-classes.txt | 36 ++++++++++++------- .../class/ExtendsAbstractListT.txt | 2 +- .../class/ImplementsListString.txt | 2 +- .../ValAndFunOverrideCompatibilityClash.txt | 2 +- .../diagnostics/tests/exposed/typeArgs.txt | 2 +- .../tests/j+k/GenericsInSupertypes.txt | 2 +- .../j+k/collectionOverrides/contains.txt | 10 +++--- .../j+k/collectionOverrides/containsAll.txt | 10 +++--- .../containsAndOverload.txt | 4 +-- .../tests/j+k/finalCollectionSize.txt | 4 +-- .../diagnostics/tests/j+k/specialBridges.txt | 2 +- .../listSuperType.txt | 2 +- .../multipleExactBoundsNullable.txt | 2 +- .../nullabilityWarnings/delegation.txt | 6 ++-- .../platformTypes/supertypeTypeArguments.txt | 4 +-- .../diagnostics/tests/scopes/visibility2.txt | 2 +- .../varnotnull/unnecessaryWithMap.kt | 4 +-- .../diagnostics/tests/subtyping/kt-1457.txt | 2 +- .../customClassMutableCollection.txt | 2 +- .../customClassMutableList.txt | 2 +- .../invalidFqName.txt | 4 +-- .../wrongTypeParametersCount.txt | 2 +- .../return/HalfSubstitutedTypeParameters.txt | 2 +- .../return/SubclassOfCollection.txt | 2 +- .../propagation/return/SubclassOfMapEntry.txt | 4 +-- .../modality/ModalityOfFakeOverrides.txt | 2 +- .../return/HalfSubstitutedTypeParameters.txt | 3 +- .../return/SubclassOfCollection.txt | 3 +- .../propagation/return/SubclassOfMapEntry.kt | 1 + .../propagation/return/SubclassOfMapEntry.txt | 6 ++-- .../modality/ModalityOfFakeOverrides.txt | 3 +- .../platformTypes/notnullTypeArgument.txt | 3 +- .../platformTypes/nullableTypeArgument.txt | 3 +- core/builtins/native/kotlin/Collections.kt | 14 ++++---- 34 files changed, 87 insertions(+), 67 deletions(-) diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt index 4ae5001b6fc..74af28f14b8 100644 --- a/compiler/testData/builtin-classes.txt +++ b/compiler/testData/builtin-classes.txt @@ -272,11 +272,12 @@ public interface Cloneable { } public interface Collection : kotlin.Iterable { + public abstract val isEmpty: kotlin.Boolean + public abstract fun (): kotlin.Boolean public abstract val size: kotlin.Int public abstract fun (): kotlin.Int public abstract operator fun contains(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Boolean public abstract fun containsAll(/*0*/ c: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean - public abstract fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun iterator(): kotlin.Iterator } @@ -769,13 +770,14 @@ public interface Iterator { } public interface List : kotlin.Collection { + public abstract override /*1*/ val isEmpty: kotlin.Boolean + public abstract override /*1*/ fun (): kotlin.Boolean public abstract override /*1*/ val size: kotlin.Int public abstract override /*1*/ fun (): kotlin.Int public abstract override /*1*/ fun contains(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Boolean public abstract override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean public abstract operator fun get(/*0*/ index: kotlin.Int): E public abstract fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public abstract override /*1*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun iterator(): kotlin.Iterator public abstract fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public abstract fun listIterator(): kotlin.ListIterator @@ -929,23 +931,28 @@ public final class LongRange : kotlin.Range, kotlin.Progression { + public abstract val isEmpty: kotlin.Boolean + public abstract fun (): kotlin.Boolean public abstract val size: kotlin.Int public abstract fun (): kotlin.Int public abstract fun containsKey(/*0*/ key: kotlin.Any?): kotlin.Boolean public abstract fun containsValue(/*0*/ value: kotlin.Any?): kotlin.Boolean public abstract fun entrySet(): kotlin.Set> public abstract operator fun get(/*0*/ key: kotlin.Any?): V? - public abstract fun isEmpty(): kotlin.Boolean public abstract fun keySet(): kotlin.Set public abstract fun values(): kotlin.Collection public interface Entry { - public abstract fun getKey(): K - public abstract fun getValue(): V + public abstract val key: K + public abstract fun (): K + public abstract val value: V + public abstract fun (): V } } public interface MutableCollection : kotlin.Collection, kotlin.MutableIterable { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int public abstract fun add(/*0*/ e: E): kotlin.Boolean @@ -953,7 +960,6 @@ public interface MutableCollection : kotlin.Collection, kotlin.Mutab public abstract fun clear(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*2*/ fun iterator(): kotlin.MutableIterator public abstract fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -971,6 +977,8 @@ public interface MutableIterator : kotlin.Iterator { } public interface MutableList : kotlin.List, kotlin.MutableCollection { + public abstract override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Boolean public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Int public abstract override /*1*/ fun add(/*0*/ e: E): kotlin.Boolean @@ -982,7 +990,6 @@ public interface MutableList : kotlin.List, kotlin.MutableCollection public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public abstract override /*1*/ fun listIterator(): kotlin.MutableListIterator @@ -1008,6 +1015,8 @@ public interface MutableListIterator : kotlin.ListIterator, kotlin.M } public interface MutableMap : kotlin.Map { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int public abstract fun clear(): kotlin.Unit @@ -1015,7 +1024,6 @@ public interface MutableMap : kotlin.Map { public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ fun entrySet(): kotlin.MutableSet> public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.Any?): V? - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun keySet(): kotlin.MutableSet public abstract fun put(/*0*/ key: K, /*1*/ value: V): V? public abstract fun putAll(/*0*/ m: kotlin.Map): kotlin.Unit @@ -1023,13 +1031,17 @@ public interface MutableMap : kotlin.Map { public abstract override /*1*/ fun values(): kotlin.MutableCollection public interface MutableEntry : kotlin.Map.Entry { - public abstract override /*1*/ /*fake_override*/ fun getKey(): K - public abstract override /*1*/ /*fake_override*/ fun getValue(): V + public abstract override /*1*/ /*fake_override*/ val key: K + public abstract override /*1*/ /*fake_override*/ fun (): K + public abstract override /*1*/ /*fake_override*/ val value: V + public abstract override /*1*/ /*fake_override*/ fun (): V public abstract fun setValue(/*0*/ value: V): V } } public interface MutableSet : kotlin.Set, kotlin.MutableCollection { + public abstract override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Boolean public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int public abstract override /*2*/ /*fake_override*/ fun (): kotlin.Int public abstract override /*1*/ fun add(/*0*/ e: E): kotlin.Boolean @@ -1037,7 +1049,6 @@ public interface MutableSet : kotlin.Set, kotlin.MutableCollection): kotlin.Boolean - public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*2*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -1104,11 +1115,12 @@ public interface Range> { } public interface Set : kotlin.Collection { + public abstract override /*1*/ val isEmpty: kotlin.Boolean + public abstract override /*1*/ fun (): kotlin.Boolean public abstract override /*1*/ val size: kotlin.Int public abstract override /*1*/ fun (): kotlin.Int public abstract override /*1*/ fun contains(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Boolean public abstract override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean - public abstract override /*1*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun iterator(): kotlin.Iterator } diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt index d0689e9c8ed..7e3beedb5e1 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt @@ -6,6 +6,7 @@ public/*package*/ open class ExtendsAbstractListT { public abstract class Mine : java.util.AbstractList { public constructor Mine() + public open /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final /*fake_override*/ var modCount: kotlin.Int public abstract /*fake_override*/ val size: kotlin.Int public open /*fake_override*/ fun add(/*0*/ T!): kotlin.Boolean @@ -17,7 +18,6 @@ public abstract class Mine : java.util.AbstractList { public open /*fake_override*/ fun containsAll(/*0*/ kotlin.Collection): kotlin.Boolean public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): T! public open /*fake_override*/ fun indexOf(/*0*/ kotlin.Any?): kotlin.Int - public open /*fake_override*/ fun isEmpty(): kotlin.Boolean public open /*fake_override*/ fun iterator(): kotlin.MutableIterator public open /*fake_override*/ fun lastIndexOf(/*0*/ kotlin.Any?): kotlin.Int public open /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt index 38f391d036f..3c457df9fe3 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt @@ -2,6 +2,7 @@ package test public abstract class Mine : java.util.List { public constructor Mine() + public abstract /*fake_override*/ val isEmpty: kotlin.Boolean public abstract /*fake_override*/ val size: kotlin.Int public abstract /*fake_override*/ fun add(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.Unit public abstract /*fake_override*/ fun add(/*0*/ kotlin.String!): kotlin.Boolean @@ -12,7 +13,6 @@ public abstract class Mine : java.util.List { public abstract /*fake_override*/ fun containsAll(/*0*/ kotlin.Collection): kotlin.Boolean public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): kotlin.String! public abstract /*fake_override*/ fun indexOf(/*0*/ kotlin.Any!): kotlin.Int - public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract /*fake_override*/ fun lastIndexOf(/*0*/ kotlin.Any!): kotlin.Int public abstract /*fake_override*/ fun listIterator(): kotlin.(Mutable)ListIterator! diff --git a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt index 33d0e88b70b..c5af0ca50fc 100644 --- a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt +++ b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt @@ -21,6 +21,7 @@ public final class Barr : Bar { public final class Foo1 : java.util.ArrayList { public constructor Foo1() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*1*/ /*fake_override*/ val size: kotlin.Int @@ -42,7 +43,6 @@ public final class Foo1 : java.util.ArrayList { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/exposed/typeArgs.txt b/compiler/testData/diagnostics/tests/exposed/typeArgs.txt index 7d178c6fb8a..066e604a0b0 100644 --- a/compiler/testData/diagnostics/tests/exposed/typeArgs.txt +++ b/compiler/testData/diagnostics/tests/exposed/typeArgs.txt @@ -7,6 +7,7 @@ public interface Generic { } public interface His : kotlin.List { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: My): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -14,7 +15,6 @@ public interface His : kotlin.List { public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): My public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator diff --git a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt index 0f31b86ec05..a0a4c6933f2 100644 --- a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt +++ b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt @@ -3,6 +3,7 @@ package public abstract class AL : java.util.ArrayList { public constructor AL() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*1*/ /*fake_override*/ val size: kotlin.Int @@ -24,7 +25,6 @@ public abstract class AL : java.util.ArrayList { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt index 5b1e03ea78a..d2eedb4cb33 100644 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt +++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt @@ -4,6 +4,7 @@ public fun foo(/*0*/ a: A, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA public abstract class A : kotlin.MutableCollection { public constructor A() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -12,7 +13,6 @@ public abstract class A : kotlin.MutableCollection { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -22,6 +22,7 @@ public abstract class A : kotlin.MutableCollection { public abstract class B : kotlin.MutableCollection { public constructor B() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -30,7 +31,6 @@ public abstract class B : kotlin.MutableCollection { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -39,6 +39,7 @@ public abstract class B : kotlin.MutableCollection { } public interface IC : kotlin.MutableCollection { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -47,7 +48,6 @@ public interface IC : kotlin.MutableCollection { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -57,6 +57,7 @@ public interface IC : kotlin.MutableCollection { public abstract class KA : java.util.AbstractList { public constructor KA() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean @@ -70,7 +71,6 @@ public abstract class KA : java.util.AbstractList { public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator @@ -91,6 +91,7 @@ public abstract class KA : java.util.AbstractList { public abstract class KB : java.util.AbstractList, IC { public constructor KB() + public open override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit @@ -104,7 +105,6 @@ public abstract class KB : java.util.AbstractList, IC { public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String! public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt index 8ac3164122a..d5bf8bafc6d 100644 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt +++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt @@ -4,6 +4,7 @@ public fun foo(/*0*/ a: A, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA public abstract class A : kotlin.MutableCollection { public constructor A() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -12,7 +13,6 @@ public abstract class A : kotlin.MutableCollection { public open override /*1*/ /*synthesized*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -22,6 +22,7 @@ public abstract class A : kotlin.MutableCollection { public abstract class B : kotlin.MutableCollection { public constructor B() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -30,7 +31,6 @@ public abstract class B : kotlin.MutableCollection { public open override /*1*/ /*synthesized*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -39,6 +39,7 @@ public abstract class B : kotlin.MutableCollection { } public interface IC : kotlin.MutableCollection { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -47,7 +48,6 @@ public interface IC : kotlin.MutableCollection { public abstract override /*1*/ /*synthesized*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -57,6 +57,7 @@ public interface IC : kotlin.MutableCollection { public abstract class KA : java.util.AbstractList { public constructor KA() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean @@ -70,7 +71,6 @@ public abstract class KA : java.util.AbstractList { public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator @@ -91,6 +91,7 @@ public abstract class KA : java.util.AbstractList { public abstract class KB : java.util.AbstractList, IC { public constructor KB() + public open override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit @@ -104,7 +105,6 @@ public abstract class KB : java.util.AbstractList, IC { public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String! public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt index d4e6d8d318a..d29e0ee8e2b 100644 --- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt +++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt @@ -4,6 +4,7 @@ public fun foo(/*0*/ a: A, /*1*/ ka: KA): kotlin.Unit public abstract class A : kotlin.MutableCollection { public constructor A() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -13,7 +14,6 @@ public abstract class A : kotlin.MutableCollection { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -23,6 +23,7 @@ public abstract class A : kotlin.MutableCollection { public abstract class KA : A { public constructor KA() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -31,7 +32,6 @@ public abstract class KA : A { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean diff --git a/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt b/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt index 0fcb2db0e1c..9fdb45371b5 100644 --- a/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt +++ b/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt @@ -3,6 +3,7 @@ package public abstract class A : java.util.ArrayList { public constructor A() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public final override /*1*/ val size: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int @@ -24,7 +25,6 @@ public abstract class A : java.util.ArrayList { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator @@ -57,6 +57,7 @@ public abstract class A : java.util.ArrayList { public final class B : A { public constructor B() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public open override /*1*/ val size: kotlin.Int = 1 invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int @@ -78,7 +79,6 @@ public final class B : A { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/j+k/specialBridges.txt b/compiler/testData/diagnostics/tests/j+k/specialBridges.txt index 997022f57f1..dca1025fa69 100644 --- a/compiler/testData/diagnostics/tests/j+k/specialBridges.txt +++ b/compiler/testData/diagnostics/tests/j+k/specialBridges.txt @@ -3,6 +3,7 @@ package public final class B2 : java.util.ArrayList, I2 { public constructor B2() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*2*/ /*fake_override*/ val size: kotlin.Int @@ -24,7 +25,6 @@ public final class B2 : java.util.ArrayList, I2 { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt index 296c6e7dc5a..95d780502aa 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt @@ -12,6 +12,7 @@ public open class A { public abstract class B : kotlin.MutableList { public constructor B() + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean @@ -24,7 +25,6 @@ public abstract class B : kotlin.MutableList { public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt index 8da60e8b3a4..6e23798d13e 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt @@ -4,6 +4,7 @@ public fun foo(/*0*/ delegateResolver: ResolverForProject : java.util.AbstractMap { public/*package*/ constructor MyMap() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.(Mutable)Set! public open override /*1*/ /*fake_override*/ val size: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.(Mutable)Collection! @@ -15,7 +16,6 @@ public/*package*/ open class MyMap public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.Any?): V? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun keySet(): kotlin.MutableSet public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ m: kotlin.Map): kotlin.Unit diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt index 57cb4958b5b..59e2e284c68 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt @@ -2,6 +2,7 @@ package public final class A : kotlin.List { public constructor A() + public open override /*1*/ /*delegation*/ val isEmpty: kotlin.Boolean public open override /*1*/ /*delegation*/ val size: kotlin.Int public open override /*1*/ /*delegation*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -9,7 +10,6 @@ public final class A : kotlin.List { public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator @@ -20,6 +20,7 @@ public final class A : kotlin.List { public final class B : kotlin.List { public constructor B() + public open override /*1*/ /*delegation*/ val isEmpty: kotlin.Boolean public open override /*1*/ /*delegation*/ val size: kotlin.Int public open override /*1*/ /*delegation*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -27,7 +28,6 @@ public final class B : kotlin.List { public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator @@ -38,6 +38,7 @@ public final class B : kotlin.List { public final class C : kotlin.List { public constructor C() + public open override /*1*/ /*delegation*/ val isEmpty: kotlin.Boolean public open override /*1*/ /*delegation*/ val size: kotlin.Int public open override /*1*/ /*delegation*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -45,7 +46,6 @@ public final class C : kotlin.List { public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt index d4291c92159..555af905e8f 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt @@ -1,6 +1,7 @@ package public interface ExtMap : kotlin.Map { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: kotlin.Any?): kotlin.Boolean @@ -8,7 +9,6 @@ public interface ExtMap : kotlin.Map { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: kotlin.Any?): V? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun keySet(): kotlin.Set public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public abstract override /*1*/ /*fake_override*/ fun values(): kotlin.Collection @@ -18,6 +18,7 @@ public final class HashMapEx : java.util.HashMap, ExtMap public constructor HashMapEx() invisible_fake final override /*1*/ /*fake_override*/ var entrySet: kotlin.(Mutable)Set!>! invisible_fake final override /*1*/ /*fake_override*/ val hashSeed: kotlin.Int + public open override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.(Mutable)Set! invisible_fake final override /*1*/ /*fake_override*/ val loadFactor: kotlin.Float invisible_fake final override /*1*/ /*fake_override*/ var modCount: kotlin.Int @@ -44,7 +45,6 @@ public final class HashMapEx : java.util.HashMap, ExtMap invisible_fake final override /*1*/ /*fake_override*/ fun hash(/*0*/ p0: kotlin.Any!): kotlin.Int public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int invisible_fake open override /*1*/ /*fake_override*/ fun init(): kotlin.Unit - public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun keySet(): kotlin.MutableSet invisible_fake open override /*1*/ /*fake_override*/ fun loadFactor(): kotlin.Float invisible_fake open override /*1*/ /*fake_override*/ fun newEntryIterator(): kotlin.(Mutable)Iterator!>! diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.txt b/compiler/testData/diagnostics/tests/scopes/visibility2.txt index 3b07ec52be3..39a5f508655 100644 --- a/compiler/testData/diagnostics/tests/scopes/visibility2.txt +++ b/compiler/testData/diagnostics/tests/scopes/visibility2.txt @@ -34,6 +34,7 @@ package b { public final class NewClass : java.util.ArrayList { public constructor NewClass() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*1*/ /*fake_override*/ val size: kotlin.Int @@ -55,7 +56,6 @@ package b { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt index 531693040ff..f09b93bde05 100644 --- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt +++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt @@ -2,9 +2,9 @@ fun create(): Map = null!! operator fun Map.iterator(): Iterator> = null!! -operator fun Map.Entry.component1() = getKey() +operator fun Map.Entry.component1() = key -operator fun Map.Entry.component2() = getValue() +operator fun Map.Entry.component2() = value class MyClass { private var m: Map? = null diff --git a/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt b/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt index 177aaad0667..7e259b221fb 100644 --- a/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt +++ b/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt @@ -5,6 +5,7 @@ public fun test(): kotlin.Unit public final class MyListOfPairs : java.util.ArrayList> { public constructor MyListOfPairs() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*1*/ /*fake_override*/ val size: kotlin.Int @@ -26,7 +27,6 @@ public final class MyListOfPairs : java.util.ArrayList> { invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator> public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator> diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt index 9c989387fae..c6c4feb3499 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt @@ -5,6 +5,7 @@ public fun foo(): kotlin.Unit @kotlin.jvm.PurelyImplements(value = "kotlin.MutableCollection") public/*package*/ open class A : java.util.AbstractCollection, kotlin.MutableCollection { public/*package*/ constructor A() + public open override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean public open override /*2*/ val size: kotlin.Int public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean @@ -13,7 +14,6 @@ public fun foo(): kotlin.Unit public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean @java.lang.Override() public open override /*2*/ fun iterator(): kotlin.MutableIterator public open override /*2*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt index f4fd781f3db..67aca14eaec 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt @@ -5,6 +5,7 @@ public fun foo(): kotlin.Unit @kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A : java.util.AbstractList, kotlin.MutableList { public/*package*/ constructor A() + public open override /*2*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public open override /*2*/ val size: kotlin.Int public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T): kotlin.Boolean @@ -18,7 +19,6 @@ public fun foo(): kotlin.Unit @java.lang.Override() public open override /*2*/ fun get(/*0*/ index: kotlin.Int): T public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt index d13ffb77cf1..cc0cc490f21 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt @@ -5,6 +5,7 @@ public val y: B @kotlin.jvm.PurelyImplements(value = "") public open class A : java.util.AbstractList { public constructor A() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public open override /*1*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean @@ -18,7 +19,6 @@ public val y: B @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator @@ -44,6 +44,7 @@ public val y: B @kotlin.jvm.PurelyImplements(value = "[INVALID]") public open class B : java.util.AbstractList { public constructor B() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean @@ -57,7 +58,6 @@ public val y: B public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt index fee19e9a763..b3d4b7632ff 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt @@ -5,6 +5,7 @@ public fun foo(): kotlin.Unit @kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A : java.util.AbstractList { public/*package*/ constructor A() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public open override /*1*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean @@ -18,7 +19,6 @@ public fun foo(): kotlin.Unit @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt index 84eb869ccde..2bd4ff8634b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt @@ -13,6 +13,7 @@ public interface HalfSubstitutedTypeParameters { } public interface TrickyList : kotlin.MutableList { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int 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 @@ -23,7 +24,6 @@ public interface HalfSubstitutedTypeParameters { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E! public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt index 91cd8fe4842..cab24f706a7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt @@ -1,13 +1,13 @@ package test public interface SubclassOfCollection : kotlin.MutableCollection { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int 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): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt index 6778a7b7507..6f65cdfddcf 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt @@ -1,7 +1,7 @@ package test public interface SubclassOfMapEntry : kotlin.MutableMap.MutableEntry { - public abstract override /*1*/ /*fake_override*/ fun getKey(): K! - public abstract override /*1*/ /*fake_override*/ fun getValue(): V! + public abstract override /*1*/ /*fake_override*/ val key: K! + public abstract override /*1*/ /*fake_override*/ val value: V! public abstract override /*1*/ fun setValue(/*0*/ value: V!): V! } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt index ec21a6189ec..a34e33d4c8c 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt @@ -2,6 +2,7 @@ package test public open class ModalityOfFakeOverrides : java.util.AbstractList { public constructor ModalityOfFakeOverrides() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public open override /*1*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit @@ -13,7 +14,6 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList): kotlin.Boolean @org.jetbrains.annotations.NotNull() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt index 34022aa2023..118714890d7 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt @@ -13,6 +13,8 @@ public interface HalfSubstitutedTypeParameters { } public interface TrickyList : kotlin.MutableList { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean @@ -24,7 +26,6 @@ public interface HalfSubstitutedTypeParameters { public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt index 9fe11baef34..bedf5270c9b 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt @@ -1,6 +1,8 @@ package test public interface SubclassOfCollection : kotlin.MutableCollection { + public abstract override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public abstract override /*1*/ /*fake_override*/ fun (): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean @@ -8,7 +10,6 @@ public interface SubclassOfCollection : kotlin.MutableCollection { public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract override /*1*/ fun iterator(): kotlin.MutableIterator public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt index 25bf767dac3..43a54a5097a 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt @@ -1,5 +1,6 @@ package test public interface SubclassOfMapEntry: MutableMap.MutableEntry { + override val value: V override fun setValue(value: V) : V } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt index 2e5890d2c4e..44564cbcea8 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt @@ -1,7 +1,9 @@ package test public interface SubclassOfMapEntry : kotlin.MutableMap.MutableEntry { - public abstract override /*1*/ /*fake_override*/ fun getKey(): K - public abstract override /*1*/ /*fake_override*/ fun getValue(): V + public abstract override /*1*/ /*fake_override*/ val key: K + public abstract override /*1*/ /*fake_override*/ fun (): K + public abstract override /*1*/ val value: V + public abstract override /*1*/ fun (): V public abstract override /*1*/ fun setValue(/*0*/ value: V): V } diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt index 59d0a0ab313..43a4e92b8bf 100644 --- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt @@ -2,6 +2,8 @@ package test public open class ModalityOfFakeOverrides : java.util.AbstractList { /*primary*/ public constructor ModalityOfFakeOverrides() + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun (): kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int public open override /*1*/ val size: kotlin.Int public open override /*1*/ fun (): kotlin.Int @@ -14,7 +16,6 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList): kotlin.Boolean public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt index af9d7269d0d..3d87b4ffb3b 100644 --- a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt @@ -3,6 +3,8 @@ package test public final class C : java.util.ArrayList { /*primary*/ public constructor C() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun (): kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*1*/ /*fake_override*/ val size: kotlin.Int @@ -23,7 +25,6 @@ public final class C : java.util.ArrayList { public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt index 77173476fee..483ea41fc98 100644 --- a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt +++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt @@ -3,6 +3,8 @@ package test public final class C : java.util.ArrayList { /*primary*/ public constructor C() invisible_fake final override /*1*/ /*fake_override*/ var elementData: kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ val isEmpty: kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun (): kotlin.Boolean protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int public open override /*1*/ /*fake_override*/ val size: kotlin.Int @@ -23,7 +25,6 @@ public final class C : java.util.ArrayList { public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String? invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int - public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator diff --git a/core/builtins/native/kotlin/Collections.kt b/core/builtins/native/kotlin/Collections.kt index 83ce32c20db..b6fb655c4e3 100644 --- a/core/builtins/native/kotlin/Collections.kt +++ b/core/builtins/native/kotlin/Collections.kt @@ -54,7 +54,7 @@ public interface Collection : Iterable { /** * Returns `true` if the collection is empty (contains no elements), `false` otherwise. */ - public fun isEmpty(): Boolean + public val isEmpty: Boolean /** * Checks if the specified element is contained in this collection. @@ -129,7 +129,7 @@ public interface MutableCollection : Collection, MutableIterable { public interface List : Collection { // Query Operations override val size: Int - override fun isEmpty(): Boolean + override val isEmpty: Boolean override fun contains(o: @UnsafeVariance E): Boolean override fun iterator(): Iterator @@ -233,7 +233,7 @@ public interface MutableList : List, MutableCollection { public interface Set : Collection { // Query Operations override val size: Int - override fun isEmpty(): Boolean + override val isEmpty: Boolean override fun contains(o: @UnsafeVariance E): Boolean override fun iterator(): Iterator @@ -279,7 +279,7 @@ public interface Map { /** * Returns `true` if the map is empty (contains no elements), `false` otherwise. */ - public fun isEmpty(): Boolean + public val isEmpty: Boolean /** * Returns `true` if the map contains the specified [key]. @@ -319,12 +319,12 @@ public interface Map { /** * Returns the key of this key/value pair. */ - public fun getKey(): K + public val key: K /** * Returns the value of this key/value pair. */ - public fun getValue(): V + public val value: V } } @@ -375,6 +375,6 @@ public interface MutableMap : Map { * * @return the previous value corresponding to the key. */ - public fun setValue(value: V): V + public fun setValue(value: V): V } } -- GitLab