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

[FIR IDE] Handle callable references better in KtFirImportOptimizer

Browse Source
This commit is contained in:
Roman Golyshev
2021-09-02 18:25:38 +03:00
committed by Space
parent 911bfcf150
commit cc3ad73436
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirImportOptimizer.kt
+8 -6
View File
@@ -113,9 +113,9 @@ internal class KtFirImportOptimizer(
super.visitTypeRef(resolvedTypeRef) super.visitTypeRef(resolvedTypeRef)
} }
override fun visitResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference) { override fun visitCallableReferenceAccess(callableReferenceAccess: FirCallableReferenceAccess) {
processResolvedCallableReference(resolvedCallableReference) processCallableReferenceAccess(callableReferenceAccess)
super.visitResolvedCallableReference(resolvedCallableReference) super.visitCallableReferenceAccess(callableReferenceAccess)
} }
override fun visitResolvedQualifier(resolvedQualifier: FirResolvedQualifier) { override fun visitResolvedQualifier(resolvedQualifier: FirResolvedQualifier) {
@@ -153,10 +153,12 @@ internal class KtFirImportOptimizer(
processTypeQualifier(wholeQualifier) processTypeQualifier(wholeQualifier)
} }
private fun processResolvedCallableReference(resolvedCallableReference: FirResolvedCallableReference) { private fun processCallableReferenceAccess(callableReferenceAccess: FirCallableReferenceAccess) {
val referencedCallableSymbol = resolvedCallableReference.resolvedSymbol as? FirCallableSymbol<*> ?: return if (callableReferenceAccess.isFullyQualified) return
saveCallable(referencedCallableSymbol, resolvedCallableReference.name) val resolvedSymbol = callableReferenceAccess.calleeReference.toResolvedCallableSymbol() ?: return
saveCallable(resolvedSymbol, resolvedSymbol.name)
} }
private fun processResolvedQualifier(resolvedQualifier: FirResolvedQualifier) { private fun processResolvedQualifier(resolvedQualifier: FirResolvedQualifier) {