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

Refactor the collecting of callable symbols from scopes

Browse Source
This commit is contained in:
Roman Golyshev
2020-06-24 18:40:12 +03:00
committed by Ilya Kirillov
parent 81f60bf252
commit 708c54f4d2
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
+33 -23
View File
@@ -72,36 +72,46 @@ private object KotlinFirCompletionProvider : CompletionProvider<CompletionParame
}
for (scope in scopes) {
for (name in scope.getCallableNames()) {
if (name.isConstructor) continue
for (symbol in scope.collectCallableSymbols()) {
val symbolName = symbol.callableId.callableName
if (symbolName.isConstructor) continue
fun processor(symbol: FirCallableSymbol<*>) {
val expectedReceiverType = symbol.fir.receiverTypeRef?.coneTypeUnsafe<ConeKotlinType>()
val expectedReceiverType = symbol.fir.receiverTypeRef?.coneTypeUnsafe<ConeKotlinType>()
if (expectedReceiverType != null) {
val receiverTypes = if (explicitReceiverType != null) {
listOf(explicitReceiverType)
} else {
towerDataContext.nonLocalTowerDataElements.mapNotNull { it.implicitReceiver?.type }
}
val expectedReceiverTypeIsPresent = receiverTypes.any {
AbstractTypeChecker.isSubtypeOf(completionContext.session.typeContext, it, expectedReceiverType)
}
if (expectedReceiverTypeIsPresent) {
result.addElement(LookupElementBuilder.create(name.asString()))
}
} else if (explicitReceiverType == null || symbol.callableId.classId == explicitReceiverType.classId) {
result.addElement(LookupElementBuilder.create(name.asString()))
if (expectedReceiverType != null) {
val receiverTypes = if (explicitReceiverType != null) {
listOf(explicitReceiverType)
} else {
towerDataContext.nonLocalTowerDataElements.mapNotNull { it.implicitReceiver?.type }
}
}
scope.processFunctionsByName(name, ::processor)
scope.processPropertiesByName(name, ::processor)
val expectedReceiverTypeIsPresent = receiverTypes.any {
AbstractTypeChecker.isSubtypeOf(completionContext.session.typeContext, it, expectedReceiverType)
}
if (expectedReceiverTypeIsPresent) {
result.addElement(LookupElementBuilder.create(symbolName.toString()))
}
} else if (explicitReceiverType == null || symbol.callableId.classId == explicitReceiverType.classId) {
result.addElement(LookupElementBuilder.create(symbolName.toString()))
}
}
}
}
private fun FirScope.collectCallableSymbols(): MutableList<FirCallableSymbol<*>> {
val allCallableSymbols = mutableListOf<FirCallableSymbol<*>>()
fun symbolsCollector(symbol: FirCallableSymbol<*>) {
allCallableSymbols.add(symbol)
}
for (name in getCallableNames()) {
processFunctionsByName(name, ::symbolsCollector)
processPropertiesByName(name, ::symbolsCollector)
}
return allCallableSymbols
}
private val Name.isConstructor get() = this == Name.special("<init>")
}