azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename JSPECIFY_DEFAULT_NOT_NULL to JSPECIFY_NULL_MARKED

Browse Source
This commit is contained in:
Victor Petukhov
2021-06-02 13:21:50 +03:00
parent 4173f2d294
commit 70dbc50305
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/AnnotationQualifiersFqNames.kt
+1 -1
View File
@@ -32,7 +32,7 @@ val DEFAULT_JSPECIFY_APPLICABILITY = listOf(
) )
val JSPECIFY_DEFAULT_ANNOTATIONS = mapOf( val JSPECIFY_DEFAULT_ANNOTATIONS = mapOf(
JSPECIFY_DEFAULT_NOT_NULL to JavaDefaultQualifiers( JSPECIFY_NULL_MARKED to JavaDefaultQualifiers(
NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL), NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL),
DEFAULT_JSPECIFY_APPLICABILITY, DEFAULT_JSPECIFY_APPLICABILITY,
affectsTypeParameterBasedTypes = false affectsTypeParameterBasedTypes = false
core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.kt
+2 -3
View File
@@ -20,8 +20,7 @@ import org.jetbrains.kotlin.name.FqName
val JSPECIFY_NULLABLE = FqName("org.jspecify.nullness.Nullable") val JSPECIFY_NULLABLE = FqName("org.jspecify.nullness.Nullable")
val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.nullness.NullnessUnspecified") val JSPECIFY_NULLNESS_UNKNOWN = FqName("org.jspecify.nullness.NullnessUnspecified")
val JSPECIFY_NULL_MARKED = FqName("org.jspecify.nullness.NullMarked")
val JSPECIFY_DEFAULT_NOT_NULL = FqName("org.jspecify.nullness.NullMarked")
val NULLABLE_ANNOTATIONS = listOf( val NULLABLE_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION, JvmAnnotationNames.JETBRAINS_NULLABLE_ANNOTATION,
@@ -71,7 +70,7 @@ val NULLABILITY_ANNOTATIONS = mutableSetOf<FqName>() +
ANDROIDX_RECENTLY_NON_NULL_ANNOTATION + ANDROIDX_RECENTLY_NON_NULL_ANNOTATION +
JSPECIFY_NULLABLE + JSPECIFY_NULLABLE +
JSPECIFY_NULLNESS_UNKNOWN + JSPECIFY_NULLNESS_UNKNOWN +
JSPECIFY_DEFAULT_NOT_NULL JSPECIFY_NULL_MARKED
val READ_ONLY_ANNOTATIONS = listOf( val READ_ONLY_ANNOTATIONS = listOf(
JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION, JvmAnnotationNames.JETBRAINS_READONLY_ANNOTATION,