minor cleanup

GitOrigin-RevId: 7f393784c905f89cba4199dd4424a80c8a80e282
This commit is contained in:
Konstantin.Nisht
2019-10-09 14:08:11 +00:00
committed by intellij-monorepo-bot
parent 4ba5b9cb57
commit a50343a2d3
2 changed files with 2 additions and 9 deletions
@@ -173,7 +173,7 @@ class CommonDriver private constructor(private val targetParameters: Set<GrParam
if (properType == typeParameter.type()) {
continue
}
constraintCollector.add(TypeConstraint(resolveResult.substitutor.substitute(type), typeParameter.type(), method))
constraintCollector.add(TypeConstraint(properType, typeParameter.type(), method))
}
}
})
@@ -137,14 +137,7 @@ fun collectClosureParamsDependencies(innerParameter: PsiParameter,
signature ?: return
for ((inferredType, typeParameter) in signature.zip(closureParameter.typeParameters)) {
builder.addConstraint(TypeConstraint(typeParameter.type(), inferredType, innerParameter))
val inferredTypeParameter = inferredType.typeParameter()
if (inferredTypeParameter != null) {
builder.addDependentType(typeParameter)
builder.addDependentType(inferredTypeParameter)
}
else {
builder.generateRequiredTypes(typeParameter, inferredType, LOWER)
}
builder.generateRequiredTypes(typeParameter, inferredType, LOWER)
}
}