[FIR] Allow resolve to private members from debugger evaluator

KT-60714
2023-07-31 20:28:59 +02:00
parent 1714fb71c8
commit e4ae15b3f0
16 changed files with 124 additions and 4 deletions
@@ -250,6 +250,18 @@ public class FirIdeNormalAnalysisSourceModuleCompilerFacilityTestGenerated exten
                runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/outerClassMutatedPrivate.kt");
            }

+            @Test
+            @TestMetadata("preferCorrectResolve.kt")
+            public void testPreferCorrectResolve() throws Exception {
+                runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/preferCorrectResolve.kt");
+            }
+
+            @Test
+            @TestMetadata("privateMemberCall.kt")
+            public void testPrivateMemberCall() throws Exception {
+                runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/privateMemberCall.kt");
+            }
+
            @Test
            @TestMetadata("valueParameter.kt")
            public void testValueParameter() throws Exception {
@@ -0,0 +1,3 @@
+Local[name: a; isMutated: false; displayText: a]
+    a: R|A|
+    R|A|
@@ -0,0 +1,2 @@
+// Need to choose public foo(Any) call instead of more specific but private call foo(Int)
+a.foo(5)
@@ -0,0 +1,14 @@
+MODULE_FRAGMENT name:<Sources of main>
+  FILE fqName:<root> fileName:/fragment.kt
+    CLASS CLASS name:CodeFragment modality:FINAL visibility:public superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.CodeFragment
+      CONSTRUCTOR visibility:public <> () returnType:<root>.CodeFragment [primary]
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+      FUN name:run visibility:public modality:FINAL <> (p0:<root>.A) returnType:kotlin.Int
+        VALUE_PARAMETER name:p0 index:0 type:<root>.A
+        EXPRESSION_BODY
+          BLOCK type=kotlin.Int origin=null
+            CALL 'public final fun foo (x: kotlin.Any): kotlin.Int declared in <root>.A' type=kotlin.Int origin=null
+              $this: GET_VAR 'p0: <root>.A declared in <root>.CodeFragment.run' type=<root>.A origin=null
+              x: CONST Int type=kotlin.Int value=5
@@ -0,0 +1,8 @@
+class A {
+    private fun foo(x: Int) = 1 + x
+    fun foo(x: Any) = 2
+}
+
+fun test(a: A) {
+    <caret>val x = 0
+}
@@ -0,0 +1,5 @@
+public final class CodeFragment {
+    // source: 'fragment.kt'
+    public method <init>(): void
+    public final static method run(p0: A): int
+}
@@ -0,0 +1,3 @@
+Local[name: a; isMutated: false; displayText: a]
+    a: R|A|
+    R|A|
@@ -0,0 +1 @@
+a.foo()
@@ -0,0 +1,13 @@
+MODULE_FRAGMENT name:<Sources of main>
+  FILE fqName:<root> fileName:/fragment.kt
+    CLASS CLASS name:CodeFragment modality:FINAL visibility:public superTypes:[kotlin.Any]
+      $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.CodeFragment
+      CONSTRUCTOR visibility:public <> () returnType:<root>.CodeFragment [primary]
+        BLOCK_BODY
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
+      FUN name:run visibility:public modality:FINAL <> (p0:<root>.A) returnType:kotlin.Int
+        VALUE_PARAMETER name:p0 index:0 type:<root>.A
+        EXPRESSION_BODY
+          BLOCK type=kotlin.Int origin=null
+            CALL 'private final fun foo (): kotlin.Int declared in <root>.A' type=kotlin.Int origin=null
+              $this: GET_VAR 'p0: <root>.A declared in <root>.CodeFragment.run' type=<root>.A origin=null
@@ -0,0 +1,7 @@
+class A {
+    private fun foo() = 2
+}
+
+fun test(a: A) {
+    <caret>val x = 0
+}
@@ -0,0 +1,5 @@
+public final class CodeFragment {
+    // source: 'fragment.kt'
+    public method <init>(): void
+    public final static method run(p0: A): int
+}
@@ -150,6 +150,18 @@ public class CodeFragmentCapturingTestGenerated extends AbstractCodeFragmentCapt
        runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/outerClassMutatedPrivate.kt");
    }

+    @Test
+    @TestMetadata("preferCorrectResolve.kt")
+    public void testPreferCorrectResolve() throws Exception {
+        runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/preferCorrectResolve.kt");
+    }
+
+    @Test
+    @TestMetadata("privateMemberCall.kt")
+    public void testPrivateMemberCall() throws Exception {
+        runTest("analysis/analysis-api/testData/components/compilerFacility/compilation/codeFragments/capturing/privateMemberCall.kt");
+    }
+
    @Test
    @TestMetadata("valueParameter.kt")
    public void testValueParameter() throws Exception {
@@ -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