From 8134d097e3eb3dfc0e3447126f47fd670ee1e480 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 21 Aug 2014 14:29:26 +0400 Subject: [PATCH] Another portion of test data fixed --- .../AlternativeFieldSignatureData.java | 3 +- .../TypeTransformingVisitor.java | 2 +- .../ClassDoesNotOverrideMethod.txt | 2 +- .../InnerClassReferencesOuterTP.txt | 4 +-- .../kotlinSignature/AllBoundsInWhen.txt | 2 +- .../kotlinSignature/ArrayType.txt | 2 +- .../kotlinSignature/PropertySimpleType.txt | 2 +- .../compiledJava/library/LoadIterable.txt | 4 +-- .../compiledJava/library/LoadIterator.txt | 4 +-- .../loadJava/compiledJava/library/Max.txt | 2 +- .../modality/ModalityOfFakeOverrides.txt | 34 +++++++++---------- .../compiledJava/mutability/LoadIterable.txt | 8 ++--- .../mutability/LoadIterableWithConflict.txt | 4 +-- .../LoadIterableWithNullability.txt | 8 ++--- .../LoadIterableWithPropagation.txt | 18 +++++----- .../compiledJava/notNull/NotNullField.txt | 2 +- .../compiledJava/notNull/NotNullMethod.txt | 2 +- .../notNull/NotNullObjectArray.txt | 2 +- .../compiledJava/notNull/NotNullParameter.txt | 2 +- .../compiledJava/rendering/Rendering.txt | 2 +- .../signaturePropagation/ArraysInSubtypes.txt | 12 +++---- .../MethodTypeParameterErased.txt | 6 ++-- .../signaturePropagation/RawSuperType.txt | 6 ++-- .../ReturnInnerSubclassOfSupersInner.txt | 6 ++-- ...woSuperclassesInconsistentGenericTypes.txt | 12 +++---- .../loadJava/compiledJava/static/Enum.txt | 4 +-- .../static/StaticMembersInEnum.txt | 6 ++-- 27 files changed, 81 insertions(+), 80 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java index a0f07a43f97..7600c46d659 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java @@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.psi.JetProperty; +import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.jet.lang.types.JetType; @@ -40,7 +41,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa @NotNull Project project, boolean isVar ) { - String signature = SignaturesUtil.getKotlinSignature(externalAnnotationResolver, field); + String signature = JavaPackage.getPLATFORM_TYPES() ? null : SignaturesUtil.getKotlinSignature(externalAnnotationResolver, field); if (signature == null) { setAnnotated(false); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index 22284ac1a14..617787389a7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -72,7 +72,7 @@ public class TypeTransformingVisitor extends JetVisitor { @Override public JetType visitNullableType(@NotNull JetNullableType nullableType, Void aVoid) { - if (!originalType.isNullable() && typeUsage != TYPE_ARGUMENT) { + if (!TypeUtils.isNullableType(originalType) && typeUsage != TYPE_ARGUMENT) { throw new AlternativeSignatureMismatchException("Auto type '%s' is not-null, while type in alternative signature is nullable: '%s'", DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType), nullableType.getText()); } diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt index 70f617a4180..22fb85990f9 100644 --- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt +++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt @@ -6,7 +6,7 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date { invisible_fake final override /*1*/ /*fake_override*/ var fastTime: kotlin.Long public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date!): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any + public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any! public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date! kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt index f1219495721..8449349a102 100644 --- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt +++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt @@ -3,7 +3,7 @@ package test public open class InnerClassReferencesOuterTP { public constructor InnerClassReferencesOuterTP() - public open inner class Inner { - public constructor Inner() + public open inner class Inner { + public constructor Inner() } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt index d8f10af5b30..636978b88de 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt @@ -2,5 +2,5 @@ package test public open class AllBoundsInWhen { public constructor AllBoundsInWhen() - public open fun foo(): kotlin.Unit + public open fun foo(): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt index 7c0828582db..b491c661211 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt @@ -2,5 +2,5 @@ package test public open class ArrayType { public constructor ArrayType() - public open fun foo(): kotlin.Array + public open fun foo(): kotlin.Array<(out) kotlin.String!>! } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt index 79fae74031c..4c75cfc9626 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt @@ -2,6 +2,6 @@ package test public open class PropertySimpleType { public constructor PropertySimpleType() - public final var fieldOne: kotlin.String + public final var fieldOne: kotlin.String! public final var fieldTwo: kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt index 8bbe029a6b8..60e4d7a8992 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt @@ -1,6 +1,6 @@ package test public trait LoadIterable { - public abstract fun getIterable(): kotlin.MutableIterable? - public abstract fun setIterable(/*0*/ p0: kotlin.Iterable?): kotlin.Unit + public abstract fun getIterable(): kotlin.(Mutable)Iterable! + public abstract fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt index 46ebe4d178f..a0353e2a5e7 100644 --- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt +++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt @@ -1,6 +1,6 @@ package test public trait LoadIterator { - public abstract fun getIterator(): kotlin.MutableIterator? - public abstract fun setIterator(/*0*/ p0: kotlin.Iterator?): kotlin.Unit + public abstract fun getIterator(): kotlin.(Mutable)Iterator! + public abstract fun setIterator(/*0*/ p0: kotlin.(Mutable)Iterator!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/library/Max.txt b/compiler/testData/loadJava/compiledJava/library/Max.txt index d062eae5f00..5f6467ee76a 100644 --- a/compiler/testData/loadJava/compiledJava/library/Max.txt +++ b/compiler/testData/loadJava/compiledJava/library/Max.txt @@ -2,5 +2,5 @@ package test public open class Max { public constructor Max() - public open fun max(/*0*/ p0: kotlin.Collection?): T? where T : kotlin.Comparable? + public open fun max(/*0*/ p0: (kotlin.MutableCollection..kotlin.Collection?)): T! where T : kotlin.Comparable! } diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt index bfa2d292f29..d0957405265 100644 --- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt +++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt @@ -1,32 +1,32 @@ package test -public open class ModalityOfFakeOverrides : java.util.AbstractList { +public open class ModalityOfFakeOverrides : java.util.AbstractList { public constructor ModalityOfFakeOverrides() protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int - public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: (kotlin.MutableCollection..kotlin.Collection?)): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection): 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*/ 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 - public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator - invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String? + public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator! + public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any!): kotlin.Int + public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.(Mutable)ListIterator! + public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.(Mutable)ListIterator! + invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String! invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): kotlin.String + public open override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): kotlin.String! public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection): kotlin.Boolean protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String + public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String! public open override /*1*/ fun size(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList - public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array - public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ a: kotlin.Array): kotlin.Array + public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.(Mutable)List! + public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>! + public open override /*1*/ /*fake_override*/ fun toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>! } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt index 419ce0e8b5a..2e945fe6593 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt @@ -1,8 +1,8 @@ package test public trait LoadIterable { - org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable? - org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable? - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable?): kotlin.Unit - public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable?): kotlin.Unit + org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable! + org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable! + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable!): kotlin.Unit + public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt index 24508b62f79..025cc9c0b0f 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt @@ -1,6 +1,6 @@ package test public trait LoadIterableWithConflict { - org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable? - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable?): kotlin.Unit + org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable! + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt index 883eae2e90c..e2d3dbf41df 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt @@ -1,8 +1,8 @@ package test public trait LoadIterableWithNullability { - org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable - org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable): kotlin.Unit - public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable): kotlin.Unit + org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable! + org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable! + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable!): kotlin.Unit + public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt index 57a2ac387e5..7523e927545 100644 --- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt +++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt @@ -3,17 +3,17 @@ package test public trait LoadIterableWithPropagation { public trait LoadIterable { - org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable? - org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable? - public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable?): kotlin.Unit - public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable?): kotlin.Unit + org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable! + org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable! + public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable!): kotlin.Unit + public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable!): kotlin.Unit } - public open class LoadIterableImpl : test.LoadIterableWithPropagation.LoadIterable { + public open class LoadIterableImpl : test.LoadIterableWithPropagation.LoadIterable { public constructor LoadIterableImpl() - public open override /*1*/ fun getIterable(): kotlin.MutableIterable? - public open override /*1*/ fun getReadOnlyIterable(): kotlin.Iterable? - public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.MutableIterable?): kotlin.Unit - public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.Iterable?): kotlin.Unit + public open override /*1*/ fun getIterable(): kotlin.(Mutable)Iterable! + public open override /*1*/ fun getReadOnlyIterable(): kotlin.(Mutable)Iterable! + public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable!): kotlin.Unit + public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.(Mutable)Iterable!): kotlin.Unit } } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt index f3c3808526b..007cf0aaf12 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt @@ -2,5 +2,5 @@ package test public open class NotNullField { public constructor NotNullField() - public final var hi: kotlin.String + public final var hi: kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt index d687ebcf605..5e96c225d22 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt @@ -2,5 +2,5 @@ package test public open class NotNullMethod { public constructor NotNullMethod() - public open fun hi(): kotlin.String + public open fun hi(): kotlin.String! } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt index 8c203394955..f68a191bcf8 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt @@ -2,5 +2,5 @@ package test public open class NotNullObjectArray { public constructor NotNullObjectArray() - public open fun hi(): kotlin.Array + public open fun hi(): kotlin.Array<(out) kotlin.Any!>! } diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt index 1b0434830d6..c58ff0f2937 100644 --- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt +++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt @@ -2,5 +2,5 @@ package test public open class NotNullParameter { public constructor NotNullParameter() - public open fun hi(/*0*/ p0: kotlin.String): kotlin.Unit + public open fun hi(/*0*/ p0: kotlin.String!): kotlin.Unit } diff --git a/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt b/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt index 22828fe041b..6dbda99564c 100644 --- a/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt +++ b/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt @@ -38,7 +38,7 @@ public open class Rendering { public abstract fun foo4(/*0*/ p0: kotlin.(Mutable)List!): kotlin.Unit public abstract fun foo5(/*0*/ p0: kotlin.(Mutable)Set!): kotlin.Unit public abstract fun foo6(/*0*/ p0: kotlin.(Mutable)Map!): kotlin.Unit - public abstract fun foo7(/*0*/ p0: (kotlin.MutableMap.MutableEntry..kotlin.Map.Entry?)): kotlin.Unit + public abstract fun foo7(/*0*/ p0: kotlin.(Mutable)Map.(Mutable)Entry!): kotlin.Unit } public/*package*/ trait H_Raw { diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt index 561b37e5e9b..126e113526c 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt @@ -3,14 +3,14 @@ package test public trait ArraysInSubtypes { public trait Sub : test.ArraysInSubtypes.Super { - public abstract override /*1*/ fun array(): kotlin.Array? - public abstract override /*1*/ fun listOfArray(): kotlin.MutableList?>? - public abstract override /*1*/ fun objArray(): kotlin.Array? + public abstract override /*1*/ fun array(): kotlin.Array<(out) kotlin.String!>! + public abstract override /*1*/ fun listOfArray(): (kotlin.MutableList!>..kotlin.List!>?) + public abstract override /*1*/ fun objArray(): kotlin.Array<(out) T!>! } public trait Super { - public abstract fun array(): kotlin.Array? - public abstract fun listOfArray(): kotlin.MutableList?>? - public abstract fun objArray(): kotlin.Array? + public abstract fun array(): kotlin.Array<(out) kotlin.CharSequence!>! + public abstract fun listOfArray(): (kotlin.MutableList!>..kotlin.List!>?) + public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>! } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt index 4cb1df88b88..b3f8fa2a13d 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt @@ -3,11 +3,11 @@ package test public trait MethodTypeParameterErased { public trait Bug { - public abstract fun ?> save(): RET? + public abstract fun !> save(): RET! } - public open class SubBug : test.MethodTypeParameterErased.Bug { + public open class SubBug : test.MethodTypeParameterErased.Bug { public constructor SubBug() - public open fun save(): test.MethodTypeParameterErased.SubBug? + public open fun save(): test.MethodTypeParameterErased.SubBug! } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt index 24e43148d8b..cd714062e2b 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt @@ -5,13 +5,13 @@ public open class RawSuperType { public open inner class Derived : test.RawSuperType.Super { public constructor Derived() - public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit + public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit } public trait Super { - public abstract fun foo(/*0*/ p0: T?): kotlin.Unit + public abstract fun foo(/*0*/ p0: T!): kotlin.Unit } // Static members - public final /*synthesized*/ fun Super(/*0*/ function: (T?) -> kotlin.Unit): test.RawSuperType.Super + public /*synthesized*/ fun Super(/*0*/ function: (T!) -> kotlin.Unit): test.RawSuperType.Super } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt index ddd0d9d04d7..8d3069ac5df 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt @@ -2,12 +2,12 @@ package test public trait ReturnInnerSubclassOfSupersInner { - public open class Sub : test.ReturnInnerSubclassOfSupersInner.Super { + public open class Sub : test.ReturnInnerSubclassOfSupersInner.Super { public constructor Sub() public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner { public/*package*/ constructor Inner() - public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub? + public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub! } } @@ -16,7 +16,7 @@ public trait ReturnInnerSubclassOfSupersInner { public/*package*/ open inner class Inner { public/*package*/ constructor Inner() - public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super? + public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super! } } } diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt index f3178af2629..04d405a2191 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt @@ -1,19 +1,19 @@ package test -public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.MutableList): test.TwoSuperclassesInconsistentGenericTypes +public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.(Mutable)List!): test.TwoSuperclassesInconsistentGenericTypes public trait TwoSuperclassesInconsistentGenericTypes { - public abstract fun foo(): kotlin.MutableList - + public abstract fun foo(): kotlin.(Mutable)List! + public trait Other { - public abstract fun foo(): kotlin.MutableList? + public abstract fun foo(): kotlin.(Mutable)List! } public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other { public constructor Sub() - public open override /*2*/ fun foo(): kotlin.MutableList + public open override /*2*/ fun foo(): kotlin.(Mutable)List! } // Static members - public final /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.MutableList?): test.TwoSuperclassesInconsistentGenericTypes.Other + public /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.(Mutable)List!): test.TwoSuperclassesInconsistentGenericTypes.Other } diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt index c69dadaf040..1bd8cbfc3c7 100644 --- a/compiler/testData/loadJava/compiledJava/static/Enum.txt +++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt @@ -1,6 +1,6 @@ package test -public final enum class Enum : kotlin.Enum { +public final enum class Enum : kotlin.Enum { private constructor Enum() public final override /*1*/ /*fake_override*/ fun name(): kotlin.String public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int @@ -44,7 +44,7 @@ public final enum class Enum : kotlin.Enum { public open inner class Inner { public constructor Inner() public/*package*/ open fun bar(): kotlin.Unit - public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String?): kotlin.Unit + public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String!): kotlin.Unit } public open class Nested { diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt index 7a760dd1c01..811a30bd9bd 100644 --- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt +++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt @@ -1,6 +1,6 @@ package test -public final enum class StaticMembersInEnum : kotlin.Enum { +public final enum class StaticMembersInEnum : kotlin.Enum { private constructor StaticMembersInEnum() public final override /*1*/ /*fake_override*/ fun name(): kotlin.String public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int @@ -18,8 +18,8 @@ public final enum class StaticMembersInEnum : kotlin.Enum