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

[FIR] Use shared FirSamResolver in call completion

Browse Source
This commit is contained in:
Kirill Rakhman
2023-08-15 18:17:00 +02:00
committed by Space Team
parent e1c399b353
commit 3ecadf1af7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
+4 -2
View File
@@ -97,7 +97,8 @@ class FirCallCompleter(
session.typeApproximator, session.typeApproximator,
components.dataFlowAnalyzer, components.dataFlowAnalyzer,
components.integerLiteralAndOperatorApproximationTransformer, components.integerLiteralAndOperatorApproximationTransformer,
components.context components.samResolver,
components.context,
), ),
null null
) )
@@ -215,8 +216,9 @@ class FirCallCompleter(
session.typeApproximator, session.typeApproximator,
components.dataFlowAnalyzer, components.dataFlowAnalyzer,
components.integerLiteralAndOperatorApproximationTransformer, components.integerLiteralAndOperatorApproximationTransformer,
components.samResolver,
components.context, components.context,
mode mode,
) )
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt
+1 -2
View File
@@ -63,6 +63,7 @@ class FirCallCompletionResultsWriterTransformer(
private val typeApproximator: ConeTypeApproximator, private val typeApproximator: ConeTypeApproximator,
private val dataFlowAnalyzer: FirDataFlowAnalyzer, private val dataFlowAnalyzer: FirDataFlowAnalyzer,
private val integerOperatorApproximator: IntegerLiteralAndOperatorApproximationTransformer, private val integerOperatorApproximator: IntegerLiteralAndOperatorApproximationTransformer,
private val samResolver: FirSamResolver,
private val context: BodyResolveContext, private val context: BodyResolveContext,
private val mode: Mode = Mode.Normal private val mode: Mode = Mode.Normal
) : FirAbstractTreeTransformer<ExpectedArgumentType?>(phase = FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { ) : FirAbstractTreeTransformer<ExpectedArgumentType?>(phase = FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) {
@@ -82,8 +83,6 @@ class FirCallCompletionResultsWriterTransformer(
private val arrayOfCallTransformer = FirArrayOfCallTransformer() private val arrayOfCallTransformer = FirArrayOfCallTransformer()
private var enableArrayOfCallTransformation = false private var enableArrayOfCallTransformation = false
private val samResolver: FirSamResolver = FirSamResolver(session, ScopeSession())
enum class Mode { enum class Mode {
Normal, DelegatedPropertyCompletion Normal, DelegatedPropertyCompletion
} }