[FIR] Allow resolve to private members from debugger evaluator

KT-60714
This commit is contained in:
Alexey Merkulov
2023-07-31 20:28:59 +02:00
committed by Space Team
parent 1714fb71c8
commit e4ae15b3f0
16 changed files with 124 additions and 4 deletions
@@ -55,6 +55,7 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
import org.jetbrains.kotlin.resolve.calls.tower.CandidateApplicability
import org.jetbrains.kotlin.resolve.calls.tower.isSuccess
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.util.CodeFragmentAdjustment
class FirCallResolver(
private val components: FirAbstractBodyResolveTransformer.BodyResolveTransformerComponents,
@@ -765,7 +766,13 @@ class FirCallResolver(
!applicability.isSuccess -> {
val candidate = candidates.single()
createConeDiagnosticForCandidateWithError(applicability, candidate)
if (needTreatErrorCandidateAsResolved(candidate)) {
@OptIn(CodeFragmentAdjustment::class)
candidate.resetToResolved()
null
} else {
createConeDiagnosticForCandidateWithError(applicability, candidate)
}
}
else -> null
@@ -820,6 +827,13 @@ class FirCallResolver(
return FirNamedReferenceWithCandidate(source, name, candidate)
}
private fun needTreatErrorCandidateAsResolved(candidate: Candidate): Boolean {
return if (candidate.isCodeFragmentVisibilityError) {
components.resolutionStageRunner.fullyProcessCandidate(candidate, transformer.resolutionContext)
candidate.diagnostics.all { it.applicability.isSuccess || it.applicability == CandidateApplicability.K2_VISIBILITY_ERROR }
} else false
}
private fun createErrorReferenceForSingleCandidate(
candidate: Candidate?,
diagnostic: ConeDiagnostic,
@@ -7,9 +7,10 @@ package org.jetbrains.kotlin.fir.resolve.calls
import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.fakeElement
import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression
import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression
import org.jetbrains.kotlin.fir.expressions.builder.buildThisReceiverExpressionCopy
import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.fir.scopes.FirScope
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType
import org.jetbrains.kotlin.fir.types.ConeTypeVariable
import org.jetbrains.kotlin.fir.visitors.FirTransformer
import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation
import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintStorage
import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintSystemError
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.NewConstraintSystemImp
import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
import org.jetbrains.kotlin.resolve.calls.tower.CandidateApplicability
import org.jetbrains.kotlin.resolve.calls.tower.isSuccess
import org.jetbrains.kotlin.util.CodeFragmentAdjustment
class Candidate(
override val symbol: FirBasedSymbol<*>,
@@ -103,6 +104,12 @@ class Candidate(
}
}
@CodeFragmentAdjustment
internal fun resetToResolved() {
currentApplicability = CandidateApplicability.RESOLVED
_diagnostics.clear()
}
val isSuccessful: Boolean
get() = currentApplicability.isSuccess && (!systemInitialized || !system.hasContradiction)
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.isNullableNothing
import org.jetbrains.kotlin.fir.types.makeConeTypeDefinitelyNotNullOrNotNull
import org.jetbrains.kotlin.fir.types.typeContext
import org.jetbrains.kotlin.resolve.calls.tower.CandidateApplicability
import org.jetbrains.kotlin.utils.addToStdlib.runIf
fun FirVisibilityChecker.isVisible(
@@ -136,3 +137,7 @@ private fun isExplicitReceiverExpression(receiverExpression: FirExpression?): Bo
val thisReference = receiverExpression.toReference() as? FirThisReference ?: return true
return !thisReference.isImplicit
}
internal val Candidate.isCodeFragmentVisibilityError
get() = applicability == CandidateApplicability.K2_VISIBILITY_ERROR &&
callInfo.containingFile.declarations.singleOrNull() is FirCodeFragment
@@ -0,0 +1,9 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.util
@RequiresOptIn(message = "Should be used only for code fragment resolve/generation adjustments")
annotation class CodeFragmentAdjustment