diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt index fc721142cc5..1a7c947566a 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt @@ -48,14 +48,21 @@ val NOT_NULL_ANNOTATIONS = listOf( FqName("io.reactivex.annotations.NonNull") ) -val NULLABILITY_ANNOTATIONS = NULLABLE_ANNOTATIONS + JAVAX_NONNULL_ANNOTATION + NOT_NULL_ANNOTATIONS - val COMPATQUAL_NULLABLE_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NullableDecl") val COMPATQUAL_NONNULL_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NonNullDecl") val ANDROIDX_RECENTLY_NULLABLE_ANNOTATION = FqName("androidx.annotation.RecentlyNullable") val ANDROIDX_RECENTLY_NON_NULL_ANNOTATION = FqName("androidx.annotation.RecentlyNonNull") +val NULLABILITY_ANNOTATIONS: Set = mutableSetOf() + + NULLABLE_ANNOTATIONS + + JAVAX_NONNULL_ANNOTATION + + NOT_NULL_ANNOTATIONS + + COMPATQUAL_NULLABLE_ANNOTATION + + COMPATQUAL_NONNULL_ANNOTATION + + ANDROIDX_RECENTLY_NULLABLE_ANNOTATION + + ANDROIDX_RECENTLY_NON_NULL_ANNOTATION + val READ_ONLY_ANNOTATIONS = listOf( JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION, JvmAnnotationNames.READONLY_ANNOTATION diff --git a/idea/testData/parameterInfo/functionCall/Nullability.extra.java b/idea/testData/parameterInfo/functionCall/Nullability.extra.java index a36b503ac5e..d3507d60daf 100644 --- a/idea/testData/parameterInfo/functionCall/Nullability.extra.java +++ b/idea/testData/parameterInfo/functionCall/Nullability.extra.java @@ -1,8 +1,10 @@ import org.jetbrains.annotations.Nullable import org.jetbrains.annotations.NotNull +import androidx.annotation.RecentlyNonNull; +import androidx.annotation.RecentlyNullable; class J { - static void foo(@Nullable String s1, @NotNull String s2, String s3) { + static void foo(@Nullable String s1, @NotNull String s2, @RecentlyNullable String a, @RecentlyNonNull String b, String s3) { } } \ No newline at end of file diff --git a/idea/testData/parameterInfo/functionCall/Nullability.extra.kt b/idea/testData/parameterInfo/functionCall/Nullability.extra.kt new file mode 100644 index 00000000000..b17d4a90592 --- /dev/null +++ b/idea/testData/parameterInfo/functionCall/Nullability.extra.kt @@ -0,0 +1,5 @@ +package androidx.annotation + +annotation class RecentlyNonNull + +annotation class RecentlyNullable \ No newline at end of file diff --git a/idea/testData/parameterInfo/functionCall/Nullability.kt b/idea/testData/parameterInfo/functionCall/Nullability.kt index bb26849017e..f5e26e45e6d 100644 --- a/idea/testData/parameterInfo/functionCall/Nullability.kt +++ b/idea/testData/parameterInfo/functionCall/Nullability.kt @@ -1,7 +1,7 @@ fun test() { - J.foo("1", "2", "3") + J.foo("1", "2", "3", "4", "5") } /* -Text: (s1: String?, s2: String, s3: String!), Disabled: false, Strikeout: false, Green: true +Text: (s1: String?, s2: String, a: String!, b: String!, s3: String!), Disabled: false, Strikeout: false, Green: true */ \ No newline at end of file