Add @UnderMigration annotation and options for report level

compiler/testData/foreignAnnotations/testAnnotations/MyMigrationNonnull.java

@@ -0,0 +1,18 @@
+import javax.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+
+import kotlin.annotations.jvm.*;
+
+@Documented
+@TypeQualifierNickname
+@Nonnull(when = When.ALWAYS)
+@Retention(RetentionPolicy.RUNTIME)
+@UnderMigration(status = MigrationStatus.WARN)
+public @interface MyMigrationNonnull {
+
+}

compiler/testData/foreignAnnotations/testAnnotations/MyMigrationNullable.java

@@ -0,0 +1,18 @@
+import javax.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+
+import kotlin.annotations.jvm.*;
+
+@Documented
+@TypeQualifierNickname
+@Nonnull(when = When.MAYBE)
+@Retention(RetentionPolicy.RUNTIME)
+@UnderMigration(status = MigrationStatus.WARN)
+public @interface MyMigrationNullable {
+
+}

compiler/testData/foreignAnnotations/tests/jsr305/ignore/parametersAreNonnullByDefault.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// JSR305_ANNOTATIONS_IGNORE
+// JSR305_GLOBAL_REPORT ignore
 
 // FILE: A.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/arithmetic.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/array.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/assignToVar.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/conditions.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/dataFlowInfo.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/defaultParameters.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegatedProperties.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/delegation.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceExtension.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/derefenceMember.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/expectedType.kt

@@ -1,5 +1,5 @@
 // !CHECK_TYPE
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/for.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/functionArguments.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/invoke.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/kt6829.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // KT-6829 False warning on map to @Nullable
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/multiDeclaration.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/passToJava.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/primitiveArray.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/throw.kt

