From f34726ff9104b0a86854da4bcb78aa30bbbe7aa3 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Thu, 22 Jul 2021 14:48:34 +0300 Subject: [PATCH] Fix test data for ForeignAnnotations --- .../java8Tests/checkerFramework.txt | 2 +- .../foreignAnnotationsTests/java8Tests/eclipse.txt | 3 ++- .../java8Tests/jspecify/strictMode/SelfType.fir.txt | 2 +- .../java8Tests/jspecify/strictMode/SelfType.txt | 2 +- .../java8Tests/jsr305/typeArguments.txt | 12 ++++++------ .../java8Tests/misc/methodWithTypeParameter.fir.txt | 6 +++--- .../java8Tests/misc/methodWithTypeParameter.txt | 6 +++--- .../foreignAnnotationsTests/tests/androidSdk.txt | 2 +- .../tests/android_support.txt | 2 +- .../foreignAnnotationsTests/tests/androidx.txt | 2 +- .../foreignAnnotationsTests/tests/aosp.txt | 2 +- .../foreignAnnotationsTests/tests/eclipse.txt | 2 +- .../foreignAnnotationsTests/tests/multiple.txt | 4 ++-- .../foreignAnnotationsTests/tests/rxjava.txt | 2 +- .../foreignAnnotationsTests/tests/rxjava3Errors.txt | 2 +- 15 files changed, 26 insertions(+), 25 deletions(-) diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/checkerFramework.txt index 13b4adbf6cf..4ce0508b667 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!!): @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 45024983b72..4a1679913b3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/eclipse.txt @@ -6,9 +6,10 @@ 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!!): @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 public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } + diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.txt index 9fb5177f58d..b6315df6fac 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.txt @@ -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/jspecify/strictMode/SelfType.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt index 9fb5177f58d..b6315df6fac 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt @@ -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/jsr305/typeArguments.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.txt index 789cdd418b7..417422346c1 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!! + public open fun setS(/*0*/ s: S!!): 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!! 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!! + public open fun setS(/*0*/ s: S!!): 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!! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.txt index 3f6c9954188..a06cf7c36a5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.fir.txt @@ -17,9 +17,9 @@ 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!!>): @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!! 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!! 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/misc/methodWithTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt index 3f6c9954188..a06cf7c36a5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/misc/methodWithTypeParameter.txt @@ -17,9 +17,9 @@ 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!!>): @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!! 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!! 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 b581eea64db..cfcd7adfb92 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!!): 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 245c8f0f6c7..c3cd7018a37 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!!): 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 5db379d2aa2..2c4ffc327e4 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!!): 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 ae33cd45aa0..eb09bd07899 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!!): 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 d73832edc45..7f9939070da 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!!): 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..3972acb3d71 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!!): 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!!): 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 d7355e89103..16a82d14072 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!!): 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 a1d116b7cb4..919ca767445 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!!): @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