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

LC: avoid adding @null nullability annotations

Browse Source
This commit is contained in:
Jinseong Jeon
2021-09-03 23:53:34 -07:00
committed by Ilya Kirillov
parent 9e7ee2fdea
commit 204c5952bf
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt
+2 -1
View File
@@ -91,7 +91,8 @@ abstract class KtLightModifierList<out T : KtLightElement<KtModifierListOwner, P
else -> KtLightNullabilityAnnotation(modifierListOwner as KtLightElement<*, PsiModifierListOwner>, this) else -> KtLightNullabilityAnnotation(modifierListOwner as KtLightElement<*, PsiModifierListOwner>, this)
} }
return annotationsForEntries + listOf(nullabilityAnnotation) return annotationsForEntries +
(if (nullabilityAnnotation.qualifiedName != null) listOf(nullabilityAnnotation) else emptyList())
} }
return annotationsForEntries return annotationsForEntries
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/lightAnnotations.kt
+17 -15
View File
@@ -277,52 +277,54 @@ open class KtLightNullabilityAnnotation<D : KtLightElement<*, PsiModifierListOwn
override fun findAttributeValue(attributeName: String?): PsiAnnotationMemberValue? = null override fun findAttributeValue(attributeName: String?): PsiAnnotationMemberValue? = null
override fun getQualifiedName(): String? { private val _qualifiedName: String? by lazy {
val annotatedElement = member.takeIf(::isFromSources)?.kotlinOrigin val annotatedElement = member.takeIf(::isFromSources)?.kotlinOrigin
?: // it is out of our hands ?: // it is out of our hands
return getClsNullabilityAnnotation(member)?.qualifiedName return@lazy getClsNullabilityAnnotation(member)?.qualifiedName
if (!fastCheckIsNullabilityApplied(member)) return null if (!fastCheckIsNullabilityApplied(member)) return@lazy null
// all data-class generated members are not-null // all data-class generated members are not-null
if (annotatedElement is KtClass && annotatedElement.isData()) return NotNull::class.java.name if (annotatedElement is KtClass && annotatedElement.isData()) return@lazy NotNull::class.java.name
// objects and companion objects have NotNull annotation (if annotated element is implicit ctor then skip annotation) // objects and companion objects have NotNull annotation (if annotated element is implicit ctor then skip annotation)
if (annotatedElement is KtObjectDeclaration) { if (annotatedElement is KtObjectDeclaration) {
if ((parent.parent as? PsiMethod)?.isConstructor == true) return null if ((parent.parent as? PsiMethod)?.isConstructor == true) return@lazy null
return NotNull::class.java.name return@lazy NotNull::class.java.name
} }
// don't annotate property setters // don't annotate property setters
if (annotatedElement is KtValVarKeywordOwner && member is KtLightMethod && member.returnType == PsiType.VOID) return null if (annotatedElement is KtValVarKeywordOwner && member is KtLightMethod && member.returnType == PsiType.VOID) return@lazy null
if (annotatedElement is KtNamedFunction && annotatedElement.modifierList?.hasSuspendModifier() == true) { if (annotatedElement is KtNamedFunction && annotatedElement.modifierList?.hasSuspendModifier() == true) {
return Nullable::class.java.name return@lazy Nullable::class.java.name
} }
val kotlinType = getTargetType(annotatedElement) ?: return null val kotlinType = getTargetType(annotatedElement) ?: return@lazy null
if (KotlinBuiltIns.isPrimitiveType(kotlinType) && (annotatedElement as? KtParameter)?.isVarArg != true) { if (KotlinBuiltIns.isPrimitiveType(kotlinType) && (annotatedElement as? KtParameter)?.isVarArg != true) {
// no need to annotate them explicitly except the case when overriding reference-type makes it non-primitive for Jvm // no need to annotate them explicitly except the case when overriding reference-type makes it non-primitive for Jvm
if (!(annotatedElement is KtCallableDeclaration && annotatedElement.hasModifier(KtTokens.OVERRIDE_KEYWORD))) return null if (!(annotatedElement is KtCallableDeclaration && annotatedElement.hasModifier(KtTokens.OVERRIDE_KEYWORD))) return@lazy null
val overriddenDescriptors = val overriddenDescriptors =
(annotatedElement.analyze()[BindingContext.DECLARATION_TO_DESCRIPTOR, annotatedElement] as? CallableMemberDescriptor)?.overriddenDescriptors (annotatedElement.analyze()[BindingContext.DECLARATION_TO_DESCRIPTOR, annotatedElement] as? CallableMemberDescriptor)?.overriddenDescriptors
if (overriddenDescriptors?.all { it.returnType == kotlinType } == true) return null if (overriddenDescriptors?.all { it.returnType == kotlinType } == true) return@lazy null
} }
if (kotlinType.isUnit() && (annotatedElement !is KtValVarKeywordOwner)) return null // not annotate unit-functions if (kotlinType.isUnit() && (annotatedElement !is KtValVarKeywordOwner)) return@lazy null // not annotate unit-functions
if (kotlinType.isTypeParameter()) { if (kotlinType.isTypeParameter()) {
if (!TypeUtils.hasNullableSuperType(kotlinType)) return NotNull::class.java.name if (!TypeUtils.hasNullableSuperType(kotlinType)) return@lazy NotNull::class.java.name
if (!kotlinType.isMarkedNullable) return null if (!kotlinType.isMarkedNullable) return@lazy null
} }
return when (kotlinType.nullability()) { when (kotlinType.nullability()) {
TypeNullability.NOT_NULL -> NotNull::class.java.name TypeNullability.NOT_NULL -> NotNull::class.java.name
TypeNullability.NULLABLE -> Nullable::class.java.name TypeNullability.NULLABLE -> Nullable::class.java.name
TypeNullability.FLEXIBLE -> null TypeNullability.FLEXIBLE -> null
} }
} }
override fun getQualifiedName(): String? = _qualifiedName
internal fun KtTypeReference.getType(): KotlinType? = analyze()[BindingContext.TYPE, this] internal fun KtTypeReference.getType(): KotlinType? = analyze()[BindingContext.TYPE, this]
private fun getTargetType(annotatedElement: PsiElement): KotlinType? { private fun getTargetType(annotatedElement: PsiElement): KotlinType? {