From 686c17a2342a3fe9d9af94bb17976cac2d9e889f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 25 Aug 2020 18:16:14 +0300 Subject: [PATCH] [NI] Rename `NewConstraintSystem.diagnostics` to `errors` --- .../kotlin/fir/resolve/diagnostics/FirDiagnostics.kt | 2 +- .../resolve/calls/inference/CoroutineInferenceSession.kt | 4 ++-- .../kotlin/resolve/calls/tower/ManyCandidatesResolver.kt | 2 +- .../jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt | 2 +- .../kotlin/resolve/calls/components/KotlinCallCompleter.kt | 2 +- .../kotlin/resolve/calls/inference/NewConstraintSystem.kt | 2 +- .../resolve/calls/inference/model/NewConstraintSystemImpl.kt | 2 +- .../kotlin/resolve/calls/model/ResolutionCandidate.kt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt index 3b99dfe42e7..69ab2cfd04f 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/diagnostics/FirDiagnostics.kt @@ -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)}" diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceSession.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceSession.kt index 5672efa7811..56b5e677651 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceSession.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/CoroutineInferenceSession.kt @@ -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) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt index 0d6a49285f4..98a31e852df 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt @@ -170,7 +170,7 @@ abstract class ManyCandidatesResolver( 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()) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt index 868ba2e1514..aedfa0ceb17 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/PSICallResolver.kt @@ -281,7 +281,7 @@ class PSICallResolver( ): ManyCandidates { val resolvedCalls = diagnostic.candidates.map { kotlinToResolvedCallTransformer.onlyTransform( - it.resolvedCall, it.diagnosticsFromResolutionParts + it.getSystem().diagnostics.asDiagnostics() + it.resolvedCall, it.diagnosticsFromResolutionParts + it.getSystem().errors.asDiagnostics() ) } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt index c9f6abca4e6..ab702458227 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt @@ -236,7 +236,7 @@ class KotlinCallCompleter( } } - constraintSystem.diagnostics.forEach(diagnosticsHolder::addError) + constraintSystem.errors.forEach(diagnosticsHolder::addError) } private fun prepareCandidateForCompletion( diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/NewConstraintSystem.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/NewConstraintSystem.kt index 84cf956fbbe..9cbf30f8713 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/NewConstraintSystem.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/NewConstraintSystem.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintSystemError interface NewConstraintSystem { val hasContradiction: Boolean - val diagnostics: List + val errors: List fun getBuilder(): ConstraintSystemBuilder diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/NewConstraintSystemImpl.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/NewConstraintSystemImpl.kt index adb177abdd4..a83ff48644e 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/NewConstraintSystemImpl.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/model/NewConstraintSystemImpl.kt @@ -73,7 +73,7 @@ class NewConstraintSystemImpl( } } - override val diagnostics: List + override val errors: List get() = storage.errors override fun getBuilder() = apply { checkState(State.BUILDING, State.COMPLETION, State.TRANSACTION) } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt index 22b56f98836..2fff5ea4195 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/model/ResolutionCandidate.kt @@ -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) }