@@ -1,4 +1,4 @@
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/fromPlatformTypes/uselessElvisRightIsNull.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: J.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityGenerics.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: A.java
 public class A<T> {

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/nullabilityNicknames.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: MyNullable.java
 import javax.annotation.*;

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/simple.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: A.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/strange.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: A.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/fieldsAreNullable.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: FieldsAreNullable.java
 import java.lang.annotation.Documented;

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/nullabilityFromOverridden.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: NonNullApi.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/overridingDefaultQualifier.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: NonNullApi.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefault.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: A.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/parametersAreNonnullByDefaultPackage.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: test/package-info.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullable.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: spr/Nullable.java
 

compiler/testData/foreignAnnotations/tests/jsr305/nullabilityWarnings/typeQualifierDefault/springNullablePackage.kt

@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// WARNING_FOR_JSR305_ANNOTATIONS
+// JSR305_GLOBAL_REPORT warn
 
 // FILE: spr/Nullable.java
 

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.kt

@@ -0,0 +1,84 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT ignore
+
+// FILE: MyErrorNonnull.java
+import javax.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+
+import kotlin.annotations.jvm.*;
+
+@Documented
+@TypeQualifierNickname
+@Nonnull(when = When.ALWAYS)
+@Retention(RetentionPolicy.RUNTIME)
+@UnderMigration(status = MigrationStatus.STRICT)
+public @interface MyErrorNonnull {
+}
+
+// FILE: MyWarnNonnull.java
+import javax.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+
+import kotlin.annotations.jvm.*;
+
+@Documented
+@TypeQualifierNickname
+@Nonnull(when = When.ALWAYS)
+@Retention(RetentionPolicy.RUNTIME)
+@UnderMigration(status = MigrationStatus.WARN)
+public @interface MyWarnNonnull {
+}
+
+// FILE: MyIgnoreNonnull.java
+import javax.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+
+import kotlin.annotations.jvm.*;
+
+@Documented
+@TypeQualifierNickname
+@Nonnull(when = When.ALWAYS)
+@Retention(RetentionPolicy.RUNTIME)
+@UnderMigration(status = MigrationStatus.IGNORE)
+public @interface MyIgnoreNonnull {
+}
+
+// FILE: A.java
+
+public class A {
+    public void foo(@MyErrorNonnull String bar) {}
+    public void foo2(@MyWarnNonnull String bar) {}
+    public void foo3(@MyIgnoreNonnull String bar) {}
+    public void foo4(@MyMigrationNonnull String bar) {}
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("")
+    a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+
+    a.foo2("")
+    a.foo2(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
+
+    a.foo3("")
+    a.foo3(null)
+
+    a.foo4("")
+    a.foo4(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/customMigration.txt

@@ -0,0 +1,35 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open fun foo(/*0*/ @MyErrorNonnull bar: kotlin.String): kotlin.Unit
+    public open fun foo2(/*0*/ @MyWarnNonnull bar: kotlin.String!): kotlin.Unit
+    public open fun foo3(/*0*/ @MyIgnoreNonnull bar: kotlin.String!): kotlin.Unit
+    public open fun foo4(/*0*/ @MyMigrationNonnull bar: kotlin.String!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@kotlin.annotation.MustBeDocumented @javax.annotation.meta.TypeQualifierNickname @javax.annotation.Nonnull(when = When.ALWAYS) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotations.jvm.UnderMigration(status = MigrationStatus.STRICT) public final annotation class MyErrorNonnull : kotlin.Annotation {
+    public constructor MyErrorNonnull()
+    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
+}
+
+@kotlin.annotation.MustBeDocumented @javax.annotation.meta.TypeQualifierNickname @javax.annotation.Nonnull(when = When.ALWAYS) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotations.jvm.UnderMigration(status = MigrationStatus.IGNORE) public final annotation class MyIgnoreNonnull : kotlin.Annotation {
+    public constructor MyIgnoreNonnull()
+    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
+}
+
+@kotlin.annotation.MustBeDocumented @javax.annotation.meta.TypeQualifierNickname @javax.annotation.Nonnull(when = When.ALWAYS) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) @kotlin.annotations.jvm.UnderMigration(status = MigrationStatus.WARN) public final annotation class MyWarnNonnull : kotlin.Annotation {
+    public constructor MyWarnNonnull()
+    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
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.kt

@@ -0,0 +1,57 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT ignore
+// JSR305_MIGRATION_REPORT strict
+// JSR305_SPECIAL_REPORT MyNonnull:warn
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+
+    @MyNullable public String field2 = null;
+    @MyNullable
+    public String foo2(@MyNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    public String bar2() {
+        return "";
+    }
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    a.foo("", null)<!UNSAFE_CALL!>.<!>length
+    a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")<!UNSAFE_CALL!>.<!>length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    a.field<!UNSAFE_CALL!>.<!>length
+
+    a.foo2("", null)?.length
+    a.foo2("", null).length
+    a.foo2(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>, "").length
+
+    a.bar2().length
+    a.bar2()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field2?.length
+    a.field2.length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalIgnore.txt

@@ -0,0 +1,16 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String?
+    @MyNullable public final var field2: kotlin.String!
+    @MyMigrationNonnull public open fun bar(): kotlin.String
+    @MyNonnull public open fun bar2(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String?
+    @MyNullable public open fun foo2(/*0*/ @MyNonnull x: kotlin.String!, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.kt

@@ -0,0 +1,57 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT warn
+// JSR305_MIGRATION_REPORT ignore
+// JSR305_SPECIAL_REPORT MyNullable:strict, MyMigrationNonnull:strict
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+
+    @MyNullable public String field2 = null;
+    @MyNullable
+    public String foo2(@MyNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    public String bar2() {
+        return "";
+    }
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    a.foo("", null).length
+    a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>, "").length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    a.field.length
+
+    a.foo2("", null)?.length
+    a.foo2("", null)<!UNSAFE_CALL!>.<!>length
+    a.foo2(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>, "")<!UNSAFE_CALL!>.<!>length
+
+    a.bar2().length
+    a.bar2()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field2?.length
+    a.field2<!UNSAFE_CALL!>.<!>length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/globalWarningMigrationIgnore.txt

@@ -0,0 +1,16 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String!
+    @MyNullable public final var field2: kotlin.String?
+    @MyMigrationNonnull public open fun bar(): kotlin.String
+    @MyNonnull public open fun bar2(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    @MyNullable public open fun foo2(/*0*/ @MyNonnull x: kotlin.String!, /*1*/ y: kotlin.CharSequence!): kotlin.String?
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.kt

@@ -0,0 +1,78 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT warn
+// JSR305_MIGRATION_REPORT strict
+// JSR305_SPECIAL_REPORT MyNonnull:ignore, MySuperNull:strict
+
+// FILE: MySuperNull.java
+import javax.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+
+@Documented
+@TypeQualifierNickname
+@Nonnull(when = When.MAYBE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MySuperNull {
+}
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+
+    @MyNullable public String field2 = null;
+    @MyNullable
+    public String foo2(@MyNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    public String bar2() {
+        return "";
+    }
+
+    @MySuperNull public String field3 = null;
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    a.foo("", null)<!UNSAFE_CALL!>.<!>length
+    a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")<!UNSAFE_CALL!>.<!>length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    a.field<!UNSAFE_CALL!>.<!>length
+
+    a.foo2("", null)?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo2("", null)<!>.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo2(null, "")<!>.length
+
+    a.bar2().length
+    a.bar2()!!.length
+
+    a.field2?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.field2<!>.length
+
+    a.field3?.length
+    a.field3<!UNSAFE_CALL!>.<!>length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationError.txt

@@ -0,0 +1,24 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String?
+    @MyNullable public final var field2: kotlin.String!
+    @MySuperNull public final var field3: kotlin.String?
+    @MyMigrationNonnull public open fun bar(): kotlin.String
+    @MyNonnull public open fun bar2(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String?
+    @MyNullable public open fun foo2(/*0*/ @MyNonnull x: kotlin.String!, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+@kotlin.annotation.MustBeDocumented @javax.annotation.meta.TypeQualifierNickname @javax.annotation.Nonnull(when = When.MAYBE) @kotlin.annotation.Retention(value = AnnotationRetention.RUNTIME) public final annotation class MySuperNull : kotlin.Annotation {
+    public constructor MySuperNull()
+    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
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.kt

@@ -0,0 +1,57 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT strict
+// JSR305_MIGRATION_REPORT ignore
+// JSR305_SPECIAL_REPORT MyNullable:warn, MyMigrationNonnull:strict
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+
+    @MyNullable public String field2 = null;
+    @MyNullable
+    public String foo2(@MyNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    public String bar2() {
+        return "";
+    }
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    a.foo("", null).length
+    a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>, "").length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    a.field.length
+
+    a.foo2("", null)?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo2("", null)<!>.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo2(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")<!>.length
+
+    a.bar2().length
+    a.bar2()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field2?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.field2<!>.length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationIgnore.txt

@@ -0,0 +1,16 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String!
+    @MyNullable public final var field2: kotlin.String!
+    @MyMigrationNonnull public open fun bar(): kotlin.String
+    @MyNonnull public open fun bar2(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    @MyNullable public open fun foo2(/*0*/ @MyNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.kt

@@ -0,0 +1,57 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT strict
+// JSR305_MIGRATION_REPORT warn
+// JSR305_SPECIAL_REPORT MyNullable:ignore, MyMigrationNullable:strict
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+
+    @MyNullable public String field2 = null;
+    @MyNullable
+    public String foo2(@MyNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    public String bar2() {
+        return "";
+    }
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    a.foo("", null)<!UNSAFE_CALL!>.<!>length
+    a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>, "")<!UNSAFE_CALL!>.<!>length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    a.field<!UNSAFE_CALL!>.<!>length
+
+    a.foo2("", null)?.length
+    a.foo2("", null).length
+    a.foo2(<!NULL_FOR_NONNULL_TYPE!>null<!>, "").length
+
+    a.bar2().length
+    a.bar2()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field2?.length
+    a.field2.length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/migrationWarning.txt

@@ -0,0 +1,16 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String?
+    @MyNullable public final var field2: kotlin.String!
+    @MyMigrationNonnull public open fun bar(): kotlin.String!
+    @MyNonnull public open fun bar2(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String!, /*1*/ y: kotlin.CharSequence!): kotlin.String?
+    @MyNullable public open fun foo2(/*0*/ @MyNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.kt

@@ -0,0 +1,85 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT warn
+// JSR305_MIGRATION_REPORT strict
+
+// FILE: A.java
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+public class A {
+    @MyNullable
+    public String foo() { return ""; }
+
+    @MyMigrationNullable
+    public String foo2() { return ""; }
+
+    @Nullable
+    public String foo3() { return ""; }
+
+    public String foo4() { return ""; }
+
+    public void bar(@MyNonnull String baz) { }
+
+    public void bar2(@MyMigrationNonnull String baz) { }
+
+    public void bar3(@Nonnull String baz) {}
+
+    public void bar4(String baz) {}
+}
+
+// FILE: B.java
+public class B extends A {
+    @MyMigrationNullable
+    public String foo() { return ""; }
+
+    @MyNullable
+    public String foo2() { return ""; }
+
+    @MyNullable
+    public String foo3() { return ""; }
+
+    @MyNullable
+    public String foo4() { return ""; }
+
+    public void bar(@MyMigrationNonnull String baz) { }
+
+    public void bar2(@MyNonnull String baz) { }
+
+    public void bar3(@MyNonnull String baz) {}
+
+    public void bar4(@MyNonnull String baz) {}
+}
+
+// FILE: C.java
+public class C extends A {
+    @MyMigrationNullable
+    public String foo4() { return ""; }
+
+    public void bar4(@MyMigrationNonnull String baz) {}
+}
+
+// FILE: main.kt
+fun main(b: B, c: C) {
+    b.foo()<!UNSAFE_CALL!>.<!>length
+    b.foo()?.length
+    b.foo2()<!UNSAFE_CALL!>.<!>length
+    b.foo2()?.length
+    b.foo3()<!UNSAFE_CALL!>.<!>length
+    b.foo3()?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>b.foo4()<!>.length
+    b.foo4()?.length
+
+    b.bar(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+    b.bar("")
+    b.bar2(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+    b.bar2("")
+    b.bar3(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+    b.bar3("")
+    b.bar4(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>)
+    b.bar4("")
+
+    c.foo4()<!UNSAFE_CALL!>.<!>length
+    c.foo4()?.length
+    c.bar4(<!NULL_FOR_NONNULL_TYPE!>null<!>)
+    c.bar4("")
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/overrideConflicts.txt

@@ -0,0 +1,48 @@
+package
+
+public fun main(/*0*/ b: B, /*1*/ c: C): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    public open fun bar(/*0*/ @MyNonnull baz: kotlin.String!): kotlin.Unit
+    public open fun bar2(/*0*/ @MyMigrationNonnull baz: kotlin.String): kotlin.Unit
+    public open fun bar3(/*0*/ @javax.annotation.Nonnull baz: kotlin.String): kotlin.Unit
+    public open fun bar4(/*0*/ baz: kotlin.String!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyNullable public open fun foo(): kotlin.String!
+    @MyMigrationNullable public open fun foo2(): kotlin.String?
+    @javax.annotation.Nullable public open fun foo3(): kotlin.String?
+    public open fun foo4(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class B : A {
+    public constructor B()
+    public open override /*1*/ fun bar(/*0*/ @MyMigrationNonnull baz: kotlin.String): kotlin.Unit
+    public open override /*1*/ fun bar2(/*0*/ @MyNonnull baz: kotlin.String): kotlin.Unit
+    public open override /*1*/ fun bar3(/*0*/ @MyNonnull baz: kotlin.String): kotlin.Unit
+    public open override /*1*/ fun bar4(/*0*/ @MyNonnull baz: kotlin.String!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open override /*1*/ fun foo(): kotlin.String?
+    @MyNullable public open override /*1*/ fun foo2(): kotlin.String?
+    @MyNullable public open override /*1*/ fun foo3(): kotlin.String?
+    @MyNullable public open override /*1*/ fun foo4(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
+public open class C : A {
+    public constructor C()
+    public open override /*1*/ /*fake_override*/ fun bar(/*0*/ @MyNonnull baz: kotlin.String!): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun bar2(/*0*/ @MyMigrationNonnull baz: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun bar3(/*0*/ @javax.annotation.Nonnull baz: kotlin.String): kotlin.Unit
+    public open override /*1*/ fun bar4(/*0*/ @MyMigrationNonnull baz: kotlin.String): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyNullable public open override /*1*/ /*fake_override*/ fun foo(): kotlin.String!
+    @MyMigrationNullable public open override /*1*/ /*fake_override*/ fun foo2(): kotlin.String?
+    @javax.annotation.Nullable public open override /*1*/ /*fake_override*/ fun foo3(): kotlin.String?
+    @MyMigrationNullable public open override /*1*/ fun foo4(): kotlin.String?
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.kt

@@ -0,0 +1,37 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT ignore
+// JSR305_MIGRATION_REPORT ignore
+// JSR305_SPECIAL_REPORT MyNonnull:warn, MyMigrationNonnull:strict
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    a.foo("", null).length
+    a.foo(<!NULL_FOR_NONNULL_TYPE!>null<!>, "").length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    a.field.length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/specialCollision.txt

@@ -0,0 +1,13 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String!
+    @MyNonnull @MyMigrationNonnull public open fun bar(): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.kt

@@ -0,0 +1,57 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
+// JSR305_GLOBAL_REPORT ignore
+// JSR305_MIGRATION_REPORT warn
+// JSR305_SPECIAL_REPORT MyNonnull:strict
+
+// FILE: A.java
+
+import javax.annotation.*;
+
+public class A {
+    @MyMigrationNullable public String field = null;
+
+    @MyMigrationNullable
+    public String foo(@MyMigrationNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyMigrationNonnull
+    public String bar() {
+        return "";
+    }
+
+    @MyNullable public String field2 = null;
+    @MyNullable
+    public String foo2(@MyNonnull String x, CharSequence y) {
+        return "";
+    }
+
+    @MyNonnull
+    public String bar2() {
+        return "";
+    }
+}
+
+// FILE: main.kt
+
+fun main(a: A) {
+    a.foo("", null)?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo("", null)<!>.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.foo(<!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>null<!>, "")<!>.length
+
+    a.bar().length
+    a.bar()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field?.length
+    <!NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS!>a.field<!>.length
+
+    a.foo2("", null)?.length
+    a.foo2("", null).length
+    a.foo2(<!NULL_FOR_NONNULL_TYPE!>null<!>, "").length
+
+    a.bar2().length
+    a.bar2()<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+
+    a.field2?.length
+    a.field2.length
+}

compiler/testData/foreignAnnotations/tests/jsr305NullabilityWarnings/migration/stateRefinement.txt

@@ -0,0 +1,16 @@
+package
+
+public fun main(/*0*/ a: A): kotlin.Unit
+
+public open class A {
+    public constructor A()
+    @MyMigrationNullable public final var field: kotlin.String!
+    @MyNullable public final var field2: kotlin.String!
+    @MyMigrationNonnull public open fun bar(): kotlin.String!
+    @MyNonnull public open fun bar2(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    @MyMigrationNullable public open fun foo(/*0*/ @MyMigrationNonnull x: kotlin.String!, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    @MyNullable public open fun foo2(/*0*/ @MyNonnull x: kotlin.String, /*1*/ y: kotlin.CharSequence!): kotlin.String!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}