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

Minor. Reformat SignatureEnhancement

Browse Source
This commit is contained in:
Denis Zharkov
2018-08-29 11:42:52 +03:00
parent 7f4f07659c
commit bcf1b9c804
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/typeEnhancement/signatureEnhancement.kt
+8 -8
View File
@@ -52,7 +52,7 @@ class SignatureEnhancement(
private fun AnnotationDescriptor.extractNullabilityTypeFromArgument(): NullabilityQualifierWithMigrationStatus? { private fun AnnotationDescriptor.extractNullabilityTypeFromArgument(): NullabilityQualifierWithMigrationStatus? {
val enumValue = firstArgument() as? EnumValue val enumValue = firstArgument() as? EnumValue
// if no argument is specified, use default value: NOT_NULL // if no argument is specified, use default value: NOT_NULL
?: return NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL) ?: return NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL)
return when (enumValue.enumEntryName.asString()) { return when (enumValue.enumEntryName.asString()) {
"ALWAYS" -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL) "ALWAYS" -> NullabilityQualifierWithMigrationStatus(NullabilityQualifier.NOT_NULL)
@@ -67,7 +67,7 @@ class SignatureEnhancement(
val typeQualifierAnnotation = val typeQualifierAnnotation =
annotationTypeQualifierResolver.resolveTypeQualifierAnnotation(annotationDescriptor) annotationTypeQualifierResolver.resolveTypeQualifierAnnotation(annotationDescriptor)
?: return null ?: return null
val jsr305State = annotationTypeQualifierResolver.resolveJsr305AnnotationState(annotationDescriptor) val jsr305State = annotationTypeQualifierResolver.resolveJsr305AnnotationState(annotationDescriptor)
if (jsr305State.isIgnore) return null if (jsr305State.isIgnore) return null
@@ -268,12 +268,12 @@ class SignatureEnhancement(
val nullabilityInfo = val nullabilityInfo =
composedAnnotation.extractNullability() composedAnnotation.extractNullability()
?: defaultTypeQualifier?.nullability?.let { ?: defaultTypeQualifier?.nullability?.let {
NullabilityQualifierWithMigrationStatus( NullabilityQualifierWithMigrationStatus(
defaultTypeQualifier.nullability, defaultTypeQualifier.nullability,
defaultTypeQualifier.isNullabilityQualifierForWarning defaultTypeQualifier.isNullabilityQualifierForWarning
) )
} }
return JavaTypeQualifiers( return JavaTypeQualifiers(
nullabilityInfo?.qualifier, nullabilityInfo?.qualifier,