[NI] Rename NewConstraintSystem.diagnostics to errors

This commit is contained in:
Dmitriy Novozhilov
2020-08-25 18:16:14 +03:00
parent 59b2cb6393
commit 686c17a234
8 changed files with 9 additions and 9 deletions
@@ -43,7 +43,7 @@ class ConeInapplicableCandidateError(
constructor(applicability: CandidateApplicability, candidate: Candidate) : this(
applicability,
candidate.symbol,
candidate.system.diagnostics
candidate.system.errors
)
override val reason: String get() = "Inapplicable($applicability): ${describeSymbol(candidateSymbol)}"
@@ -299,12 +299,12 @@ class CoroutineInferenceSession(
for (completedCall in commonCalls) {
updateCall(completedCall, nonFixedTypesToResultSubstitutor, nonFixedTypesToResult)
reportErrors(completedCall, completedCall.resolvedCall, commonSystem.diagnostics)
reportErrors(completedCall, completedCall.resolvedCall, commonSystem.errors)
}
for (callInfo in partiallyResolvedCallsInfo) {
val resolvedCall = completeCall(callInfo, atomCompleter) ?: continue
reportErrors(callInfo, resolvedCall, commonSystem.diagnostics)
reportErrors(callInfo, resolvedCall, commonSystem.errors)
}
for (simpleCall in simpleCommonCalls) {
@@ -170,7 +170,7 @@ abstract class ManyCandidatesResolver<D : CallableDescriptor>(
diagnosticsHolder: KotlinDiagnosticsHolder.SimpleHolder,
commonSystem: NewConstraintSystem
): CallResolutionResult {
val diagnostics = diagnosticsHolder.getDiagnostics() + callResolutionResult.diagnostics + commonSystem.diagnostics.asDiagnostics()
val diagnostics = diagnosticsHolder.getDiagnostics() + callResolutionResult.diagnostics + commonSystem.errors.asDiagnostics()
return CompletedCallResolutionResult(callResolutionResult.resultCallAtom, diagnostics, commonSystem.asReadOnlyStorage())
}
}
@@ -281,7 +281,7 @@ class PSICallResolver(
): ManyCandidates<D> {
val resolvedCalls = diagnostic.candidates.map {
kotlinToResolvedCallTransformer.onlyTransform<D>(
it.resolvedCall, it.diagnosticsFromResolutionParts + it.getSystem().diagnostics.asDiagnostics()
it.resolvedCall, it.diagnosticsFromResolutionParts + it.getSystem().errors.asDiagnostics()
)
}
@@ -236,7 +236,7 @@ class KotlinCallCompleter(
}
}
constraintSystem.diagnostics.forEach(diagnosticsHolder::addError)
constraintSystem.errors.forEach(diagnosticsHolder::addError)
}
private fun prepareCandidateForCompletion(
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintSystemError
interface NewConstraintSystem {
val hasContradiction: Boolean
val diagnostics: List<ConstraintSystemError>
val errors: List<ConstraintSystemError>
fun getBuilder(): ConstraintSystemBuilder
@@ -73,7 +73,7 @@ class NewConstraintSystemImpl(
}
}
override val diagnostics: List<ConstraintSystemError>
override val errors: List<ConstraintSystemError>
get() = storage.errors
override fun getBuilder() = apply { checkState(State.BUILDING, State.COMPLETION, State.TRANSACTION) }
@@ -166,7 +166,7 @@ class KotlinResolutionCandidate(
get() {
processParts(stopOnFirstError = false)
val systemApplicability = getResultApplicability(getSystem().diagnostics)
val systemApplicability = getResultApplicability(getSystem().errors)
return maxOf(currentApplicability, systemApplicability, variableApplicability)
}