Extend list of annotations ignored in parameter info (KT-24911, KT-25622)
#KT-24911 Fixed
This commit is contained in:
@@ -48,14 +48,21 @@ val NOT_NULL_ANNOTATIONS = listOf(
|
|||||||
FqName("io.reactivex.annotations.NonNull")
|
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_NULLABLE_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NullableDecl")
|
||||||
val COMPATQUAL_NONNULL_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NonNullDecl")
|
val COMPATQUAL_NONNULL_ANNOTATION = FqName("org.checkerframework.checker.nullness.compatqual.NonNullDecl")
|
||||||
|
|
||||||
val ANDROIDX_RECENTLY_NULLABLE_ANNOTATION = FqName("androidx.annotation.RecentlyNullable")
|
val ANDROIDX_RECENTLY_NULLABLE_ANNOTATION = FqName("androidx.annotation.RecentlyNullable")
|
||||||
val ANDROIDX_RECENTLY_NON_NULL_ANNOTATION = FqName("androidx.annotation.RecentlyNonNull")
|
val ANDROIDX_RECENTLY_NON_NULL_ANNOTATION = FqName("androidx.annotation.RecentlyNonNull")
|
||||||
|
|
||||||
|
val NULLABILITY_ANNOTATIONS: Set<FqName> = mutableSetOf<FqName>() +
|
||||||
|
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(
|
val READ_ONLY_ANNOTATIONS = listOf(
|
||||||
JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION,
|
JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION,
|
||||||
JvmAnnotationNames.READONLY_ANNOTATION
|
JvmAnnotationNames.READONLY_ANNOTATION
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import org.jetbrains.annotations.Nullable
|
import org.jetbrains.annotations.Nullable
|
||||||
import org.jetbrains.annotations.NotNull
|
import org.jetbrains.annotations.NotNull
|
||||||
|
import androidx.annotation.RecentlyNonNull;
|
||||||
|
import androidx.annotation.RecentlyNullable;
|
||||||
|
|
||||||
class J {
|
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) {
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
package androidx.annotation
|
||||||
|
|
||||||
|
annotation class RecentlyNonNull
|
||||||
|
|
||||||
|
annotation class RecentlyNullable
|
||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
fun test() {
|
fun test() {
|
||||||
J.foo(<caret>"1", "2", "3")
|
J.foo(<caret>"1", "2", "3", "4", "5")
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Text: (<highlight>s1: String?</highlight>, s2: String, s3: String!), Disabled: false, Strikeout: false, Green: true
|
Text: (<highlight>s1: String?</highlight>, s2: String, a: String!, b: String!, s3: String!), Disabled: false, Strikeout: false, Green: true
|
||||||
*/
|
*/
|
||||||
Reference in New Issue
Block a user