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

NI: Get rid of confusing asConstraintSystemCompletionContext

Browse Source 
NB: there is a different asConstraintSystemCompleterContext that might have side effects
This commit is contained in:
Denis.Zharkov
2021-12-24 09:26:14 +03:00
committed by teamcity
parent 47d74a16f2
commit 1d258635a2
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConstraintSystemCompleter.kt
+6 -6
View File
@@ -74,7 +74,7 @@ class ConstraintSystemCompleter(private val components: BodyResolveComponents, p
// Stage 2
val newExpectedTypeWasBuilt = postponedArgumentsInputTypesResolver.collectParameterTypesAndBuildNewExpectedTypes(
asConstraintSystemCompletionContext(),
this,
postponedArgumentsWithRevisableType,
completionMode,
dependencyProvider,
@@ -88,7 +88,7 @@ class ConstraintSystemCompleter(private val components: BodyResolveComponents, p
// Stage 3
for (argument in postponedArguments) {
val variableWasFixed = postponedArgumentsInputTypesResolver.fixNextReadyVariableForParameterTypeIfNeeded(
asConstraintSystemCompletionContext(),
this,
argument,
postponedArguments,
candidateReturnType,
@@ -104,7 +104,7 @@ class ConstraintSystemCompleter(private val components: BodyResolveComponents, p
// Stage 4
for (argument in postponedArgumentsWithRevisableType) {
val argumentWasTransformed =
transformToAtomWithNewFunctionalExpectedType(asConstraintSystemCompletionContext(), context, argument)
transformToAtomWithNewFunctionalExpectedType(this, context, argument)
if (argumentWasTransformed)
continue@completion
@@ -215,7 +215,7 @@ class ConstraintSystemCompleter(private val components: BodyResolveComponents, p
while (true) {
val variableForFixation = variableFixationFinder.findFirstVariableForFixation(
this,
getOrderedAllTypeVariables(asConstraintSystemCompletionContext(), topLevelAtoms, collectVariablesFromContext),
getOrderedAllTypeVariables(this, topLevelAtoms, collectVariablesFromContext),
postponedArguments,
completionMode,
topLevelType
@@ -228,13 +228,13 @@ class ConstraintSystemCompleter(private val components: BodyResolveComponents, p
when {
variableForFixation.hasProperConstraint -> {
fixVariable(asConstraintSystemCompletionContext(), topLevelType, variableWithConstraints, postponedArguments)
fixVariable(this, topLevelType, variableWithConstraints, postponedArguments)
return true
}
context.inferenceSession.isSyntheticTypeVariable(variableWithConstraints.typeVariable) -> {
context.inferenceSession.fixSyntheticTypeVariableWithNotEnoughInformation(
variableWithConstraints.typeVariable as ConeTypeVariable,
asConstraintSystemCompletionContext()
this
)
return true
}