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

Minor. Reformat PostponedArgumentInputTypesResolver.kt

Browse Source
This commit is contained in:
Denis.Zharkov
2021-11-22 16:43:08 +03:00
committed by teamcityserver
parent 61fe70b600
commit 3fb17cfa9a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/PostponedArgumentInputTypesResolver.kt
+12 -3
View File
@@ -359,7 +359,11 @@ class PostponedArgumentInputTypesResolver(
) )
if (pathFromRelatedTopLevelVariable != null && relatedTopLevelVariable != null) { if (pathFromRelatedTopLevelVariable != null && relatedTopLevelVariable != null) {
getBuilder().putBuiltFunctionalExpectedTypeForPostponedArgument(relatedTopLevelVariable, pathFromRelatedTopLevelVariable, newExpectedType) getBuilder().putBuiltFunctionalExpectedTypeForPostponedArgument(
relatedTopLevelVariable,
pathFromRelatedTopLevelVariable,
newExpectedType
)
} else { } else {
getBuilder().putBuiltFunctionalExpectedTypeForPostponedArgument(expectedTypeConstructor, newExpectedType) getBuilder().putBuiltFunctionalExpectedTypeForPostponedArgument(expectedTypeConstructor, newExpectedType)
} }
@@ -395,7 +399,8 @@ class PostponedArgumentInputTypesResolver(
val parameterTypesInfo = val parameterTypesInfo =
c.extractParameterTypesInfo(argument, postponedArguments, dependencyProvider) ?: return@any false c.extractParameterTypesInfo(argument, postponedArguments, dependencyProvider) ?: return@any false
val newExpectedType = val newExpectedType =
c.buildNewFunctionalExpectedType(argument, parameterTypesInfo, dependencyProvider, topLevelTypeVariables) ?: return@any false c.buildNewFunctionalExpectedType(argument, parameterTypesInfo, dependencyProvider, topLevelTypeVariables)
?: return@any false
argument.reviseExpectedType(newExpectedType) argument.reviseExpectedType(newExpectedType)
@@ -488,7 +493,11 @@ class PostponedArgumentInputTypesResolver(
val relatedVariables = type.extractArgumentsForFunctionalTypeOrSubtype() val relatedVariables = type.extractArgumentsForFunctionalTypeOrSubtype()
.flatMap { getAllDeeplyRelatedTypeVariables(it, dependencyProvider) } .flatMap { getAllDeeplyRelatedTypeVariables(it, dependencyProvider) }
val variableForFixation = variableFixationFinder.findFirstVariableForFixation( val variableForFixation = variableFixationFinder.findFirstVariableForFixation(
this@fixNextReadyVariableForParameterType, relatedVariables, postponedArguments, ConstraintSystemCompletionMode.FULL, topLevelType this@fixNextReadyVariableForParameterType,
relatedVariables,
postponedArguments,
ConstraintSystemCompletionMode.FULL,
topLevelType
) )
if (variableForFixation == null || !variableForFixation.hasProperConstraint) if (variableForFixation == null || !variableForFixation.hasProperConstraint)