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

No double-filtering

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-02 15:29:40 +03:00
parent fe5dbbf9b3
commit 19f9f27675
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+1 -5
View File
@@ -211,11 +211,7 @@ class SmartCompletionSession(configuration: CompletionSessionConfiguration, para
val filter = result.declarationFilter val filter = result.declarationFilter
if (filter != null) { if (filter != null) {
getReferenceVariants(DESCRIPTOR_KIND_MASK).forEach { getReferenceVariants(DESCRIPTOR_KIND_MASK).forEach { collector.addElements(filter(it)) }
if (prefixMatcher.prefixMatches(it.getName().asString())) {
collector.addElements(filter(it))
}
}
flushToResultSet() flushToResultSet()
idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
+1 -2
View File
@@ -107,8 +107,7 @@ class SmartCompletion(val expression: JetSimpleNameExpression,
fun filterDeclaration(descriptor: DeclarationDescriptor): Collection<LookupElement> { fun filterDeclaration(descriptor: DeclarationDescriptor): Collection<LookupElement> {
val result = ArrayList<LookupElement>() val result = ArrayList<LookupElement>()
if (!itemsToSkip.contains(descriptor) if (!itemsToSkip.contains(descriptor)) {
&& descriptor !is SamConstructorDescriptor /* SAM-constructor is added explicitly and is not needed here */) {
val types = typesWithSmartCasts(descriptor) val types = typesWithSmartCasts(descriptor)
val nonNullTypes = types.map { it.makeNotNullable() } val nonNullTypes = types.map { it.makeNotNullable() }
val classifier = { (expectedInfo: ExpectedInfo) -> val classifier = { (expectedInfo: ExpectedInfo) ->
idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+5 -11
View File
@@ -413,19 +413,13 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith
Collection<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>> itemsToShow = new ArrayList<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>>(); Collection<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>> itemsToShow = new ArrayList<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>>();
for (DeclarationDescriptor variant : variants) { for (DeclarationDescriptor variant : variants) {
if (variant instanceof FunctionDescriptor) { if (variant instanceof FunctionDescriptor) {
FunctionDescriptor functionDescriptor = (FunctionDescriptor) variant; //todo: renamed functions?
if (functionDescriptor.getName().equals(refName)) { itemsToShow.add(Pair.create((FunctionDescriptor) variant, resolveSession));
//todo: renamed functions?
itemsToShow.add(Pair.create(functionDescriptor, resolveSession));
}
} }
else if (variant instanceof ClassDescriptor) { else if (variant instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) variant; //todo: renamed classes?
if (classDescriptor.getName().equals(refName)) { for (ConstructorDescriptor constructorDescriptor : ((ClassDescriptor) variant).getConstructors()) {
//todo: renamed classes? itemsToShow.add(Pair.create(constructorDescriptor, resolveSession));
for (ConstructorDescriptor constructorDescriptor : classDescriptor.getConstructors()) {
itemsToShow.add(Pair.create(constructorDescriptor, resolveSession));
}
} }
} }
} }