From c3ac2e44a0fb7cc82808b256f82000d4d227d26d Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Thu, 11 May 2023 14:39:43 +0200 Subject: [PATCH] Adjust test data for enabling ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated ^KT-55388 Fixed --- .../java8/kotlin-collections.txt | 4 +- .../class/ImplementsMapPP.txt | 4 +- .../java8Tests/checkerFramework.txt | 2 +- .../java8Tests/eclipse.txt | 2 +- .../NullnessUnspecifiedTypeParameter.fir.kt | 36 ------------ .../NullnessUnspecifiedTypeParameter.kt | 9 ++- .../jspecify/strictMode/SelfType.fir.kt | 56 ------------------ .../jspecify/strictMode/SelfType.kt | 7 +-- .../jspecify/strictMode/SelfType.txt | 4 +- .../strictMode/TypeParameterBounds.fir.kt | 46 --------------- .../strictMode/TypeParameterBounds.kt | 4 +- .../java8Tests/jspecify/warnMode/SelfType.kt | 6 +- .../jspecify/warnMode/TypeParameterBounds.kt | 16 ++--- .../NullnessUnspecifiedTypeParameter.fir.kt | 38 ------------ .../NullnessUnspecifiedTypeParameter.kt | 7 ++- .../jspecifyOld/strictMode/SelfType.fir.kt | 58 ------------------- .../jspecifyOld/strictMode/SelfType.kt | 5 +- .../jspecifyOld/strictMode/SelfType.txt | 4 +- .../strictMode/TypeParameterBounds.fir.kt | 47 --------------- .../strictMode/TypeParameterBounds.kt | 3 +- .../jspecifyOld/warnMode/SelfType.kt | 4 +- .../warnMode/TypeParameterBounds.kt | 8 +-- .../java8Tests/jsr305/typeArguments.txt | 12 ++-- .../java8Tests/misc/kt48261.txt | 38 ++++++------ .../misc/methodWithTypeParameter.txt | 10 ++-- .../tests/androidSdk.txt | 2 +- .../tests/android_support.txt | 2 +- .../tests/androidx.txt | 2 +- .../foreignAnnotationsTests/tests/aosp.txt | 2 +- .../foreignAnnotationsTests/tests/eclipse.txt | 2 +- .../tests/multiple.txt | 4 +- .../foreignAnnotationsTests/tests/rxjava.txt | 2 +- .../tests/rxjava3Errors.txt | 2 +- .../tests/functionLiterals/kt11733_1.txt | 2 +- .../tests/inference/capturedTypes/kt46727.txt | 2 +- .../capturedTypes/kt46727Warnings.txt | 2 +- ...umentsNullability-NotNull-SpecialTypes.txt | 4 +- ...ArgumentsNullability-NotNull-UserTypes.txt | 4 +- .../tests/j+k/integerNotNullable.txt | 2 +- .../notnullTypesFromJavaWithSmartcast.txt | 2 +- .../enhancementFromAnnotation.txt | 4 +- .../methodTypeParameter.txt | 2 +- .../noInheritanceReturnType.txt | 2 +- .../noInheritanceValueParameter.txt | 2 +- .../notNullTypeParameter/onTypeProjection.txt | 2 +- .../substitutionInSuperType.txt | 2 +- .../nullabilityWarnings/elvis.txt | 2 +- .../rawTypes/typeEnhancement.txt | 2 +- .../saveAnnotationAfterSubstitution.txt | 2 +- .../targetedBuiltIns/mutableMapRemove.txt | 4 +- .../typeParameters/inProjectedDnnParameter.kt | 2 +- .../inProjectedDnnParameter.txt | 2 +- .../notNullAnnotation.kt | 2 +- .../notNullAnnotation.txt | 2 +- .../java/concurrentHashMapContainsError.txt | 4 +- .../firProblems/AbstractMutableMap.ir.txt | 4 +- .../definitelyNonNullWithJava.fir.ir.txt | 27 --------- .../definitelyNonNullWithJava.fir.kt.txt | 6 -- .../types/definitelyNonNullWithJava.ir.txt | 2 +- .../irText/types/definitelyNonNullWithJava.kt | 3 +- .../propagation/return/TypeParamOfClass.txt | 4 +- .../return/TypeParamOfClassSubstituted.txt | 2 +- .../propagation/return/TypeParamOfFun.txt | 4 +- .../loadJava8/compiledJava/MapRemove.txt | 4 +- .../typeParameterAnnotations/Basic.txt | 2 +- .../BaseClassTypeArguments.txt | 8 +-- .../compiledJava/typeUseAnnotations/Basic.txt | 2 +- .../Basic_DisabledImprovements.txt | 2 +- .../ClassTypeParameterBounds.txt | 8 +-- .../MethodTypeParameterBounds.txt | 8 +-- .../loadJava8/sourceJava/MapRemove.txt | 4 +- .../typeParameterAnnotations/Basic.txt | 2 +- .../BaseClassTypeArguments.txt | 8 +-- .../Basic_DisabledImprovements.txt | 4 +- .../ClassTypeParameterBounds.txt | 8 +-- .../MethodTypeParameterBounds.txt | 8 +-- .../map/mapComputeIfPresent.txt | 14 ++--- .../enhancedSignatures/map/mapMerge.txt | 22 +++---- .../optional/optionalEmpty.txt | 4 +- .../optional/optionalGet.txt | 4 +- .../optional/optionalIfPresent.txt | 4 +- .../optional/optionalOf.txt | 8 +-- 82 files changed, 184 insertions(+), 494 deletions(-) delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.fir.kt delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.fir.kt delete mode 100644 compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.fir.kt delete mode 100644 compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.ir.txt delete mode 100644 compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.kt.txt diff --git a/compiler/testData/builtin-classes/java8/kotlin-collections.txt b/compiler/testData/builtin-classes/java8/kotlin-collections.txt index a4347fb8c75..7a944648199 100644 --- a/compiler/testData/builtin-classes/java8/kotlin-collections.txt +++ b/compiler/testData/builtin-classes/java8/kotlin-collections.txt @@ -224,14 +224,14 @@ public interface MutableMap : kotlin.collections.Map { public abstract fun clear(): kotlin.Unit public open fun compute(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? public open fun computeIfAbsent(/*0*/ p0: K, /*1*/ p1: java.util.function.Function): V - public open fun computeIfPresent(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? + public open fun computeIfPresent(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V? @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K, /*1*/ defaultValue: V): V public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open fun merge(/*0*/ p0: K, /*1*/ p1: V, /*2*/ p2: java.util.function.BiFunction): V? + public open fun merge(/*0*/ p0: K, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public abstract fun put(/*0*/ key: K, /*1*/ value: V): V? public abstract fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open fun putIfAbsent(/*0*/ p0: K, /*1*/ p1: V): V? diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt index 7b8d42c9e1e..d7a10ccd936 100644 --- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt +++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt @@ -9,7 +9,7 @@ public abstract class Mine : java.util.Map { public abstract /*fake_override*/ fun clear(): kotlin.Unit public open /*fake_override*/ fun compute(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? public open /*fake_override*/ fun computeIfAbsent(/*0*/ P2, /*1*/ java.util.function.Function): P1 - public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? + public open /*fake_override*/ fun computeIfPresent(/*0*/ P2, /*1*/ java.util.function.BiFunction): P1? public abstract /*fake_override*/ fun containsKey(/*0*/ kotlin.Any!): kotlin.Boolean public abstract /*fake_override*/ fun containsValue(/*0*/ kotlin.Any!): kotlin.Boolean public abstract /*fake_override*/ fun entrySet(): kotlin.collections.(Mutable)Set!>! @@ -18,7 +18,7 @@ public abstract class Mine : java.util.Map { public open /*fake_override*/ fun getOrDefault(/*0*/ kotlin.Any!, /*1*/ P1!): P1! public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean public abstract /*fake_override*/ fun keySet(): kotlin.collections.(Mutable)Set! - public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1, /*2*/ java.util.function.BiFunction): P1? + public open /*fake_override*/ fun merge(/*0*/ P2, /*1*/ P1 & Any, /*2*/ java.util.function.BiFunction): P1? public abstract /*fake_override*/ fun put(/*0*/ P2!, /*1*/ P1!): P1! public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.collections.MutableMap..kotlin.collections.Map?)): kotlin.Unit public open /*fake_override*/ fun putIfAbsent(/*0*/ P2, /*1*/ P1): P1? diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt index 57461773af5..4bb1ce8d937 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @org.checkerframework.checker.nullness.qual.Nullable public final var field: @org.checkerframework.checker.nullness.qual.Nullable kotlin.String? @org.checkerframework.checker.nullness.qual.NonNull public open fun bar(): @org.checkerframework.checker.nullness.qual.NonNull kotlin.String - @org.checkerframework.checker.nullness.qual.Nullable public open fun baz(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull T): @org.checkerframework.checker.nullness.qual.Nullable T? + @org.checkerframework.checker.nullness.qual.Nullable public open fun baz(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull T & Any): @org.checkerframework.checker.nullness.qual.Nullable T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.checkerframework.checker.nullness.qual.Nullable public open fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull kotlin.String, /*1*/ @org.checkerframework.checker.nullness.qual.Nullable y: @org.checkerframework.checker.nullness.qual.Nullable kotlin.CharSequence?): @org.checkerframework.checker.nullness.qual.Nullable kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt index 1e69d6273a6..b9f6a08e7c2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @org.eclipse.jdt.annotation.Nullable public final var field: @org.eclipse.jdt.annotation.Nullable kotlin.String? @org.eclipse.jdt.annotation.NonNull public open fun bar(): @org.eclipse.jdt.annotation.NonNull kotlin.String - @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: @org.eclipse.jdt.annotation.NonNull T): @org.eclipse.jdt.annotation.Nullable T? + @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: @org.eclipse.jdt.annotation.NonNull T & Any): @org.eclipse.jdt.annotation.Nullable T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.eclipse.jdt.annotation.Nullable public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull x: @org.eclipse.jdt.annotation.NonNull kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable y: @org.eclipse.jdt.annotation.Nullable kotlin.CharSequence?): @org.eclipse.jdt.annotation.Nullable kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt deleted file mode 100644 index 2a1051d584c..00000000000 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt +++ /dev/null @@ -1,36 +0,0 @@ -// JSPECIFY_STATE: strict - -// FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.annotations.*; - -@NullMarked -public class NullnessUnspecifiedTypeParameter { - public void foo(T t) {} - - public void bar(Test s, T t) {} // t should not become not nullable -} - -// FILE: Test.java -public class Test {} - -// FILE: main.kt -// jspecify_nullness_mismatch -fun main(a1: NullnessUnspecifiedTypeParameter, a2: NullnessUnspecifiedTypeParameter<Any?>, x: Test): Unit { - // jspecify_nullness_mismatch - a1.foo(null) - a1.foo(1) - - a2.foo(null) - a2.foo(1) - - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a1.bar(null, null) - // jspecify_nullness_mismatch - a1.bar(x, null) - a1.bar(x, 1) - - // jspecify_nullness_mismatch - a2.bar(null, null) - a2.bar(x, null) - a2.bar(x, 1) -} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt index d4e36edcc88..6ca999cb0cc 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // JSPECIFY_STATE: strict // FILE: NullnessUnspecifiedTypeParameter.java @@ -20,8 +21,7 @@ fun main(a1: NullnessUnspecifiedTypeParameter, a2: NullnessUnspecifiedTypeP a1.foo(null) a1.foo(1) - // jspecify_nullness_mismatch - a2.foo(null) + a2.foo(null) a2.foo(1) // jspecify_nullness_mismatch, jspecify_nullness_mismatch @@ -30,9 +30,8 @@ fun main(a1: NullnessUnspecifiedTypeParameter, a2: NullnessUnspecifiedTypeP a1.bar(x, null) a1.bar(x, 1) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a2.bar(null, null) // jspecify_nullness_mismatch - a2.bar(x, null) + a2.bar(null, null) + a2.bar(x, null) a2.bar(x, 1) } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt deleted file mode 100644 index f7f2821a91b..00000000000 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt +++ /dev/null @@ -1,56 +0,0 @@ -// JSPECIFY_STATE: strict - -// FILE: SelfType.java -import org.jspecify.annotations.*; - -@NullMarked -public class SelfType> { - public void foo(T t) {} -} - -// FILE: B.java -public class B extends SelfType {} - -// FILE: C.java -import org.jspecify.annotations.*; - -@NullMarked -public class C> extends SelfType {} - -// FILE: AK.java -public class AK extends SelfType {} - -// FILE: AKN.java -import org.jspecify.annotations.*; - -public class AKN extends SelfType<@Nullable AK> {} - -// FILE: BK.java -public class BK extends B {} - -// FILE: CK.java -public class CK extends C {} - -// FILE: CKN.java -import org.jspecify.annotations.*; - -public class CKN extends C<@Nullable CK> {} - -// FILE: main.kt -fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { - ak.foo(ak) - // jspecify_nullness_mismatch - ak.foo(null) - - akn.foo(null) - - bk.foo(bk) - // jspecify_nullness_mismatch - bk.foo(null) - - ck.foo(ck) - // jspecify_nullness_mismatch - ck.foo(null) - - ckn.foo(null) -} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt index cb808145302..b616bc3405f 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // JSPECIFY_STATE: strict // FILE: SelfType.java @@ -42,8 +43,7 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { // jspecify_nullness_mismatch ak.foo(null) - // jspecify_nullness_mismatch - akn.foo(null) + akn.foo(null) bk.foo(bk) // jspecify_nullness_mismatch @@ -53,6 +53,5 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { // jspecify_nullness_mismatch ck.foo(null) - // jspecify_nullness_mismatch - ckn.foo(null) + ckn.foo(null) } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt index 8cb321ee419..40a0f198a9e 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt @@ -13,7 +13,7 @@ public open class AK : SelfType { public open class AKN : SelfType<@org.jspecify.annotations.Nullable AK?> { public constructor AKN() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.annotations.Nullable AK): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.annotations.Nullable AK?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -53,7 +53,7 @@ public open class CK : C { public open class CKN : C<@org.jspecify.annotations.Nullable CK?> { public constructor CKN() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.annotations.Nullable CK): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.annotations.Nullable CK?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt deleted file mode 100644 index 5939c0719da..00000000000 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt +++ /dev/null @@ -1,46 +0,0 @@ -// JSPECIFY_STATE: strict - -// FILE: A.java -import org.jspecify.annotations.*; - -@NullMarked -public class A { - public void foo(@NullnessUnspecified T t) {} - public void bar(E e) {} -} - -// FILE: B.java -import org.jspecify.annotations.*; -@NullMarked -public class B { - public void foo(T t) {} - public void bar(E e) {} -} - -// FILE: Test.java -public class Test {} - -// FILE: main.kt -// jspecify_nullness_mismatch, jspecify_nullness_mismatch -fun main(a1: A<Any?>, a2: A, b1: B<Any?>, b2: B, x: T): Unit { - a1.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a1.bar<T?>(null) - a1.bar(x) - - a2.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a2.bar<T?>(null) - a2.bar(x) - - b1.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - b1.bar<T?>(null) - b1.bar(x) - - // jspecify_nullness_mismatch - b2.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - b2.bar<T?>(null) - b2.bar(x) -} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt index 34233bd84a5..1cc399b776d 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // JSPECIFY_STATE: strict // FILE: A.java @@ -33,8 +34,7 @@ fun main(a1: A<Any?>, a2: A, b1: B<< a2.bar<T?>(null) a2.bar(x) - // jspecify_nullness_mismatch - b1.foo(null) + b1.foo(null) // jspecify_nullness_mismatch, jspecify_nullness_mismatch b1.bar<T?>(null) b1.bar(x) diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt index be27c256d37..173160fae75 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt @@ -43,7 +43,8 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { // jspecify_nullness_mismatch ak.foo(null) - akn.foo(null) // the corresponding warning/error is present on the Java side + // jspecify_nullness_mismatch + akn.foo(null) // the corresponding warning/error is present on the Java side bk.foo(bk) // jspecify_nullness_mismatch @@ -53,5 +54,6 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { // jspecify_nullness_mismatch ck.foo(null) - ckn.foo(null) // the corresponding warning/error is present on the Java side + // jspecify_nullness_mismatch + ckn.foo(null) // the corresponding warning/error is present on the Java side } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt index fe856f6a4f1..82471edb6a3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt @@ -23,24 +23,24 @@ public class Test {} // jspecify_nullness_mismatch, jspecify_nullness_mismatch fun main(a1: A<Any?>, a2: A, b1: B<Any?>, b2: B, x: T): Unit { a1.foo(null) - // jspecify_nullness_mismatch - a1.bar<T?>(null) + // jspecify_nullness_mismatch, jspecify_nullness_mismatch + a1.bar<T?>(null) a1.bar(x) a2.foo(null) - // jspecify_nullness_mismatch - a2.bar<T?>(null) + // jspecify_nullness_mismatch, jspecify_nullness_mismatch + a2.bar<T?>(null) a2.bar(x) // jspecify_nullness_mismatch b1.foo(null) - // jspecify_nullness_mismatch - b1.bar<T?>(null) + // jspecify_nullness_mismatch, jspecify_nullness_mismatch + b1.bar<T?>(null) b1.bar(x) // jspecify_nullness_mismatch b2.foo(null) - // jspecify_nullness_mismatch - b2.bar<T?>(null) + // jspecify_nullness_mismatch, jspecify_nullness_mismatch + b2.bar<T?>(null) b2.bar(x) } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.fir.kt deleted file mode 100644 index 991701746e9..00000000000 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.fir.kt +++ /dev/null @@ -1,38 +0,0 @@ -// JSPECIFY_STATE: strict - -// FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; - -@NullMarked -public class NullnessUnspecifiedTypeParameter { - public void foo(T t) {} - - public void bar(Test s, T t) {} // t should not become not nullable -} - -// FILE: Test.java -public class Test {} - -// FILE: main.kt -// jspecify_nullness_mismatch -fun main(a1: NullnessUnspecifiedTypeParameter, a2: NullnessUnspecifiedTypeParameter<Any?>, x: Test): Unit { - // jspecify_nullness_mismatch - a1.foo(null) - a1.foo(1) - - // jspecify_nullness_mismatch - a2.foo(null) - a2.foo(1) - - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a1.bar(null, null) - // jspecify_nullness_mismatch - a1.bar(x, null) - a1.bar(x, 1) - - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a2.bar(null, null) - // jspecify_nullness_mismatch - a2.bar(x, null) - a2.bar(x, 1) -} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.kt index a015835f3be..e871e88978c 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/NullnessUnspecifiedTypeParameter.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // JSPECIFY_STATE: strict // FILE: NullnessUnspecifiedTypeParameter.java @@ -21,7 +22,7 @@ fun main(a1: NullnessUnspecifiedTypeParameter, a2: NullnessUnspecifiedTypeP a1.foo(1) // jspecify_nullness_mismatch - a2.foo(null) + a2.foo(null) a2.foo(1) // jspecify_nullness_mismatch, jspecify_nullness_mismatch @@ -31,8 +32,8 @@ fun main(a1: NullnessUnspecifiedTypeParameter, a2: NullnessUnspecifiedTypeP a1.bar(x, 1) // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a2.bar(null, null) + a2.bar(null, null) // jspecify_nullness_mismatch - a2.bar(x, null) + a2.bar(x, null) a2.bar(x, 1) } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.fir.kt deleted file mode 100644 index 7e4064b0d13..00000000000 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.fir.kt +++ /dev/null @@ -1,58 +0,0 @@ -// JSPECIFY_STATE: strict - -// FILE: SelfType.java -import org.jspecify.nullness.*; - -@NullMarked -public class SelfType> { - public void foo(T t) {} -} - -// FILE: B.java -public class B extends SelfType {} - -// FILE: C.java -import org.jspecify.nullness.*; - -@NullMarked -public class C> extends SelfType {} - -// FILE: AK.java -public class AK extends SelfType {} - -// FILE: AKN.java -import org.jspecify.nullness.*; - -public class AKN extends SelfType<@Nullable AK> {} - -// FILE: BK.java -public class BK extends B {} - -// FILE: CK.java -public class CK extends C {} - -// FILE: CKN.java -import org.jspecify.nullness.*; - -public class CKN extends C<@Nullable CK> {} - -// FILE: main.kt -fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { - ak.foo(ak) - // jspecify_nullness_mismatch - ak.foo(null) - - // jspecify_nullness_mismatch - akn.foo(null) - - bk.foo(bk) - // jspecify_nullness_mismatch - bk.foo(null) - - ck.foo(ck) - // jspecify_nullness_mismatch - ck.foo(null) - - // jspecify_nullness_mismatch - ckn.foo(null) -} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.kt index 98ac27083e7..989034cab85 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // JSPECIFY_STATE: strict // FILE: SelfType.java @@ -43,7 +44,7 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { ak.foo(null) // jspecify_nullness_mismatch - akn.foo(null) + akn.foo(null) bk.foo(bk) // jspecify_nullness_mismatch @@ -54,5 +55,5 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { ck.foo(null) // jspecify_nullness_mismatch - ckn.foo(null) + ckn.foo(null) } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.txt index 876a46667ac..98ad1600a9b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/SelfType.txt @@ -13,7 +13,7 @@ public open class AK : SelfType { public open class AKN : SelfType<@org.jspecify.nullness.Nullable AK?> { public constructor AKN() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.nullness.Nullable AK): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.nullness.Nullable AK?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -53,7 +53,7 @@ public open class CK : C { public open class CKN : C<@org.jspecify.nullness.Nullable CK?> { public constructor CKN() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.nullness.Nullable CK): kotlin.Unit + public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: @org.jspecify.nullness.Nullable CK?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.fir.kt deleted file mode 100644 index 543d753b4e9..00000000000 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.fir.kt +++ /dev/null @@ -1,47 +0,0 @@ -// JSPECIFY_STATE: strict - -// FILE: A.java -import org.jspecify.nullness.*; - -@NullMarked -public class A { - public void foo(@NullnessUnspecified T t) {} - public void bar(E e) {} -} - -// FILE: B.java -import org.jspecify.nullness.*; -@NullMarked -public class B { - public void foo(T t) {} - public void bar(E e) {} -} - -// FILE: Test.java -public class Test {} - -// FILE: main.kt -// jspecify_nullness_mismatch, jspecify_nullness_mismatch -fun main(a1: A<Any?>, a2: A, b1: B<Any?>, b2: B, x: T): Unit { - a1.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a1.bar<T?>(null) - a1.bar(x) - - a2.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - a2.bar<T?>(null) - a2.bar(x) - - // jspecify_nullness_mismatch - b1.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - b1.bar<T?>(null) - b1.bar(x) - - // jspecify_nullness_mismatch - b2.foo(null) - // jspecify_nullness_mismatch, jspecify_nullness_mismatch - b2.bar<T?>(null) - b2.bar(x) -} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.kt index 0453bdfe237..3ac9dfd1f0a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/strictMode/TypeParameterBounds.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // JSPECIFY_STATE: strict // FILE: A.java @@ -34,7 +35,7 @@ fun main(a1: A<Any?>, a2: A, b1: B<< a2.bar(x) // jspecify_nullness_mismatch - b1.foo(null) + b1.foo(null) // jspecify_nullness_mismatch, jspecify_nullness_mismatch b1.bar<T?>(null) b1.bar(x) diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/SelfType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/SelfType.kt index ce78cab1543..b135198bb2b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/SelfType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/SelfType.kt @@ -43,7 +43,7 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { // jspecify_nullness_mismatch ak.foo(null) - akn.foo(null) // the corresponding warning/error is present on the Java side + akn.foo(null) // the corresponding warning/error is present on the Java side bk.foo(bk) // jspecify_nullness_mismatch @@ -53,5 +53,5 @@ fun main(ak: AK, akn: AKN, bk: BK, ck: CK, ckn: CKN): Unit { // jspecify_nullness_mismatch ck.foo(null) - ckn.foo(null) // the corresponding warning/error is present on the Java side + ckn.foo(null) // the corresponding warning/error is present on the Java side } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/TypeParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/TypeParameterBounds.kt index c2aa20fbe18..df145e953c3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/TypeParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecifyOld/warnMode/TypeParameterBounds.kt @@ -24,23 +24,23 @@ public class Test {} fun main(a1: A<Any?>, a2: A, b1: B<Any?>, b2: B, x: T): Unit { a1.foo(null) // jspecify_nullness_mismatch - a1.bar<T?>(null) + a1.bar<T?>(null) a1.bar(x) a2.foo(null) // jspecify_nullness_mismatch - a2.bar<T?>(null) + a2.bar<T?>(null) a2.bar(x) // jspecify_nullness_mismatch b1.foo(null) // jspecify_nullness_mismatch - b1.bar<T?>(null) + b1.bar<T?>(null) b1.bar(x) // jspecify_nullness_mismatch b2.foo(null) // jspecify_nullness_mismatch - b2.bar<T?>(null) + b2.bar<T?>(null) b2.bar(x) } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt index 4f1c92b35ce..3d5e25c91b0 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt @@ -16,10 +16,10 @@ public open class L!, /*1*/ S : kotlin.Any!>() 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 open fun s(): S - public open fun setS(/*0*/ s: S): kotlin.Unit + public open fun s(): S & Any + public open fun setS(/*0*/ s: S & Any): kotlin.Unit public open fun setT(/*0*/ @spr.Nullable t: @spr.Nullable T?): kotlin.Unit - public open fun t(): T + public open fun t(): T & Any public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -62,10 +62,10 @@ package test { public constructor L!, /*1*/ S : kotlin.Any!>() 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 open fun s(): S - public open fun setS(/*0*/ s: S): kotlin.Unit + public open fun s(): S & Any + public open fun setS(/*0*/ s: S & Any): kotlin.Unit public open fun setT(/*0*/ @spr.Nullable t: @spr.Nullable T?): kotlin.Unit - public open fun t(): T + public open fun t(): T & Any public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/kt48261.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/kt48261.txt index 7dfe5b68072..153d0ed36c4 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/kt48261.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/kt48261.txt @@ -32,38 +32,38 @@ public abstract class MyCollection : java.util.AbstractCo invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int } -public abstract class MyList : MyCollection, kotlin.collections.MutableList<@org.jetbrains.annotations.NotNull E> { +public abstract class MyList : MyCollection, kotlin.collections.MutableList<@org.jetbrains.annotations.NotNull E & Any> { public constructor MyList() public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int - public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: E): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: @org.jetbrains.annotations.NotNull E): kotlin.Unit - public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<@org.jetbrains.annotations.NotNull E>): kotlin.Boolean - public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean + public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: E & Any): kotlin.Boolean + public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: @org.jetbrains.annotations.NotNull E & Any): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<@org.jetbrains.annotations.NotNull E & Any>): kotlin.Boolean + public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit @java.lang.Override public open override /*2*/ fun contains(/*0*/ element: E!): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.Consumer!): kotlin.Unit - public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): @org.jetbrains.annotations.NotNull E + public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): @org.jetbrains.annotations.NotNull E & Any public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: @org.jetbrains.annotations.NotNull E): kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: @org.jetbrains.annotations.NotNull E & Any): kotlin.Int public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public abstract override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator - public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: @org.jetbrains.annotations.NotNull E): kotlin.Int - public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<@org.jetbrains.annotations.NotNull E> - public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<@org.jetbrains.annotations.NotNull E> - public open override /*2*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream + public abstract override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator + public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: @org.jetbrains.annotations.NotNull E & Any): kotlin.Int + public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<@org.jetbrains.annotations.NotNull E & Any> + public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<@org.jetbrains.annotations.NotNull E & Any> + public open override /*2*/ /*fake_override*/ fun parallelStream(): java.util.stream.Stream public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: E!): kotlin.Boolean public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): @org.jetbrains.annotations.NotNull E - public open override /*2*/ /*fake_override*/ fun removeIf(/*0*/ p0: java.util.function.Predicate): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.UnaryOperator<@org.jetbrains.annotations.NotNull E>): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): @org.jetbrains.annotations.NotNull E & Any + public open override /*2*/ /*fake_override*/ fun removeIf(/*0*/ p0: java.util.function.Predicate): kotlin.Boolean + public open override /*1*/ /*fake_override*/ fun replaceAll(/*0*/ p0: java.util.function.UnaryOperator<@org.jetbrains.annotations.NotNull E & Any>): kotlin.Unit public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection): kotlin.Boolean - public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: @org.jetbrains.annotations.NotNull E): @org.jetbrains.annotations.NotNull E - public open override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ p0: java.util.Comparator!): kotlin.Unit + public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: @org.jetbrains.annotations.NotNull E & Any): @org.jetbrains.annotations.NotNull E & Any + public open override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ p0: java.util.Comparator!): kotlin.Unit public open override /*2*/ /*fake_override*/ fun spliterator(): java.util.Spliterator - public open override /*2*/ /*fake_override*/ fun stream(): java.util.stream.Stream - public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<@org.jetbrains.annotations.NotNull E> + public open override /*2*/ /*fake_override*/ fun stream(): java.util.stream.Stream + public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<@org.jetbrains.annotations.NotNull E & Any> 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!>! public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt index 0215f1d2f65..9241ed45906 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt @@ -17,18 +17,18 @@ public/*package*/ open class Outer { public/*package*/ open inner class B : Outer.A { public/*package*/ constructor B() - @java.lang.Override @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open override /*1*/ fun bar(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull Y<@org.checkerframework.checker.nullness.qual.NonNull R>): @org.checkerframework.checker.nullness.qual.Nullable X<@org.checkerframework.checker.nullness.qual.Nullable R!>? + @java.lang.Override @org.checkerframework.checker.nullness.qual.Nullable public/*package*/ open override /*1*/ fun bar(/*0*/ @org.checkerframework.checker.nullness.qual.NonNull x: @org.checkerframework.checker.nullness.qual.NonNull Y<@org.checkerframework.checker.nullness.qual.NonNull R & Any>): @org.checkerframework.checker.nullness.qual.Nullable X<@org.checkerframework.checker.nullness.qual.Nullable R!>? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable T1?): @org.checkerframework.checker.nullness.qual.NonNull T2 + @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable T1?): @org.checkerframework.checker.nullness.qual.NonNull T2 & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } public/*package*/ open inner class C : Outer.B { public/*package*/ constructor C() - @java.lang.Override public/*package*/ open override /*1*/ fun bar(/*0*/ x: Y): X? + @java.lang.Override public/*package*/ open override /*1*/ fun bar(/*0*/ x: Y): X? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override public/*package*/ open override /*1*/ fun foo(/*0*/ x: I?): J + @java.lang.Override public/*package*/ open override /*1*/ fun foo(/*0*/ x: I?): J & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -37,7 +37,7 @@ public/*package*/ open class Outer { public/*package*/ constructor D() @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun bar(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable Y<@org.checkerframework.checker.nullness.qual.Nullable F!>!): @org.checkerframework.checker.nullness.qual.NonNull X<@org.checkerframework.checker.nullness.qual.NonNull F!> public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable U?): @org.checkerframework.checker.nullness.qual.NonNull W + @java.lang.Override @org.checkerframework.checker.nullness.qual.NonNull public/*package*/ open override /*1*/ fun foo(/*0*/ @org.checkerframework.checker.nullness.qual.Nullable x: @org.checkerframework.checker.nullness.qual.Nullable U?): @org.checkerframework.checker.nullness.qual.NonNull W & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt index 59b35eb326b..2dca12cc8be 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidSdk.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @android.annotation.Nullable public final var field: kotlin.String? @android.annotation.NonNull public open fun bar(): kotlin.String - @android.annotation.Nullable public open fun baz(/*0*/ @android.annotation.NonNull x: T): T? + @android.annotation.Nullable public open fun baz(/*0*/ @android.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @android.annotation.Nullable public open fun foo(/*0*/ @android.annotation.NonNull x: kotlin.String, /*1*/ @android.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt index 6096deefeec..9d2b8a04a47 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/android_support.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @android.support.annotation.Nullable public final var field: kotlin.String? @android.support.annotation.NonNull public open fun bar(): kotlin.String - @android.support.annotation.Nullable public open fun baz(/*0*/ @android.support.annotation.NonNull x: T): T? + @android.support.annotation.Nullable public open fun baz(/*0*/ @android.support.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @android.support.annotation.Nullable public open fun foo(/*0*/ @android.support.annotation.NonNull x: kotlin.String, /*1*/ @android.support.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt index b08dafcbb41..21b6b24ad33 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/androidx.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @androidx.annotation.Nullable public final var field: kotlin.String? @androidx.annotation.NonNull public open fun bar(): kotlin.String - @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T): T? + @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @androidx.annotation.Nullable public open fun foo(/*0*/ @androidx.annotation.NonNull x: kotlin.String, /*1*/ @androidx.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt index dd00b442627..bdbc6a0ad4e 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/aosp.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @com.android.annotations.Nullable public final var field: kotlin.String? @com.android.annotations.NonNull public open fun bar(): kotlin.String - @com.android.annotations.Nullable public open fun baz(/*0*/ @com.android.annotations.NonNull x: T): T? + @com.android.annotations.Nullable public open fun baz(/*0*/ @com.android.annotations.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @com.android.annotations.Nullable public open fun foo(/*0*/ @com.android.annotations.NonNull x: kotlin.String, /*1*/ @com.android.annotations.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt index 324327d1e0a..8877cc2a74f 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/eclipse.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @org.eclipse.jdt.annotation.Nullable public final var field: kotlin.String? @org.eclipse.jdt.annotation.NonNull public open fun bar(): kotlin.String - @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: T): T? + @org.eclipse.jdt.annotation.Nullable public open fun baz(/*0*/ @org.eclipse.jdt.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.eclipse.jdt.annotation.Nullable public open fun foo(/*0*/ @org.eclipse.jdt.annotation.NonNull x: kotlin.String, /*1*/ @org.eclipse.jdt.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt index 49b6c96e2ad..262dce18ce4 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/multiple.txt @@ -9,7 +9,7 @@ public open class A1 { public constructor A1() @io.reactivex.annotations.Nullable public final var field: kotlin.String? @io.reactivex.annotations.NonNull public open fun bar(): kotlin.String - @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T): T? + @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @io.reactivex.annotations.Nullable public open fun foo(/*0*/ @io.reactivex.annotations.NonNull x: kotlin.String, /*1*/ @io.reactivex.annotations.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -31,7 +31,7 @@ public open class A3 { public constructor A3() @androidx.annotation.Nullable public final var field: kotlin.String? @androidx.annotation.NonNull public open fun bar(): kotlin.String - @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T): T? + @androidx.annotation.Nullable public open fun baz(/*0*/ @androidx.annotation.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @androidx.annotation.Nullable public open fun foo(/*0*/ @androidx.annotation.NonNull x: kotlin.String, /*1*/ @androidx.annotation.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt index 2858461cae3..27dcc3250ed 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @io.reactivex.annotations.Nullable public final var field: kotlin.String? @io.reactivex.annotations.NonNull public open fun bar(): kotlin.String - @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T): T? + @io.reactivex.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.annotations.NonNull x: T & Any): T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @io.reactivex.annotations.Nullable public open fun foo(/*0*/ @io.reactivex.annotations.NonNull x: kotlin.String, /*1*/ @io.reactivex.annotations.Nullable y: kotlin.CharSequence?): kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt index a75787a32bc..8df7d93e2ef 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/tests/rxjava3Errors.txt @@ -6,7 +6,7 @@ public open class A { public constructor A() @io.reactivex.rxjava3.annotations.Nullable public final var field: @io.reactivex.rxjava3.annotations.Nullable kotlin.String? @io.reactivex.rxjava3.annotations.NonNull public open fun bar(): @io.reactivex.rxjava3.annotations.NonNull kotlin.String - @io.reactivex.rxjava3.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.rxjava3.annotations.NonNull x: @io.reactivex.rxjava3.annotations.NonNull T): @io.reactivex.rxjava3.annotations.Nullable T? + @io.reactivex.rxjava3.annotations.Nullable public open fun baz(/*0*/ @io.reactivex.rxjava3.annotations.NonNull x: @io.reactivex.rxjava3.annotations.NonNull T & Any): @io.reactivex.rxjava3.annotations.Nullable T? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @io.reactivex.rxjava3.annotations.Nullable public open fun foo(/*0*/ @io.reactivex.rxjava3.annotations.NonNull x: @io.reactivex.rxjava3.annotations.NonNull kotlin.String, /*1*/ @io.reactivex.rxjava3.annotations.Nullable y: @io.reactivex.rxjava3.annotations.Nullable kotlin.CharSequence?): @io.reactivex.rxjava3.annotations.Nullable kotlin.String? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt index e80958b0045..1f20f2cbe5c 100644 --- a/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt +++ b/compiler/testData/diagnostics/tests/functionLiterals/kt11733_1.txt @@ -6,7 +6,7 @@ public fun process(/*0*/ x: Predicate): kotlin.Unit public interface Predicate { 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 operator fun invoke(/*0*/ @org.jetbrains.annotations.NotNull t: T): kotlin.Boolean + public abstract operator fun invoke(/*0*/ @org.jetbrains.annotations.NotNull t: T & Any): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727.txt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727.txt index ae01fe093f1..b29e1fca3f4 100644 --- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727.txt +++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727.txt @@ -55,7 +55,7 @@ public open class Foo2 { public open class Foo3 { public constructor Foo3() - @org.jetbrains.annotations.NotNull public final var value: T + @org.jetbrains.annotations.NotNull public final var value: T & Any 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727Warnings.txt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727Warnings.txt index ae01fe093f1..b29e1fca3f4 100644 --- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727Warnings.txt +++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt46727Warnings.txt @@ -55,7 +55,7 @@ public open class Foo2 { public open class Foo3 { public constructor Foo3() - @org.jetbrains.annotations.NotNull public final var value: T + @org.jetbrains.annotations.NotNull public final var value: T & Any 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt index 97cb19078c5..47968aa2c18 100644 --- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt +++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.txt @@ -11,9 +11,9 @@ public open class A { public open class X { public constructor X() - public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T): kotlin.Unit + public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T + @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt index 9cfb4bb45b8..e6876d24fcc 100644 --- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt +++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.txt @@ -11,9 +11,9 @@ public open class A { public open class X { public constructor X() - public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T): kotlin.Unit + public/*package*/ open fun barN(/*0*/ @org.jetbrains.annotations.NotNull a: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T + @org.jetbrains.annotations.NotNull public/*package*/ open fun fooN(): T & Any public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/j+k/integerNotNullable.txt b/compiler/testData/diagnostics/tests/j+k/integerNotNullable.txt index 003b0799fdf..69dd2c39cbe 100644 --- a/compiler/testData/diagnostics/tests/j+k/integerNotNullable.txt +++ b/compiler/testData/diagnostics/tests/j+k/integerNotNullable.txt @@ -6,7 +6,7 @@ public open class Box { public constructor Box() 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 open fun put(/*0*/ @org.jetbrains.annotations.NotNull t: T): kotlin.Unit + public open fun put(/*0*/ @org.jetbrains.annotations.NotNull t: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt index 1fbff88cadc..e6d3367d07d 100644 --- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt +++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/notnullTypesFromJavaWithSmartcast.txt @@ -9,6 +9,6 @@ public open class JClass { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - @org.jetbrains.annotations.NotNull public open fun getNotNullT(): T + @org.jetbrains.annotations.NotNull public open fun getNotNullT(): T & Any } diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt index bb881f00323..1030620c02e 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/enhancementFromAnnotation.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T): kotlin.Unit + public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -20,7 +20,7 @@ public open class B { public open class C : B, A { public constructor C() public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*2*/ fun foo(/*0*/ x: F): kotlin.Unit + public open override /*2*/ fun foo(/*0*/ x: F & Any): kotlin.Unit public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt index 3f4cca30294..fdc6ec1fdcb 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.txt @@ -9,7 +9,7 @@ public open class A { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T, /*1*/ y: T!): kotlin.Unit + public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any, /*1*/ y: T!): kotlin.Unit public open fun platformString(): kotlin.String! } diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt index 64edc3f5ee9..93881a16608 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceReturnType.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public open class A { public constructor A() - @org.jetbrains.annotations.NotNull public open fun bar(): T + @org.jetbrains.annotations.NotNull public open fun bar(): T & Any 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt index bd3338f8537..d098bf88355 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/noInheritanceValueParameter.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public open class A { public constructor A() - public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T): kotlin.Unit + public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): kotlin.Unit 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt index 67869d53f25..c81a35c7a67 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/onTypeProjection.txt @@ -4,7 +4,7 @@ public fun test(/*0*/ a: A): kotlin.Unit public open class A { public constructor A() - @org.jetbrains.annotations.NotNull public open fun bar(): T + @org.jetbrains.annotations.NotNull public open fun bar(): T & Any 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt index 563b922256e..6ee176d66d8 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/substitutionInSuperType.txt @@ -4,7 +4,7 @@ public fun test(): kotlin.Unit public open class A { public constructor A() - public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T): kotlin.Unit + public open fun bar(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any): kotlin.Unit 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 open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt index 93dcb4a4670..05e3587c7cc 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/elvis.txt @@ -15,6 +15,6 @@ public open class J { @org.jetbrains.annotations.NotNull public final var staticNN: J public open fun getAny(): T! @org.jetbrains.annotations.Nullable public open fun getNAny(): T? - @org.jetbrains.annotations.NotNull public open fun getNNAny(): T + @org.jetbrains.annotations.NotNull public open fun getNNAny(): T & Any } diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt index 4b45fcf5a01..2e94f101164 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt @@ -6,7 +6,7 @@ public fun main(): kotlin.Unit public/*package*/ open class A { public/*package*/ constructor A() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jetbrains.annotations.NotNull public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.collections.(Mutable)List?): kotlin.collections.(Mutable)List + @org.jetbrains.annotations.NotNull public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any, /*1*/ @org.jetbrains.annotations.Nullable y: kotlin.collections.(Mutable)List?): kotlin.collections.(Mutable)List public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt index dd20ff26b56..8b8b52a4964 100644 --- a/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt +++ b/compiler/testData/diagnostics/tests/platformTypes/typeEnhancement/saveAnnotationAfterSubstitution.txt @@ -2,7 +2,7 @@ package public interface A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T, /*1*/ @org.jetbrains.annotations.Nullable y: T?): kotlin.Unit + public abstract fun foo(/*0*/ @org.jetbrains.annotations.NotNull x: T & Any, /*1*/ @org.jetbrains.annotations.Nullable y: T?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt index 51c970dec72..8130bb5bc63 100644 --- a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt +++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.txt @@ -14,7 +14,7 @@ public final class KotlinMap1 : java.util.AbstractMap { protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any! public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K!, /*1*/ p1: java.util.function.Function): V! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -23,7 +23,7 @@ public final class KotlinMap1 : java.util.AbstractMap { @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): 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 merge(/*0*/ p0: K!, /*1*/ p1: V, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V? diff --git a/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.kt b/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.kt index d3881671339..fbaea439463 100644 --- a/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.kt +++ b/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.kt @@ -21,7 +21,7 @@ class A { } fun checkJavaInv(element: T, action: JavaAction) { - action.execute(element) // type mismatch in K1 and K2 + action.execute(element) // type mismatch in K1 and K2 } fun checkKotlinInv(element: T, action: KotlinAction) { diff --git a/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.txt b/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.txt index 9b21a1b09b4..71f70aacaaf 100644 --- a/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.txt +++ b/compiler/testData/diagnostics/tests/typeParameters/inProjectedDnnParameter.txt @@ -13,7 +13,7 @@ public final class A { public interface JavaAction { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public abstract fun execute(/*0*/ @org.jetbrains.annotations.NotNull t: T): kotlin.Unit + public abstract fun execute(/*0*/ @org.jetbrains.annotations.NotNull t: T & Any): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.kt index cfa77186243..6b7dd9b2aad 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.kt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.kt @@ -22,5 +22,5 @@ interface TypePredicate : (KotlinType) -> Boolean { fun TypePredicate.expectedTypeFor(keys: Iterable): Map = keys.fold(SmartFMap.emptyMap()) { map, key -> - map.plus(key, this) + map.plus(key, this) } diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt index 64bd61bc4f7..54040a2b57c 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/notNullAnnotation.txt @@ -22,7 +22,7 @@ public open class SmartFMap : kotl public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open fun plus(/*0*/ @org.jetbrains.annotations.NotNull key: K, /*1*/ value: V!): SmartFMap! + public open fun plus(/*0*/ @org.jetbrains.annotations.NotNull key: K & Any, /*1*/ value: V!): SmartFMap! public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ key: K!): V? diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.txt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.txt index e27bb523638..b9dc6a73b34 100644 --- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.txt +++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.txt @@ -295,7 +295,7 @@ public open class D : java.util.concurrent.ConcurrentHashMap): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K, /*1*/ p1: java.util.function.Function): V - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0: kotlin.Any!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean @@ -320,7 +320,7 @@ public open class D : java.util.concurrent.ConcurrentHashMap! public open override /*1*/ /*fake_override*/ fun keys(): java.util.Enumeration! public open override /*1*/ /*fake_override*/ fun mappingCount(): kotlin.Long - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K, /*1*/ p1: V, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K, /*1*/ value: V): V? public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K, /*1*/ p1: V): V? diff --git a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt index 74cbd826023..b9eb7e6cf11 100644 --- a/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt +++ b/compiler/testData/ir/irText/firProblems/AbstractMutableMap.ir.txt @@ -76,7 +76,7 @@ FILE fqName: fileName:/AbstractMutableMap.kt VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] java.util.function.Function.MyMap, out @[EnhancedNullability] V of .MyMap> FUN FAKE_OVERRIDE name:computeIfPresent visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, p0:@[EnhancedNullability] K of .MyMap, p1:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in @[EnhancedNullability] V of .MyMap, out @[EnhancedNullability] V of .MyMap?>) returnType:@[EnhancedNullability] V of .MyMap? [fake_override] overridden: - public open fun computeIfPresent (p0: @[EnhancedNullability] K of kotlin.collections.AbstractMutableMap, p1: @[EnhancedNullability] java.util.function.BiFunction): @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap? [fake_override] declared in kotlin.collections.AbstractMutableMap + public open fun computeIfPresent (p0: @[EnhancedNullability] K of kotlin.collections.AbstractMutableMap, p1: @[EnhancedNullability] java.util.function.BiFunction): @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap? [fake_override] declared in kotlin.collections.AbstractMutableMap $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] K of .MyMap VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in @[EnhancedNullability] V of .MyMap, out @[EnhancedNullability] V of .MyMap?> @@ -124,7 +124,7 @@ FILE fqName: fileName:/AbstractMutableMap.kt $this: VALUE_PARAMETER name: type:kotlin.collections.Map.MyMap, V of .MyMap> FUN FAKE_OVERRIDE name:merge visibility:public modality:OPEN <> ($this:kotlin.collections.MutableMap.MyMap, V of .MyMap>, p0:@[EnhancedNullability] K of .MyMap, p1:@[EnhancedNullability] V of .MyMap, p2:@[EnhancedNullability] java.util.function.BiFunction.MyMap, in @[EnhancedNullability] V of .MyMap, out @[EnhancedNullability] V of .MyMap?>) returnType:@[EnhancedNullability] V of .MyMap? [fake_override] overridden: - public open fun merge (p0: @[EnhancedNullability] K of kotlin.collections.AbstractMutableMap, p1: @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap, p2: @[EnhancedNullability] java.util.function.BiFunction): @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap? [fake_override] declared in kotlin.collections.AbstractMutableMap + public open fun merge (p0: @[EnhancedNullability] K of kotlin.collections.AbstractMutableMap, p1: @[EnhancedNullability] {V of kotlin.collections.AbstractMutableMap & Any}, p2: @[EnhancedNullability] java.util.function.BiFunction): @[EnhancedNullability] V of kotlin.collections.AbstractMutableMap? [fake_override] declared in kotlin.collections.AbstractMutableMap $this: VALUE_PARAMETER name: type:kotlin.collections.MutableMap.MyMap, V of .MyMap> VALUE_PARAMETER name:p0 index:0 type:@[EnhancedNullability] K of .MyMap VALUE_PARAMETER name:p1 index:1 type:@[EnhancedNullability] V of .MyMap diff --git a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.ir.txt b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.ir.txt deleted file mode 100644 index 5f194a6a802..00000000000 --- a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.ir.txt +++ /dev/null @@ -1,27 +0,0 @@ -FILE fqName: fileName:/main.kt - CLASS INTERFACE name:B modality:ABSTRACT visibility:public superTypes:[.A.B>] - $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:.B.B> - TYPE_PARAMETER name:T1 index:0 variance: superTypes:[kotlin.Any?] reified:false - FUN name:foo visibility:public modality:ABSTRACT <> ($this:.B.B>, x:T1 of .B) returnType:T1 of .B - overridden: - public abstract fun foo (x: @[FlexibleNullability] T of .A?): @[FlexibleNullability] T of .A? declared in .A - $this: VALUE_PARAMETER name: type:.B.B> - VALUE_PARAMETER name:x index:0 type:T1 of .B - FUN name:bar visibility:public modality:ABSTRACT <> ($this:.B.B>, x:{T1 of .B & Any}) returnType:{T1 of .B & Any} - overridden: - public abstract fun bar (x: @[EnhancedNullability] {T of .A & Any}): @[EnhancedNullability] {T of .A & Any} declared in .A - $this: VALUE_PARAMETER name: type:.B.B> - VALUE_PARAMETER name:x index:0 type:{T1 of .B & Any} - FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] - overridden: - public open fun equals (other: kotlin.Any?): kotlin.Boolean [fake_override,operator] declared in .A - $this: VALUE_PARAMETER name: type:kotlin.Any - VALUE_PARAMETER name:other index:0 type:kotlin.Any? - FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int [fake_override] - overridden: - public open fun hashCode (): kotlin.Int [fake_override] declared in .A - $this: VALUE_PARAMETER name: type:kotlin.Any - FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String [fake_override] - overridden: - public open fun toString (): kotlin.String [fake_override] declared in .A - $this: VALUE_PARAMETER name: type:kotlin.Any diff --git a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.kt.txt b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.kt.txt deleted file mode 100644 index 4428e37d0aa..00000000000 --- a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.fir.kt.txt +++ /dev/null @@ -1,6 +0,0 @@ -interface B : A { - abstract override fun foo(x: T1): T1 - - abstract override fun bar(x: (T1 & Any)): (T1 & Any) - -} diff --git a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.ir.txt b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.ir.txt index ae06f5d6816..5f194a6a802 100644 --- a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.ir.txt +++ b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.ir.txt @@ -9,7 +9,7 @@ FILE fqName: fileName:/main.kt VALUE_PARAMETER name:x index:0 type:T1 of .B FUN name:bar visibility:public modality:ABSTRACT <> ($this:.B.B>, x:{T1 of .B & Any}) returnType:{T1 of .B & Any} overridden: - public abstract fun bar (x: @[EnhancedNullability] T of .A): @[EnhancedNullability] T of .A declared in .A + public abstract fun bar (x: @[EnhancedNullability] {T of .A & Any}): @[EnhancedNullability] {T of .A & Any} declared in .A $this: VALUE_PARAMETER name: type:.B.B> VALUE_PARAMETER name:x index:0 type:{T1 of .B & Any} FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] diff --git a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.kt b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.kt index 175888a59c1..32f3c4d791a 100644 --- a/compiler/testData/ir/irText/types/definitelyNonNullWithJava.kt +++ b/compiler/testData/ir/irText/types/definitelyNonNullWithJava.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL //!LANGUAGE: +DefinitelyNonNullableTypes // TARGET_BACKEND: JVM @@ -15,4 +16,4 @@ public interface A { interface B : A { override fun foo(x: T1): T1 override fun bar(x: T1 & Any): T1 & Any -} +} \ No newline at end of file diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt index 65cc32989e9..463dc75a5ad 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.txt @@ -4,11 +4,11 @@ public interface TypeParamOfClass { public interface Sub : test.TypeParamOfClass.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(): T + public abstract override /*1*/ fun foo(): T & Any } public interface Super { public abstract fun dummy(): kotlin.Unit - @org.jetbrains.annotations.NotNull public abstract fun foo(): T + @org.jetbrains.annotations.NotNull public abstract fun foo(): T & Any } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt index 023765ed689..d348dd1a04f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt @@ -9,6 +9,6 @@ public interface TypeParamOfClassSubstituted { public interface Super { public abstract fun dummy(): kotlin.Unit - @org.jetbrains.annotations.NotNull public abstract fun foo(): T + @org.jetbrains.annotations.NotNull public abstract fun foo(): T & Any } } diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt index fa253d10d59..963f425cc5c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.txt @@ -4,11 +4,11 @@ public interface TypeParamOfFun { public interface Sub : test.TypeParamOfFun.Super { public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit - public abstract override /*1*/ fun foo(): E + public abstract override /*1*/ fun foo(): E & Any } public interface Super { public abstract fun dummy(): kotlin.Unit - @org.jetbrains.annotations.NotNull public abstract fun foo(): T + @org.jetbrains.annotations.NotNull public abstract fun foo(): T & Any } } diff --git a/compiler/testData/loadJava8/compiledJava/MapRemove.txt b/compiler/testData/loadJava8/compiledJava/MapRemove.txt index 6e40bf72fba..0d647dde632 100644 --- a/compiler/testData/loadJava8/compiledJava/MapRemove.txt +++ b/compiler/testData/loadJava8/compiledJava/MapRemove.txt @@ -12,14 +12,14 @@ public open class MapRemove { public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K!, /*1*/ p1: java.util.function.Function): V! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V? @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V! public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V? diff --git a/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt b/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt index e87f9491336..835dab7c51d 100644 --- a/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt +++ b/compiler/testData/loadJava8/compiledJava/typeParameterAnnotations/Basic.txt @@ -2,7 +2,7 @@ package test public open class Basic { public constructor Basic() - public/*package*/ open fun foo(/*0*/ p0: R!): kotlin.Unit + public/*package*/ open fun foo(/*0*/ p0: R!): kotlin.Unit public interface G { public abstract fun foo(/*0*/ p0: R): kotlin.Unit diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt index 05cee3beef8..01aef89670f 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -12,10 +12,10 @@ public/*package*/ open class A3() } -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -27,10 +27,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt index 7ac5bd3fe4d..29b186352a8 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic.txt @@ -3,7 +3,7 @@ package test public open class Basic { public constructor Basic() - public/*package*/ interface G : test.Basic.G2<@org.jetbrains.annotations.NotNull T, @org.jetbrains.annotations.NotNull kotlin.String> { + public/*package*/ interface G : test.Basic.G2<@org.jetbrains.annotations.NotNull T & Any, @org.jetbrains.annotations.NotNull kotlin.String> { } public/*package*/ interface G2 { diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt index f75974d7c03..874fe5f394e 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/Basic_DisabledImprovements.txt @@ -21,7 +21,7 @@ public open class Basic_DisabledImprovements!): kotlin.Unit public abstract fun !>!> f10(/*0*/ p0: T!): kotlin.Unit public abstract fun f2(): test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.Nullable kotlin.String!, @org.jetbrains.annotations.NotNull kotlin.Int!>! - public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull p0: @org.jetbrains.annotations.NotNull T): kotlin.Unit + public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull p0: @org.jetbrains.annotations.NotNull T & Any): kotlin.Unit public abstract fun f4(/*0*/ p0: test.Basic_DisabledImprovements.G<(@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String!>..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit public abstract fun f5(/*0*/ p0: test.Basic_DisabledImprovements.G<*>!): kotlin.Unit public abstract fun f6(/*0*/ p0: test.Basic_DisabledImprovements.G!): kotlin.Unit diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt index 6b453ea2e8a..c8d9cf09dd1 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -22,15 +22,15 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G3 where B : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I1 { } - public/*package*/ open inner class G4 { - public/*package*/ constructor G4() + public/*package*/ open inner class G4 { + public/*package*/ constructor G4() } public/*package*/ interface G5 { } - public/*package*/ open inner class G6 { - public/*package*/ constructor G6() + public/*package*/ open inner class G6 { + public/*package*/ constructor G6() } public/*package*/ interface G7 where _A : test.ClassTypeParameterBounds.I2<@org.jetbrains.annotations.NotNull kotlin.Int>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { diff --git a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt index 9df7a2107c5..f6747b84bcf 100644 --- a/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/compiledJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,17 +5,17 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ p0: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ p0: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ p0: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? - public/*package*/ open fun f4(/*0*/ p0: _A, /*1*/ p1: B!): kotlin.Unit + public/*package*/ open fun f4(/*0*/ p0: _A, /*1*/ p1: B!): kotlin.Unit public/*package*/ open fun f5(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit public/*package*/ open fun f6(): kotlin.Unit - public/*package*/ abstract fun f7(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit - public/*package*/ abstract fun f8(/*0*/ p0: _A, /*1*/ p1: B!, /*2*/ p2: C!, /*3*/ p3: D, /*4*/ p4: E!, /*5*/ p5: F!): kotlin.Unit + public/*package*/ abstract fun f7(/*0*/ p0: _A!, /*1*/ p1: B): kotlin.Unit + public/*package*/ abstract fun f8(/*0*/ p0: _A, /*1*/ p1: B!, /*2*/ p2: C!, /*3*/ p3: D, /*4*/ p4: E!, /*5*/ p5: F!): kotlin.Unit public/*package*/ open fun f9(/*0*/ p0: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2<@org.jetbrains.annotations.Nullable kotlin.Int?>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ interface I1 { diff --git a/compiler/testData/loadJava8/sourceJava/MapRemove.txt b/compiler/testData/loadJava8/sourceJava/MapRemove.txt index cdf26cd7418..f30fb25a4f2 100644 --- a/compiler/testData/loadJava8/sourceJava/MapRemove.txt +++ b/compiler/testData/loadJava8/sourceJava/MapRemove.txt @@ -12,14 +12,14 @@ public open class MapRemove { public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit public open override /*1*/ /*fake_override*/ fun compute(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public open override /*1*/ /*fake_override*/ fun computeIfAbsent(/*0*/ p0: K!, /*1*/ p1: java.util.function.Function): V! - public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun computeIfPresent(/*0*/ p0: K!, /*1*/ p1: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V!): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun forEach(/*0*/ p0: java.util.function.BiConsumer): kotlin.Unit public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K!): V? @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open override /*1*/ /*fake_override*/ fun getOrDefault(/*0*/ key: K!, /*1*/ defaultValue: V!): V! public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V, /*2*/ p2: java.util.function.BiFunction): V? + public open override /*1*/ /*fake_override*/ fun merge(/*0*/ p0: K!, /*1*/ p1: V & Any, /*2*/ p2: java.util.function.BiFunction): V? public abstract override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V? public abstract override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map): kotlin.Unit public open override /*1*/ /*fake_override*/ fun putIfAbsent(/*0*/ p0: K!, /*1*/ p1: V!): V? diff --git a/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt b/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt index 80bfb3d426f..6be6cc3fcd7 100644 --- a/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt +++ b/compiler/testData/loadJava8/sourceJava/typeParameterAnnotations/Basic.txt @@ -2,7 +2,7 @@ package test public open class Basic { public constructor Basic() - public/*package*/ open fun foo(/*0*/ r: R!): kotlin.Unit + public/*package*/ open fun foo(/*0*/ r: R!): kotlin.Unit public interface G { public abstract fun foo(/*0*/ r: R): kotlin.Unit diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt index e24d09f9faa..e3701ec78f2 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/BaseClassTypeArguments.txt @@ -1,9 +1,9 @@ package test -public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B> { +public open class BaseClassTypeArguments : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!>, test.I1<(@org.jetbrains.annotations.NotNull kotlin.Array!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, B!, @org.jetbrains.annotations.NotNull B & Any> { public constructor BaseClassTypeArguments() - public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public/*package*/ open class BaseClassTypeArguments2 : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public/*package*/ constructor BaseClassTypeArguments2() } @@ -15,10 +15,10 @@ public open class BaseClassTypeArguments : test.A3 /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { + public/*package*/ open inner class ImplementedInterfacesTypeArguments /*captured type parameters: /*1*/ B : kotlin.Any!*/ : test.I1!>!>..@org.jetbrains.annotations.NotNull kotlin.Array!>!>)>!, test.I1!>!>!>, test.I2<@org.jetbrains.annotations.NotNull B & Any, B!>, test.I3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.I2!>!>!> { public/*package*/ constructor ImplementedInterfacesTypeArguments() - public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { + public open inner class BaseClassTypeArguments1 /*captured type parameters: /*1*/ B : kotlin.Any!, /*2*/ B : kotlin.Any!*/ : test.A3!>!>!>!>!, test.I1..@org.jetbrains.annotations.NotNull kotlin.Array)>!>!, test.A2!>!>!> { public constructor BaseClassTypeArguments1() } } diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt index 63bf24cbfcb..3e060121e6b 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/Basic_DisabledImprovements.txt @@ -11,7 +11,7 @@ public open class Basic_DisabledImprovements : test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.NotNull T, @org.jetbrains.annotations.NotNull kotlin.String> { + public/*package*/ interface G : test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.NotNull T & Any, @org.jetbrains.annotations.NotNull kotlin.String> { } public/*package*/ interface G2 { @@ -21,7 +21,7 @@ public open class Basic_DisabledImprovements!): kotlin.Unit public abstract fun !>!> f10(/*0*/ p: T!): kotlin.Unit public abstract fun f2(): test.Basic_DisabledImprovements.G2<@org.jetbrains.annotations.Nullable kotlin.String?, @org.jetbrains.annotations.NotNull kotlin.Int>! - public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull x: @org.jetbrains.annotations.NotNull T): kotlin.Unit + public abstract fun f3(/*0*/ @org.jetbrains.annotations.NotNull x: @org.jetbrains.annotations.NotNull T & Any): kotlin.Unit public abstract fun f4(/*0*/ p: test.Basic_DisabledImprovements.G<(@org.jetbrains.annotations.Nullable kotlin.Array<@org.jetbrains.annotations.NotNull kotlin.String!>..@org.jetbrains.annotations.Nullable kotlin.Array?)>!): kotlin.Unit public abstract fun f5(/*0*/ p: test.Basic_DisabledImprovements.G<*>!): kotlin.Unit public abstract fun f6(/*0*/ p: test.Basic_DisabledImprovements.G!): kotlin.Unit diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt index 6b453ea2e8a..c8d9cf09dd1 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/ClassTypeParameterBounds.txt @@ -22,15 +22,15 @@ public open class ClassTypeParameterBounds { public/*package*/ interface G3 where B : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I1 { } - public/*package*/ open inner class G4 { - public/*package*/ constructor G4() + public/*package*/ open inner class G4 { + public/*package*/ constructor G4() } public/*package*/ interface G5 { } - public/*package*/ open inner class G6 { - public/*package*/ constructor G6() + public/*package*/ open inner class G6 { + public/*package*/ constructor G6() } public/*package*/ interface G7 where _A : test.ClassTypeParameterBounds.I2<@org.jetbrains.annotations.NotNull kotlin.Int>!, _A : @org.jetbrains.annotations.NotNull test.ClassTypeParameterBounds.I3 { diff --git a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt index c487715c9b1..adbc810b645 100644 --- a/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt +++ b/compiler/testData/loadJava8/sourceJava/typeUseAnnotations/MethodTypeParameterBounds.txt @@ -5,17 +5,17 @@ public/*package*/ abstract class MethodTypeParameterBounds { public/*package*/ open fun f1(/*0*/ x: T): kotlin.Unit public/*package*/ open fun f10(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ open fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f11(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3..@org.jetbrains.annotations.NotNull kotlin.Array)>? - public/*package*/ open fun !> f12(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 + public/*package*/ open fun !> f12(/*0*/ x: _A & Any): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!, _A : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I3 public/*package*/ open fun ?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>!>!> f13(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!>?..@org.jetbrains.annotations.Nullable kotlin.Array!>!>!>?)>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ abstract fun ..@org.jetbrains.annotations.NotNull kotlin.Array)>!> f14(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2!>!>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3?..@org.jetbrains.annotations.Nullable kotlin.Array?)>!>? public/*package*/ open fun !> f15(/*0*/ x: _A!): kotlin.Unit where B : @org.jetbrains.annotations.NotNull test.MethodTypeParameterBounds.I2<_A!> public/*package*/ open fun f2(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit public/*package*/ open fun f3(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit where B : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I1? - public/*package*/ open fun f4(/*0*/ x: _A, /*1*/ y: B!): kotlin.Unit + public/*package*/ open fun f4(/*0*/ x: _A, /*1*/ y: B!): kotlin.Unit public/*package*/ open fun f5(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit public/*package*/ open fun f6(): kotlin.Unit - public/*package*/ abstract fun f7(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit - public/*package*/ abstract fun f8(/*0*/ x1: _A, /*1*/ x2: B!, /*2*/ x3: C!, /*3*/ x4: D, /*4*/ x5: E!, /*5*/ x6: F!): kotlin.Unit + public/*package*/ abstract fun f7(/*0*/ x: _A!, /*1*/ y: B): kotlin.Unit + public/*package*/ abstract fun f8(/*0*/ x1: _A, /*1*/ x2: B!, /*2*/ x3: C!, /*3*/ x4: D, /*4*/ x5: E!, /*5*/ x6: F!): kotlin.Unit public/*package*/ open fun f9(/*0*/ x: _A): kotlin.Unit where _A : test.MethodTypeParameterBounds.I2<@org.jetbrains.annotations.Nullable kotlin.Int?>!, _A : @org.jetbrains.annotations.Nullable test.MethodTypeParameterBounds.I3? public/*package*/ interface I1 { diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt index 559df722a1e..5414d7a9bd8 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapComputeIfPresent.txt @@ -1,34 +1,34 @@ fun valuesNotNull(map: MutableMap) { map.computeIfPresent(1) { k, v -> v.length.toString() ?: null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesNullable(map: MutableMap) { map.computeIfPresent(1) { k, v -> v?.length?.toString() } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesT(map: MutableMap, newValue: T) { map.computeIfPresent(1) { k, v -> v?.length.toString() ?: null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNotNull(map: MutableMap, newValue: T) { map.computeIfPresent(1) { k, v -> null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNullable(map: MutableMap, newValue: T?) { map.computeIfPresent(1) { k, v -> null } // SUCCESS - // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun computeIfPresent(K, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun computeIfPresent(Int, BiFunction): T? defined in kotlin.collections.MutableMap } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt index 48dac6e4303..a9df1466e2d 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/map/mapMerge.txt @@ -1,42 +1,42 @@ fun valuesNotNull(map: MutableMap) { map.merge(1, "x") { old, new -> old + new } // SUCCESS - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, String, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesNullable(map: MutableMap) { map.merge(1, "x") { old, new -> old + new } // SUCCESS - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, String, BiFunction): String? defined in kotlin.collections.MutableMap map.merge(1, null) { old, new -> old + new } // UNSAFE_CALL_ERROR - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, String, BiFunction): String? defined in kotlin.collections.MutableMap } fun valuesT(map: MutableMap, newValue: T) { map.merge(1, newValue) { old, new -> null } - // SUCCESS - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun merge(Int, T, BiFunction): T? defined in kotlin.collections.MutableMap + // OTHER_ERROR + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun merge(Int, T & Any, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNotNull(map: MutableMap, newValue: T) { map.merge(1, newValue) { old, new -> null } // SUCCESS - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap // SUBSTITUTED: fun merge(Int, T, BiFunction): T? defined in kotlin.collections.MutableMap } fun valuesTNullable(map: MutableMap, newValue: T?) { map.merge(1, newValue) { old, new -> new } // UNSAFE_CALL_ERROR - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun merge(Int, T, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun merge(Int, T & Any, BiFunction): T? defined in kotlin.collections.MutableMap map.merge(1, newValue!!) { old, new -> new } // SUCCESS - // ORIGINAL: fun merge(K, V, BiFunction): V? defined in kotlin.collections.MutableMap - // SUBSTITUTED: fun merge(Int, T, BiFunction): T? defined in kotlin.collections.MutableMap + // ORIGINAL: fun merge(K, V & Any, BiFunction): V? defined in kotlin.collections.MutableMap + // SUBSTITUTED: fun merge(Int, T & Any, BiFunction): T? defined in kotlin.collections.MutableMap } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt index c5e296cb349..4e9621d537f 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalEmpty.txt @@ -3,11 +3,11 @@ import java.util.* fun use() { Optional.empty() // SUCCESS - // ORIGINAL: fun empty(): Optional defined in java.util.Optional + // ORIGINAL: fun empty(): Optional defined in java.util.Optional // SUBSTITUTED: fun empty(): Optional defined in java.util.Optional Optional.empty() // SUCCESS - // ORIGINAL: fun empty(): Optional defined in java.util.Optional + // ORIGINAL: fun empty(): Optional defined in java.util.Optional // SUBSTITUTED: fun empty(): Optional defined in java.util.Optional } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt index e65b4465711..f4d248535f4 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalGet.txt @@ -3,14 +3,14 @@ import java.util.* fun use(v: Optional) { v.get() // SUCCESS - // ORIGINAL: fun get(): T defined in java.util.Optional + // ORIGINAL: fun get(): T & Any defined in java.util.Optional // SUBSTITUTED: fun get(): String defined in java.util.Optional } fun use2(v: Optional) { v.get() // SUCCESS - // ORIGINAL: fun get(): T defined in java.util.Optional + // ORIGINAL: fun get(): T & Any defined in java.util.Optional // SUBSTITUTED: fun get(): String defined in java.util.Optional } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt index 96043a2e2ba..b4b22694421 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalIfPresent.txt @@ -3,14 +3,14 @@ import java.util.* fun use(v: Optional) { v.ifPresent { value -> } // SUCCESS - // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional + // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional // SUBSTITUTED: fun ifPresent(Consumer): Unit defined in java.util.Optional } fun use2(v: Optional) { v.ifPresent { value -> } // SUCCESS - // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional + // ORIGINAL: fun ifPresent(Consumer): Unit defined in java.util.Optional // SUBSTITUTED: fun ifPresent(Consumer): Unit defined in java.util.Optional } diff --git a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt index 7638f81b666..41b4a5a6fc9 100644 --- a/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt +++ b/compiler/testData/resolvedCalls/enhancedSignatures/optional/optionalOf.txt @@ -3,17 +3,17 @@ import java.util.* fun use() { val x: String? = "x" Optional.of(x) - // UNSAFE_CALL_ERROR - // ORIGINAL: fun of(T): Optional defined in java.util.Optional + // SUCCESS + // ORIGINAL: fun of(T & Any): Optional defined in java.util.Optional // SUBSTITUTED: fun of(String): Optional defined in java.util.Optional Optional.of(x!!) // SUCCESS - // ORIGINAL: fun of(T): Optional defined in java.util.Optional + // ORIGINAL: fun of(T & Any): Optional defined in java.util.Optional // SUBSTITUTED: fun of(String): Optional defined in java.util.Optional Optional.ofNullable(x) // SUCCESS - // ORIGINAL: fun ofNullable(T?): Optional defined in java.util.Optional + // ORIGINAL: fun ofNullable(T?): Optional defined in java.util.Optional // SUBSTITUTED: fun ofNullable(String?): Optional defined in java.util.Optional }