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

Refactor KotlinFirCompletionContributor

Browse Source 
Remove some code duplication
This commit is contained in:
Roman Golyshev
2021-03-29 16:34:53 +03:00
committed by Space
parent ff71dda065
commit 86348ed981
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
+12 -14
View File
@@ -177,13 +177,8 @@ private class KotlinCommonCompletionProvider(
val typeOfPossibleReceiver = explicitReceiver.getKtType()
val possibleReceiverScope = typeOfPossibleReceiver.getTypeScope() ?: return
val nonExtensionMembers = possibleReceiverScope
.getCallableSymbols(scopeNameFilter)
.filterNot { it.isExtension }
val extensionNonMembers = implicitScopes
.getCallableSymbols(scopeNameFilter)
.filter { it.isExtension && it.hasSuitableExtensionReceiver() }
val nonExtensionMembers = possibleReceiverScope.collectNonExtensions()
val extensionNonMembers = implicitScopes.collectSuitableExtensions(hasSuitableExtensionReceiver)
nonExtensionMembers.forEach { addSymbolToCompletion(result, expectedType, it) }
extensionNonMembers.forEach { addSymbolToCompletion(result, expectedType, it) }
@@ -201,13 +196,8 @@ private class KotlinCommonCompletionProvider(
) {
val (implicitScopes, implicitReceiversTypes) = implicitScopesContext
val availableNonExtensions = implicitScopes
.getCallableSymbols(scopeNameFilter)
.filterNot { it.isExtension }
val extensionsWhichCanBeCalled = implicitScopes
.getCallableSymbols(scopeNameFilter)
.filter { it.isExtension && it.hasSuitableExtensionReceiver() }
val availableNonExtensions = implicitScopes.collectNonExtensions()
val extensionsWhichCanBeCalled = implicitScopes.collectSuitableExtensions(hasSuitableExtensionReceiver)
availableNonExtensions.forEach { addSymbolToCompletion(result, expectedType, it) }
extensionsWhichCanBeCalled.forEach { addSymbolToCompletion(result, expectedType, it) }
@@ -237,6 +227,14 @@ private class KotlinCommonCompletionProvider(
.filter(hasSuitableExtensionReceiver)
}
private fun KtScope.collectNonExtensions(): Sequence<KtCallableSymbol> =
getCallableSymbols(scopeNameFilter).filterNot { it.isExtension }
private fun KtScope.collectSuitableExtensions(
hasSuitableExtensionReceiver: KtCallableSymbol.() -> Boolean
): Sequence<KtCallableSymbol> =
getCallableSymbols(scopeNameFilter).filter { it.isExtension && it.hasSuitableExtensionReceiver() }
private fun KtAnalysisSession.findAllNamesOfTypes(implicitReceiversTypes: List<KtType>) =
implicitReceiversTypes.flatMapTo(hashSetOf()) { with(typeNamesProvider) { findAllNames(it) } }
}