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

FirTypeIntersectionScope: enhance support of inherited default parameters

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-07-14 11:31:20 +03:00
parent c46fac3464
commit c1d223dbde
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirTypeIntersectionScope.kt
+7 -10
View File
@@ -95,24 +95,21 @@ class FirTypeIntersectionScope private constructor(
// TODO: same code for properties // TODO: same code for properties
val newSymbol = FirNamedFunctionSymbol(mostSpecific.callableId, mostSpecific.isFakeOverride, mostSpecific) val newSymbol = FirNamedFunctionSymbol(mostSpecific.callableId, mostSpecific.isFakeOverride, mostSpecific)
val mostSpecificFunction = mostSpecific.fir val mostSpecificFunction = mostSpecific.fir
val overriddenWithDefault =
extractedOverrides.firstOrNull {
(it as FirNamedFunctionSymbol).fir.valueParameters.any { parameter -> parameter.defaultValue != null }
}?.fir as? FirSimpleFunction
createFunctionCopy(mostSpecific.fir, newSymbol).apply { createFunctionCopy(mostSpecific.fir, newSymbol).apply {
resolvePhase = mostSpecificFunction.resolvePhase resolvePhase = mostSpecificFunction.resolvePhase
typeParameters += mostSpecificFunction.typeParameters typeParameters += mostSpecificFunction.typeParameters
valueParameters += mostSpecificFunction.valueParameters.mapIndexed { index, mostSpecificParameter ->
val overriddenWithDefault =
extractedOverrides.firstOrNull {
(it as FirNamedFunctionSymbol).fir.valueParameters.getOrNull(index)?.defaultValue != null
}?.fir as? FirSimpleFunction
if (overriddenWithDefault == null) { if (overriddenWithDefault == null) {
valueParameters += mostSpecificFunction.valueParameters mostSpecificParameter
} else { } else {
valueParameters += mostSpecificFunction.valueParameters.zip(overriddenWithDefault.valueParameters) val overriddenWithDefaultParameter = overriddenWithDefault.valueParameters[index]
.map { (mostSpecificParameter, overriddenWithDefaultParameter) ->
if (overriddenWithDefaultParameter.defaultValue != null)
createValueParameterCopy(mostSpecificParameter, overriddenWithDefaultParameter.defaultValue).apply { createValueParameterCopy(mostSpecificParameter, overriddenWithDefaultParameter.defaultValue).apply {
annotations += mostSpecificParameter.annotations annotations += mostSpecificParameter.annotations
}.build() }.build()
else
mostSpecificParameter
} }
} }
}.build() }.build()