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

Minor. Reformat signatureEnhancement.kt

Browse Source
This commit is contained in:
Denis Zharkov
2018-02-06 15:31:02 +03:00
parent 8edf8b9e4d
commit cfd612e2c1
1 changed files with 141 additions and 139 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
+10 -8
View File
@@ -142,9 +142,8 @@ class SignatureEnhancement(
} }
} }
val valueParameterEnhancements = annotationOwnerForMember.valueParameters.map { val valueParameterEnhancements = annotationOwnerForMember.valueParameters.map { p ->
p -> val enhancementResult = partsForValueParameter(p, memberContext) { it.valueParameters[p.index].type }
val enhancementResult =partsForValueParameter(p, memberContext) { it.valueParameters[p.index].type }
.enhance(predefinedEnhancementInfo?.parametersInfo?.getOrNull(p.index)) .enhance(predefinedEnhancementInfo?.parametersInfo?.getOrNull(p.index))
val actualType = if (enhancementResult.wereChanges) enhancementResult.type else p.type val actualType = if (enhancementResult.wereChanges) enhancementResult.type else p.type
@@ -166,10 +165,13 @@ class SignatureEnhancement(
) { it.returnType!! }.enhance(predefinedEnhancementInfo?.returnTypeInfo) ) { it.returnType!! }.enhance(predefinedEnhancementInfo?.returnTypeInfo)
if ((receiverTypeEnhancement?.wereChanges == true) if ((receiverTypeEnhancement?.wereChanges == true)
|| returnTypeEnhancement.wereChanges || valueParameterEnhancements.any { it.wereChanges }) { || returnTypeEnhancement.wereChanges || valueParameterEnhancements.any { it.wereChanges }
) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
return this.enhance(receiverTypeEnhancement?.type, return this.enhance(receiverTypeEnhancement?.type,
valueParameterEnhancements.map { ValueParameterData(it.type, it.hasDefaultValue) }, returnTypeEnhancement.type) as D valueParameterEnhancements.map { ValueParameterData(it.type, it.hasDefaultValue) },
returnTypeEnhancement.type
) as D
} }
return this return this
@@ -225,7 +227,8 @@ class SignatureEnhancement(
mapping.isMutable(upper) -> MutabilityQualifier.MUTABLE mapping.isMutable(upper) -> MutabilityQualifier.MUTABLE
else -> null else -> null
}, },
isNotNullTypeParameter = unwrap() is NotNullTypeParameter) isNotNullTypeParameter = unwrap() is NotNullTypeParameter
)
} }
private fun KotlinType.extractQualifiersFromAnnotations( private fun KotlinType.extractQualifiersFromAnnotations(
@@ -322,8 +325,7 @@ class SignatureEnhancement(
if (arg.isStarProjection) { if (arg.isStarProjection) {
// TODO: sort out how to handle wildcards // TODO: sort out how to handle wildcards
list.add(TypeAndDefaultQualifiers(arg.type, null)) list.add(TypeAndDefaultQualifiers(arg.type, null))
} } else {
else {
add(arg.type, c) add(arg.type, c)
} }
} }