diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt index 006da1e852e..c2a98ea6dd1 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.kt @@ -3,7 +3,7 @@ import org.jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt index 91b6b1ccdc1..76ce0f0969e 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/annotatedWildcards.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ aAnyNotNullNotNullNotNull: A, /*5*/ aAnyNotNullNotNullNull: A, /*6*/ aAnyNotNullNullNotNull: A, /*7*/ aAnyNotNullNullNull: A, /*8*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() 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/foreignAnnotationsJava8/tests/jspecify/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt index 92a91d7f78c..dffa595aee2 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.kt @@ -13,13 +13,13 @@ public class A { @DefaultNullable public String everythingNullable(String x) { return ""; } - @DefaultNullnessUnknown + @DefaultNullnessUnspecified public String everythingUnknown(String x) { return ""; } @DefaultNullable public String mixed(@NotNull String x) { return ""; } - public String explicitlyNullnessUnknown(@NullnessUnknown String x) { return ""; } + public String explicitlyNullnessUnspecified(@NullnessUnspecified String x) { return ""; } } // FILE: main.kt @@ -39,9 +39,9 @@ fun main(a: A) { a.mixed(null)?.length a.mixed("")?.length - a.explicitlyNullnessUnknown("").length - a.explicitlyNullnessUnknown("")?.length - a.explicitlyNullnessUnknown(null).length + a.explicitlyNullnessUnspecified("").length + a.explicitlyNullnessUnspecified("")?.length + a.explicitlyNullnessUnspecified(null).length a.defaultField?.length a.defaultField.length diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt index ebf64e9da09..866e8013252 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/defaults.txt @@ -9,8 +9,8 @@ public fun main(/*0*/ a: A): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: kotlin.String): kotlin.String @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String?): @org.jspecify.annotations.DefaultNullable kotlin.String? - @org.jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnknown kotlin.String! - public open fun explicitlyNullnessUnknown(/*0*/ @org.jspecify.annotations.NullnessUnknown x: @org.jspecify.annotations.NullnessUnknown kotlin.String!): kotlin.String + @org.jspecify.annotations.DefaultNullnessUnspecified public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnspecified kotlin.String! + public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified kotlin.String!): kotlin.String public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @org.jspecify.annotations.DefaultNullable public open fun mixed(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String): @org.jspecify.annotations.DefaultNullable kotlin.String? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt index 17e83691542..b1f175ffd44 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.kt @@ -8,7 +8,7 @@ public class A { @Nullable public String field = null; @Nullable - public String foo(@NotNull String x, @NullnessUnknown CharSequence y) { + public String foo(@NotNull String x, @NullnessUnspecified CharSequence y) { return ""; } @@ -23,7 +23,7 @@ public class A { @DefaultNullable public String everythingNullable(String x) { return ""; } - @DefaultNullnessUnknown + @DefaultNullnessUnspecified public String everythingUnknown(String x) { return ""; } } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt index 10bd7f8e480..097823ad6f3 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/ignoreAnnotations.txt @@ -9,8 +9,8 @@ public open class A { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @org.jspecify.annotations.DefaultNotNull public open fun everythingNotNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNotNull kotlin.String! @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String! - @org.jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnknown kotlin.String! - @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!, /*1*/ @org.jspecify.annotations.NullnessUnknown y: @org.jspecify.annotations.NullnessUnknown kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String! + @org.jspecify.annotations.DefaultNullnessUnspecified public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnspecified kotlin.String! + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified kotlin.CharSequence!): @org.jspecify.annotations.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/foreignAnnotationsJava8/tests/jspecify/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt index 6e5260b99a1..362671f638f 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.kt @@ -7,7 +7,7 @@ public class A { @Nullable public String field = null; @Nullable - public String foo(@NotNull String x, @NullnessUnknown CharSequence y) { + public String foo(@NotNull String x, @NullnessUnspecified CharSequence y) { return ""; } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt index 6607178b3f3..54550245d33 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/simple.txt @@ -7,7 +7,7 @@ public open class A { @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String? @org.jspecify.annotations.NotNull public open fun bar(): @org.jspecify.annotations.NotNull kotlin.String public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String, /*1*/ @org.jspecify.annotations.NullnessUnknown y: @org.jspecify.annotations.NullnessUnknown kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String? + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified kotlin.CharSequence!): @org.jspecify.annotations.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/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt index 5eed26f0bfa..51a5ab27255 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.kt @@ -3,7 +3,7 @@ import org.jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java @@ -28,7 +28,7 @@ public class C { import org.jspecify.annotations.*; -@DefaultNullnessUnknown +@DefaultNullnessUnspecified public class D { public void bar(A a) {} } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt index 0b88053485a..cfc16087441 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/typeArgumentsFromParameterBounds.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B, /*5*/ c: C, /*6*/ d: D): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() 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/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt index 808ac0f9111..4cb8e4199ed 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.kt @@ -4,7 +4,7 @@ import org.jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt index 41f2380a39c..a8275c2f438 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/annotatedWildcards.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ aAnyNotNullNotNullNotNull: A, /*5*/ aAnyNotNullNotNullNull: A, /*6*/ aAnyNotNullNullNotNull: A, /*7*/ aAnyNotNullNullNull: A, /*8*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() 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/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt index 409e5868839..7c278d13a70 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.kt @@ -14,13 +14,13 @@ public class A { @DefaultNullable public String everythingNullable(String x) { return ""; } - @DefaultNullnessUnknown + @DefaultNullnessUnspecified public String everythingUnknown(String x) { return ""; } @DefaultNullable public String mixed(@NotNull String x) { return ""; } - public String explicitlyNullnessUnknown(@NullnessUnknown String x) { return ""; } + public String explicitlyNullnessUnspecified(@NullnessUnspecified String x) { return ""; } } // FILE: main.kt @@ -40,9 +40,9 @@ fun main(a: A) { a.mixed(null)?.length a.mixed("")?.length - a.explicitlyNullnessUnknown("").length - a.explicitlyNullnessUnknown("")?.length - a.explicitlyNullnessUnknown(null).length + a.explicitlyNullnessUnspecified("").length + a.explicitlyNullnessUnspecified("")?.length + a.explicitlyNullnessUnspecified(null).length a.defaultField?.length a.defaultField.length diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt index 95a2cdcbf65..3e24752045e 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/defaults.txt @@ -9,8 +9,8 @@ public fun main(/*0*/ a: A): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: kotlin.String!): kotlin.String! @org.jspecify.annotations.DefaultNullable public open fun everythingNullable(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String! - @org.jspecify.annotations.DefaultNullnessUnknown public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnknown kotlin.String! - public open fun explicitlyNullnessUnknown(/*0*/ @org.jspecify.annotations.NullnessUnknown x: @org.jspecify.annotations.NullnessUnknown kotlin.String!): kotlin.String! + @org.jspecify.annotations.DefaultNullnessUnspecified public open fun everythingUnknown(/*0*/ x: kotlin.String!): @org.jspecify.annotations.DefaultNullnessUnspecified kotlin.String! + public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified kotlin.String!): kotlin.String! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @org.jspecify.annotations.DefaultNullable public open fun mixed(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!): @org.jspecify.annotations.DefaultNullable kotlin.String! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt index 6f2a0e8f733..ba06ae398a8 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.kt @@ -8,7 +8,7 @@ public class A { @Nullable public String field = null; @Nullable - public String foo(@NotNull String x, @NullnessUnknown CharSequence y) { + public String foo(@NotNull String x, @NullnessUnspecified CharSequence y) { return ""; } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt index 7eaff58916c..6a6145002ee 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/simple.txt @@ -7,7 +7,7 @@ public open class A { @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable kotlin.String! @org.jspecify.annotations.NotNull public open fun bar(): @org.jspecify.annotations.NotNull kotlin.String! public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!, /*1*/ @org.jspecify.annotations.NullnessUnknown y: @org.jspecify.annotations.NullnessUnknown kotlin.CharSequence!): @org.jspecify.annotations.Nullable kotlin.String! + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ @org.jspecify.annotations.NotNull x: @org.jspecify.annotations.NotNull kotlin.String!, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified kotlin.CharSequence!): @org.jspecify.annotations.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/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt index c065a64907c..58f69fdd7de 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.kt @@ -4,7 +4,7 @@ import org.jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java @@ -29,7 +29,7 @@ public class C { import org.jspecify.annotations.*; -@DefaultNullnessUnknown +@DefaultNullnessUnspecified public class D { public void bar(A a) {} } diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt index 94badfa0556..afefd178767 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/typeArgumentsFromParameterBounds.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B, /*5*/ c: C, /*6*/ d: D): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() 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 @@ -25,7 +25,7 @@ public open class A!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt index 0f017db21f6..fda5849b745 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.kt @@ -4,7 +4,7 @@ import org.jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt index c8aecbb1265..97f1cbbe7c3 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/warnings/wildcardsWithDefault.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() 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/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt index 81a0dcef91a..a58e14cb1a7 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.kt @@ -3,7 +3,7 @@ import org.jspecify.annotations.*; -public class A { +public class A { } // FILE: B.java diff --git a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt index f9bf76b8aa3..5b05a94efcd 100644 --- a/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt +++ b/compiler/testData/foreignAnnotationsJava8/tests/jspecify/wildcardsWithDefault.txt @@ -2,8 +2,8 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: B): kotlin.Unit -public open class A { - public constructor A() +public open class A { + public constructor A() 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 @@ -13,7 +13,7 @@ public open class B { public constructor B() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @org.jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A): kotlin.Unit + @org.jspecify.annotations.DefaultNotNull public open fun noBoundsNotNull(/*0*/ a: A): kotlin.Unit @org.jspecify.annotations.DefaultNullable public open fun noBoundsNullable(/*0*/ a: A?): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt index f5f1a937c3a..31bb7beb2ee 100644 --- a/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt +++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt @@ -20,11 +20,11 @@ import org.jetbrains.kotlin.name.FqName val JSPECIFY_NULLABLE = FqName("org.jspecify.annotations.Nullable") val JSPECIFY_NOT_NULL = FqName("org.jspecify.annotations.NotNull") -val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.NullnessUnknown") +val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.NullnessUnspecified") val JSPECIFY_DEFAULT_NULLABLE = FqName("org.jspecify.annotations.DefaultNullable") val JSPECIFY_DEFAULT_NOT_NULL = FqName("org.jspecify.annotations.DefaultNotNull") -val JSPECIFY_DEFAULT_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.DefaultNullnessUnknown") +val JSPECIFY_DEFAULT_NULLNESS_UNKNOWN = FqName("org.jspecify.annotations.DefaultNullnessUnspecified") val NULLABLE_ANNOTATIONS = listOf( JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION, diff --git a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnknown.java b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java similarity index 93% rename from third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnknown.java rename to third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java index be9abc4e00f..82967620dd4 100644 --- a/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnknown.java +++ b/third-party/jdk8-annotations/org/jspecify/annotations/DefaultNullnessUnspecified.java @@ -14,6 +14,6 @@ import java.lang.annotation.ElementType; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER, ElementType.CONSTRUCTOR, ElementType.PACKAGE, ElementType.TYPE}) -public @interface DefaultNullnessUnknown { +public @interface DefaultNullnessUnspecified { } diff --git a/third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnknown.java b/third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnspecified.java similarity index 93% rename from third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnknown.java rename to third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnspecified.java index cf8e2c2ef99..34a3eab9a81 100644 --- a/third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnknown.java +++ b/third-party/jdk8-annotations/org/jspecify/annotations/NullnessUnspecified.java @@ -14,6 +14,6 @@ import java.lang.annotation.ElementType; @Documented @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE_USE, ElementType.PARAMETER}) -public @interface NullnessUnknown { +public @interface NullnessUnspecified { }