jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIR IDE] Fix reference resolve for functions call

Browse Source
This commit is contained in:
Igor Yakovlev
2021-08-17 12:52:50 +02:00
parent 42242e198b
commit 5498f40ce7
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
idea/idea-frontend-fir/idea-fir-low-level-api/testdata/getOrBuildFir/expressions/binaryExpressionOperator.txt vendored
View File

@@ -1,5 +1,5 @@
KT element: KtOperationReferenceExpression
FIR element: FirFunctionCallImpl
FIR element: FirResolvedNamedReferenceImpl
FIR element rendered:
Int(1).R|kotlin/Int.plus|(Int(1))
R|kotlin/Int.plus|

4
idea/idea-frontend-fir/idea-fir-low-level-api/testdata/getOrBuildFir/expressions/unraryExpressionOperator.txt vendored
View File

@@ -1,5 +1,5 @@
KT element: KtOperationReferenceExpression
FIR element: FirFunctionCallImpl
FIR element: FirResolvedNamedReferenceImpl
FIR element rendered:
R|<local>/x|.R|kotlin/Boolean.not|()
R|kotlin/Boolean.not|

16
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt
View File

@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.idea.fir.getCandidateSymbols
import org.jetbrains.kotlin.idea.fir.isImplicitFunctionCall
import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState
import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFir
import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFirSafe
import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
@@ -189,7 +190,7 @@ internal object FirReferenceResolveHelper {
is FirReturnExpression -> getSymbolsByReturnExpression(expression, fir, symbolBuilder)
is FirErrorNamedReference -> getSymbolsByErrorNamedReference(fir, symbolBuilder)
is FirVariableAssignment -> getSymbolsByVariableAssignment(fir, session, symbolBuilder)
is FirResolvedNamedReference -> getSymbolByResolvedNameReference(fir, session, symbolBuilder)
is FirResolvedNamedReference -> getSymbolByResolvedNameReference(fir, expression, analysisSession, session, symbolBuilder)
is FirResolvable -> getSymbolsByResolvable(fir, expression, session, symbolBuilder)
is FirNamedArgumentExpression -> getSymbolsByNameArgumentExpression(expression, analysisSession, symbolBuilder)
else -> handleUnknownFirElement(expression, analysisSession, session, symbolBuilder)
@@ -206,9 +207,20 @@ internal object FirReferenceResolveHelper {
private fun getSymbolByResolvedNameReference(
fir: FirResolvedNamedReference,
expression: KtSimpleNameExpression,
analysisSession: KtFirAnalysisSession,
session: FirSession,
symbolBuilder: KtSymbolByFirBuilder
): Collection<KtSymbol> = fir.toTargetSymbol(session, symbolBuilder)
): Collection<KtSymbol> {
val parentAsCall = expression.parent as? KtCallExpression
if (parentAsCall != null) {
val firResolvable = parentAsCall.getOrBuildFirSafe<FirResolvable>(analysisSession.firResolveState)
if (firResolvable != null) {
return getSymbolsByResolvable(firResolvable, expression, session, symbolBuilder)
}
}
return fir.toTargetSymbol(session, symbolBuilder)
}
private fun KtSimpleNameExpression.isSyntheticOperatorReference() = when (this) {
is KtOperationReferenceExpression -> operationSignTokenType in syntheticTokenTypes