Minor. Reformat signatureEnhancement.kt
This commit is contained in:
+9
-7
@@ -142,8 +142,7 @@ 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))
|
||||||
|
|
||||||
@@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user