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

Filtering of smart completion items in ordinary completion

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-06 15:37:12 +03:00
parent af2b6588c0
commit 2a8dcabbce
5 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+1 -1
View File
@@ -257,7 +257,7 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
val (additionalItems, inheritanceSearcher) = SmartCompletion(
expression!!, resolutionFacade, moduleDescriptor, bindingContext, isVisibleFilter, inDescriptor,
prefixMatcher, GlobalSearchScope.EMPTY_SCOPE, toFromOriginalFileMapper, lookupElementFactory)
.additionalItems(expectedInfos, smartCastCalculator!!, itemsToSkip = emptySet(), forOrdinaryCompletion = true)
.additionalItems(expectedInfos, smartCastCalculator!!, forOrdinaryCompletion = true)
collector.addElements(additionalItems)
}
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
+17 -19
View File
@@ -114,10 +114,8 @@ class SmartCompletion(
val smartCastCalculator = SmartCastCalculator(bindingContext, moduleDescriptor, expression)
val itemsToSkip = calcItemsToSkip(expressionWithType)
fun filterDeclaration(descriptor: DeclarationDescriptor): Collection<LookupElement> {
if (descriptor in itemsToSkip) return emptyList()
if (descriptor in descriptorsToSkip) return emptyList()
val result = SmartList<LookupElement>()
val types = descriptor.fuzzyTypesForSmartCompletion(smartCastCalculator)
@@ -140,7 +138,7 @@ class SmartCompletion(
return result
}
val (additionalItems, inheritanceSearcher) = additionalItems(expectedInfos, smartCastCalculator, itemsToSkip)
val (additionalItems, inheritanceSearcher) = additionalItems(expectedInfos, smartCastCalculator)
return Result(::filterDeclaration, additionalItems, inheritanceSearcher)
}
@@ -148,7 +146,6 @@ class SmartCompletion(
public fun additionalItems(
expectedInfos: Collection<ExpectedInfo>,
smartCastCalculator: SmartCastCalculator,
itemsToSkip: Set<DeclarationDescriptor>,
forOrdinaryCompletion: Boolean = false
): Pair<Collection<LookupElement>, InheritanceItemsSearcher?> {
val items = ArrayList<LookupElement>()
@@ -158,7 +155,7 @@ class SmartCompletion(
.addTo(items, inheritanceSearchers, expectedInfos)
if (expression is JetSimpleNameExpression) {
StaticMembers(bindingContext, lookupElementFactory).addToCollection(items, expectedInfos, expression, itemsToSkip)
StaticMembers(bindingContext, lookupElementFactory).addToCollection(items, expectedInfos, expression, descriptorsToSkip)
}
if (!forOrdinaryCompletion) {
@@ -231,16 +228,17 @@ class SmartCompletion(
return null
}
private fun calcItemsToSkip(expression: JetExpression): Set<DeclarationDescriptor> {
val parent = expression.getParent()
when(parent) {
public val descriptorsToSkip: Set<DeclarationDescriptor> by lazy<Set<DeclarationDescriptor>> {
val expressionWithType = expression.toExpressionWithType()
val parent = expressionWithType.getParent()
when (parent) {
is JetBinaryExpression -> {
if (parent.getRight() == expression) {
if (parent.getRight() == expressionWithType) {
val operationToken = parent.getOperationToken()
if (operationToken == JetTokens.EQ || operationToken in COMPARISON_TOKENS) {
val left = parent.getLeft()
if (left is JetReferenceExpression) {
return bindingContext[BindingContext.REFERENCE_TARGET, left].singletonOrEmptySet()
return@lazy bindingContext[BindingContext.REFERENCE_TARGET, left].singletonOrEmptySet()
}
}
}
@@ -249,18 +247,18 @@ class SmartCompletion(
is JetWhenConditionWithExpression -> {
val entry = parent.getParent() as JetWhenEntry
val whenExpression = entry.getParent() as JetWhenExpression
val subject = whenExpression.getSubjectExpression() ?: return setOf()
val subject = whenExpression.getSubjectExpression() ?: return@lazy emptySet()
val itemsToSkip = HashSet<DeclarationDescriptor>()
val descriptorsToSkip = HashSet<DeclarationDescriptor>()
if (subject is JetSimpleNameExpression) {
val variable = bindingContext[BindingContext.REFERENCE_TARGET, subject] as? VariableDescriptor
if (variable != null) {
itemsToSkip.add(variable)
descriptorsToSkip.add(variable)
}
}
val subjectType = bindingContext.getType(subject) ?: return setOf()
val subjectType = bindingContext.getType(subject) ?: return@lazy emptySet()
val classDescriptor = TypeUtils.getClassDescriptor(subjectType)
if (classDescriptor != null && DescriptorUtils.isEnumClass(classDescriptor)) {
val conditions = whenExpression.getEntries()
@@ -268,18 +266,18 @@ class SmartCompletion(
.filterIsInstance<JetWhenConditionWithExpression>()
for (condition in conditions) {
val selectorExpr = (condition.getExpression() as? JetDotQualifiedExpression)
?.getSelectorExpression() as? JetReferenceExpression ?: continue
?.getSelectorExpression() as? JetReferenceExpression ?: continue
val target = bindingContext[BindingContext.REFERENCE_TARGET, selectorExpr] as? ClassDescriptor ?: continue
if (DescriptorUtils.isEnumEntry(target)) {
itemsToSkip.add(target)
descriptorsToSkip.add(target)
}
}
}
return itemsToSkip
return@lazy descriptorsToSkip
}
}
return setOf()
return@lazy emptySet()
}
private fun toFunctionReferenceLookupElement(descriptor: DeclarationDescriptor,
idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt
Vendored
+17
View File
@@ -0,0 +1,17 @@
enum class E {
A,
B,
C
}
fun foo(e: E) {
when (e) {
E.A -> {}
<caret>
}
}
// EXIST: { lookupString:"B", itemText:"E.B", tailText:" (<root>)", typeText:"E" }
// EXIST: { lookupString:"C", itemText:"E.C", tailText:" (<root>)", typeText:"E" }
// ABSENT: A
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+6
View File
@@ -1337,6 +1337,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/MultipleArgs.kt");
doTest(fileName);
}
@TestMetadata("WhenByEnum.kt")
public void testWhenByEnum() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt");
doTest(fileName);
}
}
@TestMetadata("idea/idea-completion/testData/basic/common/immediateMembers")
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+6
View File
@@ -1337,6 +1337,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/MultipleArgs.kt");
doTest(fileName);
}
@TestMetadata("WhenByEnum.kt")
public void testWhenByEnum() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/fromSmart/WhenByEnum.kt");
doTest(fileName);
}
}
@TestMetadata("idea/idea-completion/testData/basic/common/immediateMembers")