From 2694bdeb92c01d305bcf71579caf48ec63c20be4 Mon Sep 17 00:00:00 2001 From: Kevin Bourrillion Date: Mon, 12 Dec 2022 19:04:17 -0800 Subject: [PATCH] Change to use new JSpecify package location. --- .../jspecify/moduleAnnotations/strict/basic.kt | 2 +- .../strict/composeWithClassDefaultAnnotation.kt | 4 ++-- .../strict/composeWithClassDefaultAnnotation.txt | 2 +- .../composeWithPackageDefaultAnnotation.kt | 4 ++-- .../strict/dependentModulesNoNullMarked.kt | 2 +- .../strict/dependentModulesNullMarked.kt | 2 +- ...leAnnotationToAnotherModuleWithSamePackage.kt | 2 +- .../moduleAnnotations/strict/dotNamedModule.kt | 2 +- .../strict/inheritanceAcrossModules.kt | 2 +- .../moduleAnnotations/strict/nestedClasses.kt | 2 +- .../strict/overrideAtDeclarationLevel.kt | 4 ++-- .../strict/overrideAtDeclarationLevel.txt | 2 +- .../strict/severalModulesDifferentPackages.kt | 2 +- .../jspecify/moduleAnnotations/warn/basic.fir.kt | 2 +- .../jspecify/moduleAnnotations/warn/basic.kt | 2 +- .../composeWithClassDefaultAnnotation.fir.kt | 4 ++-- .../warn/composeWithClassDefaultAnnotation.kt | 4 ++-- .../warn/composeWithClassDefaultAnnotation.txt | 2 +- .../composeWithPackageDefaultAnnotation.fir.kt | 4 ++-- .../warn/composeWithPackageDefaultAnnotation.kt | 4 ++-- .../warn/dependentModulesNoNullMarked.kt | 2 +- .../warn/dependentModulesNullMarked.fir.kt | 2 +- .../warn/dependentModulesNullMarked.kt | 2 +- ...leAnnotationToAnotherModuleWithSamePackage.kt | 2 +- .../moduleAnnotations/warn/dotNamedModule.fir.kt | 2 +- .../moduleAnnotations/warn/dotNamedModule.kt | 2 +- .../warn/inheritanceAcrossModules.fir.kt | 2 +- .../warn/inheritanceAcrossModules.kt | 2 +- .../moduleAnnotations/warn/nestedClasses.fir.kt | 2 +- .../moduleAnnotations/warn/nestedClasses.kt | 2 +- .../warn/overrideAtDeclarationLevel.kt | 4 ++-- .../warn/overrideAtDeclarationLevel.txt | 2 +- .../warn/severalModulesDifferentPackages.fir.kt | 2 +- .../warn/severalModulesDifferentPackages.kt | 2 +- .../java8Tests/jspecify/default.fir.kt | 2 +- .../java8Tests/jspecify/default.kt | 2 +- .../java8Tests/jspecify/default.txt | 2 +- .../strictMode/AnnotatedBoundsOfWildcard.fir.kt | 4 ++-- .../strictMode/AnnotatedBoundsOfWildcard.kt | 4 ++-- .../strictMode/AnnotatedBoundsOfWildcard.txt | 16 ++++++++-------- .../java8Tests/jspecify/strictMode/Captured.kt | 2 +- .../java8Tests/jspecify/strictMode/Captured.txt | 2 +- .../java8Tests/jspecify/strictMode/Defaults.kt | 2 +- .../java8Tests/jspecify/strictMode/Defaults.txt | 12 ++++++------ .../jspecify/strictMode/IgnoreAnnotations.kt | 2 +- .../jspecify/strictMode/IgnoreAnnotations.txt | 10 +++++----- .../strictMode/NonPlatformTypeParameter.kt | 2 +- .../NullnessUnspecifiedTypeParameter.fir.kt | 2 +- .../NullnessUnspecifiedTypeParameter.kt | 2 +- .../NullnessUnspecifiedTypeParameter.txt | 2 +- .../jspecify/strictMode/SelfType.fir.kt | 8 ++++---- .../java8Tests/jspecify/strictMode/SelfType.kt | 8 ++++---- .../java8Tests/jspecify/strictMode/SelfType.txt | 12 ++++++------ .../java8Tests/jspecify/strictMode/Simple.kt | 2 +- .../java8Tests/jspecify/strictMode/Simple.txt | 6 +++--- .../TypeArgumentsFromParameterBounds.fir.kt | 6 +++--- .../TypeArgumentsFromParameterBounds.kt | 6 +++--- .../TypeArgumentsFromParameterBounds.txt | 6 +++--- .../strictMode/TypeParameterBounds.fir.kt | 4 ++-- .../jspecify/strictMode/TypeParameterBounds.kt | 4 ++-- .../jspecify/strictMode/TypeParameterBounds.txt | 6 +++--- .../strictMode/UnannotatedWildcard.fir.kt | 2 +- .../jspecify/strictMode/UnannotatedWildcard.kt | 2 +- .../jspecify/strictMode/UnannotatedWildcard.txt | 4 ++-- .../jspecify/strictMode/WildcardsWithDefault.kt | 4 ++-- .../jspecify/strictMode/WildcardsWithDefault.txt | 8 ++++---- .../java8Tests/jspecify/strictMode/kt47396.kt | 4 ++-- .../java8Tests/jspecify/strictMode/kt47396.txt | 4 ++-- .../jspecify/strictMode/kt47422.fir.kt | 14 +++++++------- .../java8Tests/jspecify/strictMode/kt47422.kt | 14 +++++++------- .../java8Tests/jspecify/strictMode/kt47422.txt | 12 ++++++------ .../java8Tests/jspecify/strictMode/kt47437.kt | 2 +- .../java8Tests/jspecify/strictMode/kt47437.txt | 2 +- .../java8Tests/jspecify/strictMode/kt48261.kt | 4 ++-- .../java8Tests/jspecify/strictMode/kt48261.txt | 4 ++-- .../warnMode/AnnotatedBoundsOfWildcard.fir.kt | 4 ++-- .../warnMode/AnnotatedBoundsOfWildcard.kt | 4 ++-- .../warnMode/AnnotatedBoundsOfWildcard.txt | 16 ++++++++-------- .../java8Tests/jspecify/warnMode/Captured.kt | 2 +- .../java8Tests/jspecify/warnMode/Captured.txt | 4 ++-- .../java8Tests/jspecify/warnMode/Defaults.fir.kt | 2 +- .../java8Tests/jspecify/warnMode/Defaults.kt | 2 +- .../java8Tests/jspecify/warnMode/Defaults.txt | 12 ++++++------ .../jspecify/warnMode/IgnoreAnnotations.fir.kt | 2 +- .../jspecify/warnMode/IgnoreAnnotations.kt | 2 +- .../jspecify/warnMode/IgnoreAnnotations.txt | 10 +++++----- .../warnMode/NonPlatformTypeParameter.fir.kt | 2 +- .../warnMode/NonPlatformTypeParameter.kt | 2 +- .../warnMode/NonPlatformTypeParameter.txt | 6 +++--- .../NullnessUnspecifiedTypeParameter.fir.kt | 2 +- .../warnMode/NullnessUnspecifiedTypeParameter.kt | 2 +- .../NullnessUnspecifiedTypeParameter.txt | 2 +- .../jspecify/warnMode/OverrideOfAnnotated.fir.kt | 2 +- .../jspecify/warnMode/OverrideOfAnnotated.kt | 2 +- .../jspecify/warnMode/OverrideOfAnnotated.txt | 16 ++++++++-------- .../java8Tests/jspecify/warnMode/SelfType.fir.kt | 8 ++++---- .../java8Tests/jspecify/warnMode/SelfType.kt | 8 ++++---- .../java8Tests/jspecify/warnMode/SelfType.txt | 12 ++++++------ .../java8Tests/jspecify/warnMode/Simple.fir.kt | 2 +- .../java8Tests/jspecify/warnMode/Simple.kt | 2 +- .../java8Tests/jspecify/warnMode/Simple.txt | 6 +++--- .../TypeArgumentsFromParameterBounds.fir.kt | 6 +++--- .../warnMode/TypeArgumentsFromParameterBounds.kt | 6 +++--- .../TypeArgumentsFromParameterBounds.txt | 6 +++--- .../jspecify/warnMode/TypeParameterBounds.fir.kt | 4 ++-- .../jspecify/warnMode/TypeParameterBounds.kt | 4 ++-- .../jspecify/warnMode/TypeParameterBounds.txt | 6 +++--- .../jspecify/warnMode/UnannotatedWildcard.kt | 2 +- .../jspecify/warnMode/UnannotatedWildcard.txt | 4 ++-- .../jspecify/warnMode/WildcardsWithDefault.kt | 4 ++-- .../jspecify/warnMode/WildcardsWithDefault.txt | 8 ++++---- .../java8Tests/jspecify/warnMode/kt47899.fir.kt | 2 +- .../java8Tests/jspecify/warnMode/kt47899.kt | 2 +- .../java8Tests/jspecify/warnMode/kt47899.txt | 2 +- 114 files changed, 245 insertions(+), 245 deletions(-) diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt index f92df8709bf..3be7e28e0c8 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/basic.kt @@ -3,7 +3,7 @@ // JSPECIFY_STATE: strict // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt index 8fe4f23b447..ae7c9e1dbee 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.kt @@ -3,7 +3,7 @@ // JSPECIFY_STATE: strict // FILE: sandbox/test/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -14,7 +14,7 @@ module sandbox { // FILE: sandbox/test/Test.java package test; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked public class Test { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt index c110723f194..d0b209c7895 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithClassDefaultAnnotation.txt @@ -4,7 +4,7 @@ public fun main(/*0*/ x: test.Test): kotlin.Unit package test { - @org.jspecify.nullness.NullMarked public open class Test { + @org.jspecify.annotations.NullMarked public open class Test { public constructor Test() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun foo(/*0*/ x: kotlin.Int): kotlin.Unit diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt index 9441aca3cbd..09d8b831346 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/composeWithPackageDefaultAnnotation.kt @@ -3,7 +3,7 @@ // JSPECIFY_STATE: strict // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -15,7 +15,7 @@ module sandbox { @NullMarked package test; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; // FILE: sandbox/test/Test.java package test; diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt index 400a55791e4..4658a0bf521 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNoNullMarked.kt @@ -4,7 +4,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt index dba69d55fd8..f430cf9616d 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dependentModulesNullMarked.kt @@ -9,7 +9,7 @@ module module1 { // MODULE: module2(module1) // FILE: module2/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module2 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt index 394b4edbe35..45a6f3c1c8b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt @@ -4,7 +4,7 @@ // MODULE: sandbox // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt index 83e8d555711..c2f5fed3e54 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/dotNamedModule.kt @@ -3,7 +3,7 @@ // JSPECIFY_STATE: strict // FILE: my.sand.box/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked open module my.sand.box { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt index 32f805ed76e..263551973e3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/inheritanceAcrossModules.kt @@ -4,7 +4,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt index d682d599047..68590a83825 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/nestedClasses.kt @@ -3,7 +3,7 @@ // JSPECIFY_STATE: strict // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt index fbf83768f19..9a7d92c62e3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.kt @@ -3,7 +3,7 @@ // JSPECIFY_STATE: strict // FILE: sandbox/test/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -14,7 +14,7 @@ module sandbox { // FILE: sandbox/test/Test.java package test; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; public class Test { public void foo(@Nullable Integer x) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt index bf64fb83fac..a8614267e8b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/overrideAtDeclarationLevel.txt @@ -7,7 +7,7 @@ package test { public open class Test { public constructor Test() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable kotlin.Int?): kotlin.Unit + public open fun foo(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable kotlin.Int?): 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/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt index 245ddbfc41e..c67a8b1630f 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/strict/severalModulesDifferentPackages.kt @@ -4,7 +4,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.fir.kt index 140f5cd7446..aded29c5bb0 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.fir.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt index 3064e8cf940..9d7f54ccf1c 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/basic.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt index f04a05cbad9..72886a94ec4 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.fir.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/test/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -13,7 +13,7 @@ module sandbox { // FILE: sandbox/test/Test.java package test; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked public class Test { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt index 927b4c03a21..d37cb33438b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/test/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -13,7 +13,7 @@ module sandbox { // FILE: sandbox/test/Test.java package test; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked public class Test { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt index ed7d8b2b4da..ae5c4696afe 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithClassDefaultAnnotation.txt @@ -4,7 +4,7 @@ public fun main(/*0*/ x: test.Test): kotlin.Unit package test { - @org.jspecify.nullness.NullMarked public open class Test { + @org.jspecify.annotations.NullMarked public open class Test { public constructor Test() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun foo(/*0*/ x: kotlin.Int!): kotlin.Unit diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt index a8c6dea1146..66f20ee9650 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.fir.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -14,7 +14,7 @@ module sandbox { @NullMarked package test; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; // FILE: sandbox/test/Test.java package test; diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt index 918d2e91a41..3b2f95d3adc 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/composeWithPackageDefaultAnnotation.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -14,7 +14,7 @@ module sandbox { @NullMarked package test; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; // FILE: sandbox/test/Test.java package test; diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt index 6bb0013d7e1..61b6961b931 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNoNullMarked.kt @@ -4,7 +4,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt index 5a18583c504..556a06a959a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.fir.kt @@ -8,7 +8,7 @@ module module1 { // MODULE: module2(module1) // FILE: module2/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module2 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt index aa959d1c5aa..fec0e8cfe49 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dependentModulesNullMarked.kt @@ -8,7 +8,7 @@ module module1 { // MODULE: module2(module1) // FILE: module2/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module2 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt index e7726d31e69..7bebe651d71 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dontPropagateModuleAnnotationToAnotherModuleWithSamePackage.kt @@ -4,7 +4,7 @@ // MODULE: sandbox // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt index a6833e397c4..d968d0a5e27 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.fir.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: my.sand.box/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked open module my.sand.box { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt index da2694b8fd5..ca847481396 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/dotNamedModule.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: my.sand.box/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked open module my.sand.box { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt index b3a6eb69c54..08c14e1d661 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.fir.kt @@ -3,7 +3,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt index 1611806de25..92e68b499a7 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/inheritanceAcrossModules.kt @@ -3,7 +3,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt index 1e674e3e15a..071bf950942 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.fir.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt index 00573def489..9d3f2979d77 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/nestedClasses.kt @@ -2,7 +2,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt index 1f42a680414..02f87505284 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.kt @@ -4,7 +4,7 @@ // ALLOW_KOTLIN_PACKAGE // FILE: sandbox/test/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module sandbox { @@ -15,7 +15,7 @@ module sandbox { // FILE: sandbox/test/Test.java package test; -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; public class Test { public void foo(@Nullable Integer x) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt index f73f078d963..a282ac6d882 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/overrideAtDeclarationLevel.txt @@ -7,7 +7,7 @@ package test { public open class Test { public constructor Test() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable kotlin.Int!): kotlin.Unit + public open fun foo(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable kotlin.Int!): 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/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt index 5e99d57f9fe..95d6b052d02 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.fir.kt @@ -3,7 +3,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt index b344c490418..c8651f3a0c4 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java11Tests/jspecify/moduleAnnotations/warn/severalModulesDifferentPackages.kt @@ -3,7 +3,7 @@ // MODULE: module1 // FILE: module1/module-info.java -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked module module1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.fir.kt index 8f7790ca000..3b7be585510 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.fir.kt @@ -1,5 +1,5 @@ // FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class NullnessUnspecifiedTypeParameter { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.kt index 7b05a230ea9..aad5c65b3ae 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.kt @@ -1,5 +1,5 @@ // FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class NullnessUnspecifiedTypeParameter { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.txt index 163bebaf51d..f02c8cec823 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/default.txt @@ -2,7 +2,7 @@ package public fun main(/*0*/ a1: NullnessUnspecifiedTypeParameter, /*1*/ a2: NullnessUnspecifiedTypeParameter, /*2*/ x: Test): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class NullnessUnspecifiedTypeParameter { +@org.jspecify.annotations.NullMarked public open class NullnessUnspecifiedTypeParameter { public constructor NullnessUnspecifiedTypeParameter() public open fun bar(/*0*/ s: Test!, /*1*/ t: T!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt index f9a2370fdba..1f3b65fd0fa 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.fir.kt @@ -3,7 +3,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: AnnotatedBoundsOfWildcard.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class AnnotatedBoundsOfWildcard { @@ -25,7 +25,7 @@ public class Base {} public class Derived extends Base {} // FILE: Test.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Test { } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt index a62cdf6955b..c92ce20af99 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.kt @@ -3,7 +3,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: AnnotatedBoundsOfWildcard.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class AnnotatedBoundsOfWildcard { @@ -25,7 +25,7 @@ public class Base {} public class Derived extends Base {} // FILE: Test.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Test { } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.txt index f1c2da5e670..f78d6863679 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/AnnotatedBoundsOfWildcard.txt @@ -2,17 +2,17 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: Test, /*1*/ aNotNullNotNullNull: Test, /*2*/ aNotNullNullNotNull: Test, /*3*/ aNotNullNullNull: Test, /*4*/ aAnyNotNullNotNullNotNull: Test, /*5*/ aAnyNotNullNotNullNull: Test, /*6*/ aAnyNotNullNullNotNull: Test, /*7*/ aAnyNotNullNullNull: Test, /*8*/ b: AnnotatedBoundsOfWildcard): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class AnnotatedBoundsOfWildcard { +@org.jspecify.annotations.NullMarked public open class AnnotatedBoundsOfWildcard { public constructor AnnotatedBoundsOfWildcard() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun extendsAsIs(/*0*/ a: Test): kotlin.Unit + public open fun extendsAsIs(/*0*/ a: Test): kotlin.Unit public open fun extendsNotNull(/*0*/ a: Test): kotlin.Unit - public open fun extendsNullable(/*0*/ a: Test): kotlin.Unit + public open fun extendsNullable(/*0*/ a: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open fun noBounds(/*0*/ a: Test): kotlin.Unit - public open fun superAsIs(/*0*/ a: Test): kotlin.Unit + public open fun noBounds(/*0*/ a: Test): kotlin.Unit + public open fun superAsIs(/*0*/ a: Test): kotlin.Unit public open fun superNotNull(/*0*/ a: Test): kotlin.Unit - public open fun superNullable(/*0*/ a: Test): kotlin.Unit + public open fun superNullable(/*0*/ a: Test): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -30,8 +30,8 @@ public open class Derived : Base { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class Test { - public constructor Test() +@org.jspecify.annotations.NullMarked public open class Test { + public constructor Test() 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/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt index f0aa0bebf42..66e10054435 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.kt @@ -10,7 +10,7 @@ public interface J1 { } // FILE: J2.java -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; public interface J2 extends J1 { } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.txt index a30bd47201f..29630d4b086 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Captured.txt @@ -1,6 +1,6 @@ package -private fun J2<*>.bar(): @org.jspecify.nullness.Nullable kotlin.Any? +private fun J2<*>.bar(): @org.jspecify.annotations.Nullable kotlin.Any? public interface J1 { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.kt index 66aeaa48b26..057e8ae7eb5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.kt @@ -3,7 +3,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: Defaults.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Defaults { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.txt index b68c64fe3a0..70252449b86 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Defaults.txt @@ -2,17 +2,17 @@ package public fun main(/*0*/ a: Defaults, /*1*/ x: Foo): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class Defaults { +@org.jspecify.annotations.NullMarked public open class Defaults { public constructor Defaults() public final var defaultField: Foo - @org.jspecify.nullness.Nullable public final var field: @org.jspecify.nullness.Nullable Foo? + @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable Foo? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: Foo): Foo - @org.jspecify.nullness.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Foo?): @org.jspecify.nullness.Nullable Foo? - @org.jspecify.nullness.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): @org.jspecify.nullness.NullnessUnspecified Foo! - public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): Foo + @org.jspecify.annotations.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable Foo?): @org.jspecify.annotations.Nullable Foo? + @org.jspecify.annotations.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): @org.jspecify.annotations.NullnessUnspecified Foo! + public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): Foo public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @org.jspecify.nullness.Nullable public open fun mixed(/*0*/ x: Foo): @org.jspecify.nullness.Nullable Foo? + @org.jspecify.annotations.Nullable public open fun mixed(/*0*/ x: Foo): @org.jspecify.annotations.Nullable Foo? public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.kt index 0d24a58285e..dc78d29e5a6 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.kt @@ -3,7 +3,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: IgnoreAnnotations.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class IgnoreAnnotations { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.txt index 10890003f07..adac96bff8f 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/IgnoreAnnotations.txt @@ -18,14 +18,14 @@ public open class Derived : Base { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class IgnoreAnnotations { +@org.jspecify.annotations.NullMarked public open class IgnoreAnnotations { public constructor IgnoreAnnotations() - @org.jspecify.nullness.Nullable public final var field: @org.jspecify.nullness.Nullable Derived? + @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable Derived? public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: Derived): Derived - @org.jspecify.nullness.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Derived?): @org.jspecify.nullness.Nullable Derived? - @org.jspecify.nullness.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Derived!): @org.jspecify.nullness.NullnessUnspecified Derived! - @org.jspecify.nullness.Nullable public open fun foo(/*0*/ x: Derived, /*1*/ @org.jspecify.nullness.NullnessUnspecified y: @org.jspecify.nullness.NullnessUnspecified Base!): @org.jspecify.nullness.Nullable Derived? + @org.jspecify.annotations.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable Derived?): @org.jspecify.annotations.Nullable Derived? + @org.jspecify.annotations.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Derived!): @org.jspecify.annotations.NullnessUnspecified Derived! + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ x: Derived, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified Base!): @org.jspecify.annotations.Nullable Derived? 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/NonPlatformTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt index f79a6a4f077..5ce76fd29fe 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NonPlatformTypeParameter.kt @@ -4,7 +4,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: NonPlatformTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class NonPlatformTypeParameter { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt index 125c8aeea6d..2a1051d584c 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: strict // FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class NullnessUnspecifiedTypeParameter { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt index a015835f3be..d4e36edcc88 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: strict // FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class NullnessUnspecifiedTypeParameter { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.txt index 41475b86b4b..4122782d95c 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/NullnessUnspecifiedTypeParameter.txt @@ -2,7 +2,7 @@ package public fun main(/*0*/ a1: NullnessUnspecifiedTypeParameter, /*1*/ a2: NullnessUnspecifiedTypeParameter, /*2*/ x: Test): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class NullnessUnspecifiedTypeParameter { +@org.jspecify.annotations.NullMarked public open class NullnessUnspecifiedTypeParameter { public constructor NullnessUnspecifiedTypeParameter() public open fun bar(/*0*/ s: Test, /*1*/ t: T): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt index edb34a9cc8f..f7f2821a91b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: strict // FILE: SelfType.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class SelfType> { @@ -12,7 +12,7 @@ public class SelfType> { public class B extends SelfType {} // FILE: C.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class C> extends SelfType {} @@ -21,7 +21,7 @@ public class C> extends SelfType {} public class AK extends SelfType {} // FILE: AKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class AKN extends SelfType<@Nullable AK> {} @@ -32,7 +32,7 @@ public class BK extends B {} public class CK extends C {} // FILE: CKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class CKN extends C<@Nullable CK> {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt index 98ac27083e7..cb808145302 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: strict // FILE: SelfType.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class SelfType> { @@ -12,7 +12,7 @@ public class SelfType> { public class B extends SelfType {} // FILE: C.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class C> extends SelfType {} @@ -21,7 +21,7 @@ public class C> extends SelfType {} public class AK extends SelfType {} // FILE: AKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class AKN extends SelfType<@Nullable AK> {} @@ -32,7 +32,7 @@ public class BK extends B {} public class CK extends C {} // FILE: CKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class CKN extends C<@Nullable CK> {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt index 876a46667ac..8cb321ee419 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/SelfType.txt @@ -10,10 +10,10 @@ public open class AK : SelfType { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public open class AKN : SelfType<@org.jspecify.nullness.Nullable AK?> { +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.nullness.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 } @@ -34,7 +34,7 @@ public open class BK : B { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class C> : SelfType { +@org.jspecify.annotations.NullMarked public open class C> : SelfType { public constructor C>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit @@ -50,15 +50,15 @@ public open class CK : C { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public open class CKN : C<@org.jspecify.nullness.Nullable CK?> { +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.nullness.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 } -@org.jspecify.nullness.NullMarked public open class SelfType> { +@org.jspecify.annotations.NullMarked public open class SelfType> { public constructor SelfType>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun foo(/*0*/ t: T): kotlin.Unit diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.kt index b51c622f6d4..1e3d815b94a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.kt @@ -3,7 +3,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: Simple.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Simple { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.txt index 18d82bc6747..414a268fb3a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/Simple.txt @@ -17,12 +17,12 @@ public open class Derived : Base { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class Simple { +@org.jspecify.annotations.NullMarked public open class Simple { public constructor Simple() - @org.jspecify.nullness.Nullable public final var field: @org.jspecify.nullness.Nullable Derived? + @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable Derived? public open fun bar(): Derived public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jspecify.nullness.Nullable public open fun foo(/*0*/ x: Derived, /*1*/ @org.jspecify.nullness.NullnessUnspecified y: @org.jspecify.nullness.NullnessUnspecified Base!): @org.jspecify.nullness.Nullable Derived? + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ x: Derived, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified Base!): @org.jspecify.annotations.Nullable Derived? 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/TypeArgumentsFromParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt index 9a8a975a0fc..3bb3cb67c41 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.fir.kt @@ -3,13 +3,13 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: TypeArgumentsFromParameterBounds.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class TypeArgumentsFromParameterBounds {} // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -17,7 +17,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class B { public void bar(TypeArgumentsFromParameterBounds a) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt index 6015fc5136d..641e0fc910e 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.kt @@ -3,13 +3,13 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: TypeArgumentsFromParameterBounds.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class TypeArgumentsFromParameterBounds {} // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -17,7 +17,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class B { public void bar(TypeArgumentsFromParameterBounds a) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.txt index 39147e078ca..47d66a1ccd8 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeArgumentsFromParameterBounds.txt @@ -2,7 +2,7 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: TypeArgumentsFromParameterBounds, /*1*/ aNotNullNotNullNull: TypeArgumentsFromParameterBounds, /*2*/ aNotNullNullNotNull: TypeArgumentsFromParameterBounds, /*3*/ aNotNullNullNull: TypeArgumentsFromParameterBounds, /*4*/ a: A, /*5*/ b: B): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class A { +@org.jspecify.annotations.NullMarked public open class A { public constructor A() public open fun bar(/*0*/ a: TypeArgumentsFromParameterBounds): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -25,8 +25,8 @@ public open class Test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class TypeArgumentsFromParameterBounds { - public constructor TypeArgumentsFromParameterBounds() +@org.jspecify.annotations.NullMarked public open class TypeArgumentsFromParameterBounds { + public constructor TypeArgumentsFromParameterBounds() 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/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt index 468edc2c8cc..5939c0719da 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: strict // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -10,7 +10,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class B { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt index 0453bdfe237..34233bd84a5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: strict // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -10,7 +10,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class B { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.txt index d5655b46456..499bb416951 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/TypeParameterBounds.txt @@ -2,16 +2,16 @@ package public fun main(/*0*/ a1: A, /*1*/ a2: A, /*2*/ b1: B, /*3*/ b2: B, /*4*/ x: T): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class A { +@org.jspecify.annotations.NullMarked public open class A { public constructor A() public open fun bar(/*0*/ e: E): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ @org.jspecify.nullness.NullnessUnspecified t: @org.jspecify.nullness.NullnessUnspecified T!): kotlin.Unit + public open fun foo(/*0*/ @org.jspecify.annotations.NullnessUnspecified t: @org.jspecify.annotations.NullnessUnspecified T!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class B { +@org.jspecify.annotations.NullMarked public open class B { public constructor B() public open fun bar(/*0*/ e: E): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.fir.kt index f78aaad678d..6313fc4f6c9 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.fir.kt @@ -2,7 +2,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: J1.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public interface J1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.kt index 53881e2a111..9b7032da0f6 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.kt @@ -2,7 +2,7 @@ // !LANGUAGE: +TypeEnhancementImprovementsInStrictMode // FILE: J1.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public interface J1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.txt index 3b0f82a6d99..d3612c77a8c 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/UnannotatedWildcard.txt @@ -2,7 +2,7 @@ package public fun baz(/*0*/ j2: J2): kotlin.Any -@org.jspecify.nullness.NullMarked public interface J1 { +@org.jspecify.annotations.NullMarked public interface J1 { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun foo(): T public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -10,7 +10,7 @@ public fun baz(/*0*/ j2: J2): kotlin.Any } public interface J2 { - public abstract fun bar(): J1! + public abstract fun bar(): J1! 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/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt index b49a858209c..c412daf563b 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.kt @@ -3,7 +3,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: WildcardsWithDefault.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class WildcardsWithDefault { @@ -12,7 +12,7 @@ public class WildcardsWithDefault { } // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class A {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.txt index 63de62cdd61..a3a88cc0579 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/WildcardsWithDefault.txt @@ -2,19 +2,19 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: WildcardsWithDefault): 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 } -@org.jspecify.nullness.NullMarked public open class WildcardsWithDefault { +@org.jspecify.annotations.NullMarked public open class WildcardsWithDefault { public constructor WildcardsWithDefault() 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 noBoundsNotNull(/*0*/ a: A<*, *, *>): kotlin.Unit - public open fun noBoundsNullable(/*0*/ a: A): kotlin.Unit + public open fun noBoundsNullable(/*0*/ a: A): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt index e5734067dad..e84156a4e54 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.kt @@ -4,7 +4,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: Foo.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public interface Foo { @@ -12,7 +12,7 @@ public interface Foo { } // FILE: Bar.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public interface Bar {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.txt index 70bcc842f87..8e886aee119 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47396.txt @@ -2,13 +2,13 @@ package public fun test(/*0*/ foo: Foo, /*1*/ bar: Bar): kotlin.Unit -@org.jspecify.nullness.NullMarked public interface Bar { +@org.jspecify.annotations.NullMarked public interface Bar { 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 } -@org.jspecify.nullness.NullMarked public interface Foo { +@org.jspecify.annotations.NullMarked public interface Foo { 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 fun test(/*0*/ list: Bar<*>): kotlin.Unit diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.fir.kt index 8629d6caf57..43253623bd3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.fir.kt @@ -4,7 +4,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: Foo.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public interface Foo {} @@ -16,7 +16,7 @@ public class Util { } // FILE: UtilNullMarked.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarked { @@ -26,7 +26,7 @@ public class UtilNullMarked { } // FILE: UtilNullMarkedGeneric.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarkedGeneric { @@ -36,7 +36,7 @@ public class UtilNullMarkedGeneric { } // FILE: UtilNullMarkedGenericNullableBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarkedGenericNullableBound { @@ -46,7 +46,7 @@ public class UtilNullMarkedGenericNullableBound { } // FILE: UtilGenericNullableBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class UtilGenericNullableBound { public static Foo getFooOfK() { @@ -55,7 +55,7 @@ public class UtilGenericNullableBound { } // FILE: UtilNullMarkedGenericNullnessUnspecifiedBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarkedGenericNullnessUnspecifiedBound { @@ -65,7 +65,7 @@ public class UtilNullMarkedGenericNullnessUnspecifiedBound { } // FILE: UtilGenericNullnessUnspecifiedBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class UtilGenericNullnessUnspecifiedBound { public static Foo getFooOfK() { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.kt index ff0f52fa648..75c8a1e2be9 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.kt @@ -4,7 +4,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: Foo.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public interface Foo {} @@ -16,7 +16,7 @@ public class Util { } // FILE: UtilNullMarked.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarked { @@ -26,7 +26,7 @@ public class UtilNullMarked { } // FILE: UtilNullMarkedGeneric.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarkedGeneric { @@ -36,7 +36,7 @@ public class UtilNullMarkedGeneric { } // FILE: UtilNullMarkedGenericNullableBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarkedGenericNullableBound { @@ -46,7 +46,7 @@ public class UtilNullMarkedGenericNullableBound { } // FILE: UtilGenericNullableBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class UtilGenericNullableBound { public static Foo getFooOfK() { @@ -55,7 +55,7 @@ public class UtilGenericNullableBound { } // FILE: UtilNullMarkedGenericNullnessUnspecifiedBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class UtilNullMarkedGenericNullnessUnspecifiedBound { @@ -65,7 +65,7 @@ public class UtilNullMarkedGenericNullnessUnspecifiedBound { } // FILE: UtilGenericNullnessUnspecifiedBound.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class UtilGenericNullnessUnspecifiedBound { public static Foo getFooOfK() { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.txt index 38dfd8a110e..5cb4f82b586 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47422.txt @@ -42,10 +42,10 @@ public open class UtilGenericNullnessUnspecifiedBound { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public open fun getFooOfK(): Foo! + public open fun getFooOfK(): Foo! } -@org.jspecify.nullness.NullMarked public open class UtilNullMarked { +@org.jspecify.annotations.NullMarked public open class UtilNullMarked { public constructor UtilNullMarked() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -55,7 +55,7 @@ public open class UtilGenericNullnessUnspecifiedBound { public open fun getFooOfString(): Foo } -@org.jspecify.nullness.NullMarked public open class UtilNullMarkedGeneric { +@org.jspecify.annotations.NullMarked public open class UtilNullMarkedGeneric { public constructor UtilNullMarkedGeneric() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -65,7 +65,7 @@ public open class UtilGenericNullnessUnspecifiedBound { public open fun getFooOfK(): Foo } -@org.jspecify.nullness.NullMarked public open class UtilNullMarkedGenericNullableBound { +@org.jspecify.annotations.NullMarked public open class UtilNullMarkedGenericNullableBound { public constructor UtilNullMarkedGenericNullableBound() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -75,13 +75,13 @@ public open class UtilGenericNullnessUnspecifiedBound { public open fun getFooOfK(): Foo } -@org.jspecify.nullness.NullMarked public open class UtilNullMarkedGenericNullnessUnspecifiedBound { +@org.jspecify.annotations.NullMarked public open class UtilNullMarkedGenericNullnessUnspecifiedBound { public constructor UtilNullMarkedGenericNullnessUnspecifiedBound() 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 // Static members - public open fun getFooOfK(): Foo + public open fun getFooOfK(): Foo } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.kt index cea3e05bba3..cd3e5479ff2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.kt @@ -4,7 +4,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: Foo.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Foo { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.txt index da6e80b8960..c51bfc571e1 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt47437.txt @@ -2,7 +2,7 @@ package public fun test(): Foo -@org.jspecify.nullness.NullMarked public open class Foo { +@org.jspecify.annotations.NullMarked public open class Foo { public constructor Foo() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.kt index 078af3fac89..a275476246d 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.kt @@ -7,7 +7,7 @@ // FILE: MyCollection.java import java.util.AbstractCollection; import javax.annotation.CheckForNull; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked public abstract class MyCollection extends AbstractCollection { @@ -21,7 +21,7 @@ public abstract class MyCollection extends AbstractCollection { import java.util.AbstractCollection; import java.util.List; import javax.annotation.CheckForNull; -import org.jspecify.nullness.NullMarked; +import org.jspecify.annotations.NullMarked; @NullMarked public abstract class MyList extends MyCollection implements List { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.txt index 21d01549f39..6b7a8e60cdc 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/strictMode/kt48261.txt @@ -2,7 +2,7 @@ package public fun go(/*0*/ myList: MyList, /*1*/ string: kotlin.String): kotlin.Boolean -@org.jspecify.nullness.NullMarked public abstract class MyCollection : java.util.AbstractCollection { +@org.jspecify.annotations.NullMarked public abstract class MyCollection : java.util.AbstractCollection { public constructor MyCollection() public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: E!): kotlin.Boolean @@ -32,7 +32,7 @@ public fun go(/*0*/ myList: MyList, /*1*/ string: kotlin.String): invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int } -@org.jspecify.nullness.NullMarked public abstract class MyList : MyCollection, kotlin.collections.MutableList { +@org.jspecify.annotations.NullMarked public abstract class MyList : MyCollection, kotlin.collections.MutableList { 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 diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt index fb11c5e00c1..1d6a978e28e 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.fir.kt @@ -2,7 +2,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: AnnotatedBoundsOfWildcard.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class AnnotatedBoundsOfWildcard { @@ -24,7 +24,7 @@ public class Base {} public class Derived extends Base {} // FILE: Test.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Test { } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt index 7c214c08363..5b6c0d331df 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.kt @@ -2,7 +2,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: AnnotatedBoundsOfWildcard.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class AnnotatedBoundsOfWildcard { @@ -24,7 +24,7 @@ public class Base {} public class Derived extends Base {} // FILE: Test.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Test { } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.txt index 944ebff7fbd..be79aaf63b6 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/AnnotatedBoundsOfWildcard.txt @@ -2,17 +2,17 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: Test, /*1*/ aNotNullNotNullNull: Test, /*2*/ aNotNullNullNotNull: Test, /*3*/ aNotNullNullNull: Test, /*4*/ aAnyNotNullNotNullNotNull: Test, /*5*/ aAnyNotNullNotNullNull: Test, /*6*/ aAnyNotNullNullNotNull: Test, /*7*/ aAnyNotNullNullNull: Test, /*8*/ b: AnnotatedBoundsOfWildcard): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class AnnotatedBoundsOfWildcard { +@org.jspecify.annotations.NullMarked public open class AnnotatedBoundsOfWildcard { public constructor AnnotatedBoundsOfWildcard() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun extendsAsIs(/*0*/ a: Test!): kotlin.Unit + public open fun extendsAsIs(/*0*/ a: Test!): kotlin.Unit public open fun extendsNotNull(/*0*/ a: Test!): kotlin.Unit - public open fun extendsNullable(/*0*/ a: Test!): kotlin.Unit + public open fun extendsNullable(/*0*/ a: Test!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open fun noBounds(/*0*/ a: Test!): kotlin.Unit - public open fun superAsIs(/*0*/ a: Test!): kotlin.Unit + public open fun noBounds(/*0*/ a: Test!): kotlin.Unit + public open fun superAsIs(/*0*/ a: Test!): kotlin.Unit public open fun superNotNull(/*0*/ a: Test!): kotlin.Unit - public open fun superNullable(/*0*/ a: Test!): kotlin.Unit + public open fun superNullable(/*0*/ a: Test!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -30,8 +30,8 @@ public open class Derived : Base { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class Test { - public constructor Test() +@org.jspecify.annotations.NullMarked public open class Test { + public constructor Test() 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/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt index 7261ab9c634..1a1a8402eb0 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.kt @@ -10,7 +10,7 @@ public interface J1 { } // FILE: J2.java -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; public interface J2 extends J1 { } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.txt index 2b3976fc916..09b2d84b7d5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Captured.txt @@ -1,6 +1,6 @@ package -private fun J2<*>.bar(): @org.jspecify.nullness.Nullable kotlin.Any? +private fun J2<*>.bar(): @org.jspecify.annotations.Nullable kotlin.Any? public interface J1 { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -11,7 +11,7 @@ public interface J1 { @org.jetbrains.annotations.Nullable public open fun foo(/*0*/ x: J1!): @org.jetbrains.annotations.Nullable T? } -public interface J2 : J1 { +public interface J2 : J1 { 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/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.fir.kt index d08b4945416..82dbe42e587 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: Defaults.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Defaults { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.kt index e58ffb39fed..7fa6a797d3a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: Defaults.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Defaults { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.txt index 110f4bed969..6b0806a252a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Defaults.txt @@ -2,17 +2,17 @@ package public fun main(/*0*/ a: Defaults, /*1*/ x: Foo): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class Defaults { +@org.jspecify.annotations.NullMarked public open class Defaults { public constructor Defaults() public final var defaultField: Foo! - @org.jspecify.nullness.Nullable public final var field: @org.jspecify.nullness.Nullable Foo! + @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable Foo! public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: Foo!): Foo! - @org.jspecify.nullness.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Foo!): @org.jspecify.nullness.Nullable Foo! - @org.jspecify.nullness.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): @org.jspecify.nullness.NullnessUnspecified Foo! - public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): Foo! + @org.jspecify.annotations.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable Foo!): @org.jspecify.annotations.Nullable Foo! + @org.jspecify.annotations.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): @org.jspecify.annotations.NullnessUnspecified Foo! + public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): Foo! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @org.jspecify.nullness.Nullable public open fun mixed(/*0*/ x: Foo!): @org.jspecify.nullness.Nullable Foo! + @org.jspecify.annotations.Nullable public open fun mixed(/*0*/ x: Foo!): @org.jspecify.annotations.Nullable Foo! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.fir.kt index 946a4b61e1e..bb13d541c7f 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: IgnoreAnnotations.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class IgnoreAnnotations { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.kt index 1b4442ffe0b..d21b4826fab 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: IgnoreAnnotations.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class IgnoreAnnotations { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.txt index 61cbeca0771..a5ab5b3c7c2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/IgnoreAnnotations.txt @@ -18,14 +18,14 @@ public open class Derived : Base { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class IgnoreAnnotations { +@org.jspecify.annotations.NullMarked public open class IgnoreAnnotations { public constructor IgnoreAnnotations() - @org.jspecify.nullness.Nullable public final var field: @org.jspecify.nullness.Nullable Derived! + @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable Derived! public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: Derived!): Derived! - @org.jspecify.nullness.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Derived!): @org.jspecify.nullness.Nullable Derived! - @org.jspecify.nullness.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Derived!): @org.jspecify.nullness.NullnessUnspecified Derived! - @org.jspecify.nullness.Nullable public open fun foo(/*0*/ x: Derived!, /*1*/ @org.jspecify.nullness.NullnessUnspecified y: @org.jspecify.nullness.NullnessUnspecified Base!): @org.jspecify.nullness.Nullable Derived! + @org.jspecify.annotations.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable Derived!): @org.jspecify.annotations.Nullable Derived! + @org.jspecify.annotations.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Derived!): @org.jspecify.annotations.NullnessUnspecified Derived! + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ x: Derived!, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified Base!): @org.jspecify.annotations.Nullable Derived! 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/warnMode/NonPlatformTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt index c07db7b6b46..a04df4afb1a 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.fir.kt @@ -3,7 +3,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: NonPlatformTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class NonPlatformTypeParameter { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt index ebb2ef5ec16..99f321fa9c2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.kt @@ -3,7 +3,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: NonPlatformTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class NonPlatformTypeParameter { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.txt index 11a79d536a8..14795ddfbcc 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NonPlatformTypeParameter.txt @@ -2,9 +2,9 @@ package public fun main(/*0*/ a1: NonPlatformTypeParameter, /*1*/ a2: NonPlatformTypeParameter, /*2*/ x: T): kotlin.Unit -public open class NonPlatformTypeParameter { - public constructor NonPlatformTypeParameter() - public open fun bar(/*0*/ e: E!): kotlin.Unit +public open class NonPlatformTypeParameter { + public constructor NonPlatformTypeParameter() + public open fun bar(/*0*/ e: E!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun foo(/*0*/ t: T!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.fir.kt index 65e055542fa..6896a891af6 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.fir.kt @@ -1,6 +1,6 @@ // JSPECIFY_STATE: warn // FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class NullnessUnspecifiedTypeParameter { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.kt index a3154623f08..0cf04e2b781 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.kt @@ -1,6 +1,6 @@ // JSPECIFY_STATE: warn // FILE: NullnessUnspecifiedTypeParameter.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class NullnessUnspecifiedTypeParameter { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.txt index 7c801cda016..618bcaf35cc 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/NullnessUnspecifiedTypeParameter.txt @@ -2,7 +2,7 @@ package public fun main(/*0*/ a1: NullnessUnspecifiedTypeParameter, /*1*/ a2: NullnessUnspecifiedTypeParameter, /*2*/ x: Test): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class NullnessUnspecifiedTypeParameter { +@org.jspecify.annotations.NullMarked public open class NullnessUnspecifiedTypeParameter { public constructor NullnessUnspecifiedTypeParameter() public open fun bar(/*0*/ s: Test!, /*1*/ t: T!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.fir.kt index 47c613ef709..bd935e9371e 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.fir.kt @@ -4,7 +4,7 @@ public interface Foo {} // FILE: BaseClass.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class BaseClass { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.kt index 7579f0cedaf..42dad43991e 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.kt @@ -4,7 +4,7 @@ public interface Foo {} // FILE: BaseClass.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class BaseClass { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.txt index d720cc9f30c..157f49c0093 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/OverrideOfAnnotated.txt @@ -2,15 +2,15 @@ package private val FOO: FOO.`` -@org.jspecify.nullness.NullMarked public open class BaseClass { +@org.jspecify.annotations.NullMarked public open class BaseClass { public constructor BaseClass() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun everythingNotNullable(/*0*/ x: Foo!): Foo! - @org.jspecify.nullness.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Foo!): @org.jspecify.nullness.Nullable Foo! - @org.jspecify.nullness.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): @org.jspecify.nullness.NullnessUnspecified Foo! - public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): Foo! + @org.jspecify.annotations.Nullable public open fun everythingNullable(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable Foo!): @org.jspecify.annotations.Nullable Foo! + @org.jspecify.annotations.NullnessUnspecified public open fun everythingUnknown(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): @org.jspecify.annotations.NullnessUnspecified Foo! + public open fun explicitlyNullnessUnspecified(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): Foo! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @org.jspecify.nullness.Nullable public open fun mixed(/*0*/ x: Foo!): @org.jspecify.nullness.Nullable Foo! + @org.jspecify.annotations.Nullable public open fun mixed(/*0*/ x: Foo!): @org.jspecify.annotations.Nullable Foo! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } @@ -48,10 +48,10 @@ public final class WrongReturnTypes : BaseClass { public constructor WrongReturnTypes() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ fun everythingNotNullable(/*0*/ x: Foo): Foo? - @org.jspecify.nullness.Nullable public open override /*1*/ /*fake_override*/ fun everythingNullable(/*0*/ @org.jspecify.nullness.Nullable x: @org.jspecify.nullness.Nullable Foo!): @org.jspecify.nullness.Nullable Foo! - @org.jspecify.nullness.NullnessUnspecified public open override /*1*/ /*fake_override*/ fun everythingUnknown(/*0*/ @org.jspecify.nullness.NullnessUnspecified x: @org.jspecify.nullness.NullnessUnspecified Foo!): @org.jspecify.nullness.NullnessUnspecified Foo! + @org.jspecify.annotations.Nullable public open override /*1*/ /*fake_override*/ fun everythingNullable(/*0*/ @org.jspecify.annotations.Nullable x: @org.jspecify.annotations.Nullable Foo!): @org.jspecify.annotations.Nullable Foo! + @org.jspecify.annotations.NullnessUnspecified public open override /*1*/ /*fake_override*/ fun everythingUnknown(/*0*/ @org.jspecify.annotations.NullnessUnspecified x: @org.jspecify.annotations.NullnessUnspecified Foo!): @org.jspecify.annotations.NullnessUnspecified Foo! public open override /*1*/ fun explicitlyNullnessUnspecified(/*0*/ x: Foo): Foo? public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - @org.jspecify.nullness.Nullable public open override /*1*/ /*fake_override*/ fun mixed(/*0*/ x: Foo!): @org.jspecify.nullness.Nullable Foo! + @org.jspecify.annotations.Nullable public open override /*1*/ /*fake_override*/ fun mixed(/*0*/ x: Foo!): @org.jspecify.annotations.Nullable Foo! public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.fir.kt index 778782e4bcb..8b1fe789cd3 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.fir.kt @@ -2,7 +2,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: SelfType.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class SelfType> { @@ -13,7 +13,7 @@ public class SelfType> { public class B extends SelfType {} // FILE: C.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class C> extends SelfType {} @@ -22,7 +22,7 @@ public class C> extends SelfType {} public class AK extends SelfType {} // FILE: AKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class AKN extends SelfType<@Nullable AK> {} @@ -33,7 +33,7 @@ public class BK extends B {} public class CK extends C {} // FILE: CKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class CKN extends C<@Nullable CK> {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt index ce78cab1543..be27c256d37 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.kt @@ -2,7 +2,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: SelfType.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class SelfType> { @@ -13,7 +13,7 @@ public class SelfType> { public class B extends SelfType {} // FILE: C.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class C> extends SelfType {} @@ -22,7 +22,7 @@ public class C> extends SelfType {} public class AK extends SelfType {} // FILE: AKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class AKN extends SelfType<@Nullable AK> {} @@ -33,7 +33,7 @@ public class BK extends B {} public class CK extends C {} // FILE: CKN.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class CKN extends C<@Nullable CK> {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.txt index be8558b2e1f..5e6536a9891 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/SelfType.txt @@ -10,10 +10,10 @@ public open class AK : SelfType { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public open class AKN : SelfType<@org.jspecify.nullness.Nullable AK!> { +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.nullness.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 } @@ -34,7 +34,7 @@ public open class BK : B { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class C!> : SelfType { +@org.jspecify.annotations.NullMarked public open class C!> : SelfType { public constructor C!>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E!): kotlin.Unit @@ -50,15 +50,15 @@ public open class CK : C { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -public open class CKN : C<@org.jspecify.nullness.Nullable CK!> { +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.nullness.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 } -@org.jspecify.nullness.NullMarked public open class SelfType!> { +@org.jspecify.annotations.NullMarked public open class SelfType!> { public constructor SelfType!>() public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open fun foo(/*0*/ t: T!): kotlin.Unit diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.fir.kt index d83a6f47fbd..6a9d1d6f2e8 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: Simple.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Simple { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.kt index 5a73770c3d6..accbeabfc98 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: Simple.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class Simple { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.txt index 41c457dfdb8..da63cd0fa05 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/Simple.txt @@ -17,12 +17,12 @@ public open class Derived : Base { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class Simple { +@org.jspecify.annotations.NullMarked public open class Simple { public constructor Simple() - @org.jspecify.nullness.Nullable public final var field: @org.jspecify.nullness.Nullable Derived! + @org.jspecify.annotations.Nullable public final var field: @org.jspecify.annotations.Nullable Derived! public open fun bar(): Derived! public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - @org.jspecify.nullness.Nullable public open fun foo(/*0*/ x: Derived!, /*1*/ @org.jspecify.nullness.NullnessUnspecified y: @org.jspecify.nullness.NullnessUnspecified Base!): @org.jspecify.nullness.Nullable Derived! + @org.jspecify.annotations.Nullable public open fun foo(/*0*/ x: Derived!, /*1*/ @org.jspecify.annotations.NullnessUnspecified y: @org.jspecify.annotations.NullnessUnspecified Base!): @org.jspecify.annotations.Nullable Derived! 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/warnMode/TypeArgumentsFromParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt index 6113d95708c..ace2a6d2c69 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.fir.kt @@ -2,13 +2,13 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: TypeArgumentsFromParameterBounds.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class TypeArgumentsFromParameterBounds {} // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -16,7 +16,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class B { public void bar(TypeArgumentsFromParameterBounds a) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt index 662f411c049..9d1f82a49fa 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.kt @@ -2,13 +2,13 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: TypeArgumentsFromParameterBounds.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class TypeArgumentsFromParameterBounds {} // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -16,7 +16,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class B { public void bar(TypeArgumentsFromParameterBounds a) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.txt index 4478b67eabf..1c7b51074e9 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeArgumentsFromParameterBounds.txt @@ -2,7 +2,7 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: TypeArgumentsFromParameterBounds, /*1*/ aNotNullNotNullNull: TypeArgumentsFromParameterBounds, /*2*/ aNotNullNullNotNull: TypeArgumentsFromParameterBounds, /*3*/ aNotNullNullNull: TypeArgumentsFromParameterBounds, /*4*/ a: A, /*5*/ b: B): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class A { +@org.jspecify.annotations.NullMarked public open class A { public constructor A() public open fun bar(/*0*/ a: TypeArgumentsFromParameterBounds!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean @@ -25,8 +25,8 @@ public open class Test { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class TypeArgumentsFromParameterBounds { - public constructor TypeArgumentsFromParameterBounds() +@org.jspecify.annotations.NullMarked public open class TypeArgumentsFromParameterBounds { + public constructor TypeArgumentsFromParameterBounds() 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/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.fir.kt index d03604d890b..d03cbefec32 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.fir.kt @@ -1,6 +1,6 @@ // JSPECIFY_STATE: warn // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -9,7 +9,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class B { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt index c2aa20fbe18..fe856f6a4f1 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.kt @@ -1,6 +1,6 @@ // JSPECIFY_STATE: warn // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class A { @@ -9,7 +9,7 @@ public class A { } // FILE: B.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class B { public void foo(T t) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.txt index 76b1239b0a8..992ba755303 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/TypeParameterBounds.txt @@ -2,16 +2,16 @@ package public fun main(/*0*/ a1: A, /*1*/ a2: A, /*2*/ b1: B, /*3*/ b2: B, /*4*/ x: T): kotlin.Unit -@org.jspecify.nullness.NullMarked public open class A { +@org.jspecify.annotations.NullMarked public open class A { public constructor A() public open fun bar(/*0*/ e: E!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open fun foo(/*0*/ @org.jspecify.nullness.NullnessUnspecified t: @org.jspecify.nullness.NullnessUnspecified T!): kotlin.Unit + public open fun foo(/*0*/ @org.jspecify.annotations.NullnessUnspecified t: @org.jspecify.annotations.NullnessUnspecified T!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } -@org.jspecify.nullness.NullMarked public open class B { +@org.jspecify.annotations.NullMarked public open class B { public constructor B() public open fun bar(/*0*/ e: E!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.kt index 6344ec52ed3..749756a2fd2 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.kt @@ -1,7 +1,7 @@ // FIR_IDENTICAL // JSPECIFY_STATE: warn // FILE: J1.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public interface J1 { diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.txt index c29daea928d..bdfbdc40dbe 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/UnannotatedWildcard.txt @@ -2,7 +2,7 @@ package public fun baz(/*0*/ j2: J2): kotlin.Any -@org.jspecify.nullness.NullMarked public interface J1 { +@org.jspecify.annotations.NullMarked public interface J1 { public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public abstract fun foo(): T! public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int @@ -10,7 +10,7 @@ public fun baz(/*0*/ j2: J2): kotlin.Any } public interface J2 { - public abstract fun bar(): J1! + public abstract fun bar(): J1! 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/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt index 689eccab52b..7b0e5f58451 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.kt @@ -3,7 +3,7 @@ // MUTE_FOR_PSI_CLASS_FILES_READING // FILE: WildcardsWithDefault.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; @NullMarked public class WildcardsWithDefault { @@ -12,7 +12,7 @@ public class WildcardsWithDefault { } // FILE: A.java -import org.jspecify.nullness.*; +import org.jspecify.annotations.*; public class A {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.txt index 5bbeb3a608a..5df92a4ed98 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/WildcardsWithDefault.txt @@ -2,19 +2,19 @@ package public fun main(/*0*/ aNotNullNotNullNotNull: A, /*1*/ aNotNullNotNullNull: A, /*2*/ aNotNullNullNotNull: A, /*3*/ aNotNullNullNull: A, /*4*/ b: WildcardsWithDefault): 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 } -@org.jspecify.nullness.NullMarked public open class WildcardsWithDefault { +@org.jspecify.annotations.NullMarked public open class WildcardsWithDefault { public constructor WildcardsWithDefault() 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 noBoundsNotNull(/*0*/ a: A<*, *, *>!): kotlin.Unit - public open fun noBoundsNullable(/*0*/ a: A!): kotlin.Unit + public open fun noBoundsNullable(/*0*/ a: A!): kotlin.Unit public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String } diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.fir.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.fir.kt index bb4032ca517..d591f65d8d5 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.fir.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.fir.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: Foo.java -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; public class Foo { public static void gauge(@Nullable T stateObject) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.kt index 5241faec862..42a9c0e6832 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.kt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.kt @@ -1,7 +1,7 @@ // JSPECIFY_STATE: warn // FILE: Foo.java -import org.jspecify.nullness.Nullable; +import org.jspecify.annotations.Nullable; public class Foo { public static void gauge(@Nullable T stateObject) {} diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.txt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.txt index ccd1bd4286f..897c7478384 100644 --- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.txt +++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jspecify/warnMode/kt47899.txt @@ -9,5 +9,5 @@ public open class Foo { public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String // Static members - public open fun gauge(/*0*/ @org.jspecify.nullness.Nullable stateObject: @org.jspecify.nullness.Nullable T!): kotlin.Unit + public open fun gauge(/*0*/ @org.jspecify.annotations.Nullable stateObject: @org.jspecify.annotations.Nullable T!): kotlin.Unit }