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

use the power of DescriptorPredicate in completion

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-16 06:44:17 +04:00
parent 010db0495b
commit 65b74a19b4
8 changed files with 139 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/cli/jvm/compiler/TipsManager.java
+29 -28
View File
@@ -32,9 +32,9 @@ import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.calls.autocasts.AutoCastServiceImpl;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
import org.jetbrains.jet.lang.resolve.name.NamePredicate;
import org.jetbrains.jet.lang.resolve.scopes.DescriptorPredicate;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.JetScopeUtils;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
import org.jetbrains.jet.lang.types.JetType;
@@ -52,7 +52,8 @@ public final class TipsManager {
}
@NotNull
public static Collection<DeclarationDescriptor> getReferenceVariants(JetSimpleNameExpression expression, BindingContext context) {
public static Collection<DeclarationDescriptor> getReferenceVariants(
JetSimpleNameExpression expression, BindingContext context, @NotNull NamePredicate name) {
JetExpression receiverExpression = expression.getReceiverExpression();
if (receiverExpression != null) {
// Process as call expression
@@ -74,32 +75,30 @@ public final class TipsManager {
for (ReceiverDescriptor descriptor : variantsForExplicitReceiver) {
descriptors.addAll(includeExternalCallableExtensions(
// TODO: better predicate
excludePrivateDescriptors(descriptor.getType().getMemberScope().getAllDescriptors(DescriptorPredicate.all())),
resolutionScope, descriptor));
excludePrivateDescriptors(descriptor.getType().getMemberScope().getAllDescriptors(DescriptorPredicate.hasName(name))),
resolutionScope, descriptor, name));
}
return descriptors;
}
return includeExternalCallableExtensions(
// TODO: better predicate
excludePrivateDescriptors(expressionType.getMemberScope().getAllDescriptors(DescriptorPredicate.all())),
resolutionScope, new ExpressionReceiver(receiverExpression, expressionType));
excludePrivateDescriptors(expressionType.getMemberScope().getAllDescriptors(DescriptorPredicate.hasName(name))),
resolutionScope, new ExpressionReceiver(receiverExpression, expressionType), name);
}
return Collections.emptyList();
}
else {
return getVariantsNoReceiver(expression, context);
return getVariantsNoReceiver(expression, context, name);
}
}
public static Collection<DeclarationDescriptor> getVariantsNoReceiver(JetExpression expression, BindingContext context) {
public static Collection<DeclarationDescriptor> getVariantsNoReceiver(
JetExpression expression, BindingContext context, @NotNull NamePredicate name) {
JetScope resolutionScope = context.get(BindingContext.RESOLUTION_SCOPE, expression);
if (resolutionScope != null) {
if (expression.getParent() instanceof JetImportDirective || expression.getParent() instanceof JetNamespaceHeader) {
// TODO: better predicate
return excludeNonPackageDescriptors(resolutionScope.getAllDescriptors(DescriptorPredicate.all()));
return resolutionScope.getAllDescriptors(DescriptorPredicate.namespaces(name));
}
else {
Collection<DeclarationDescriptor> descriptorsSet = Sets.newHashSet();
@@ -109,13 +108,11 @@ public final class TipsManager {
for (ReceiverDescriptor receiverDescriptor : result) {
JetType receiverType = receiverDescriptor.getType();
// TODO: better predicate
descriptorsSet.addAll(receiverType.getMemberScope().getAllDescriptors(DescriptorPredicate.all()));
descriptorsSet.addAll(receiverType.getMemberScope().getAllDescriptors(DescriptorPredicate.hasName(name)));
}
// TODO: better predicate
descriptorsSet.addAll(resolutionScope.getAllDescriptors(DescriptorPredicate.all()));
return excludeNotCallableExtensions(excludePrivateDescriptors(descriptorsSet), resolutionScope);
descriptorsSet.addAll(resolutionScope.getAllDescriptors(DescriptorPredicate.hasName(name)));
return excludeNotCallableExtensions(excludePrivateDescriptors(descriptorsSet), resolutionScope, name);
}
}
return Collections.emptyList();
@@ -148,7 +145,9 @@ public final class TipsManager {
}
public static Collection<DeclarationDescriptor> excludeNotCallableExtensions(
@NotNull Collection<? extends DeclarationDescriptor> descriptors, @NotNull final JetScope scope
@NotNull Collection<? extends DeclarationDescriptor> descriptors,
@NotNull final JetScope scope,
@NotNull NamePredicate name
) {
final Set<DeclarationDescriptor> descriptorsSet = Sets.newHashSet(descriptors);
@@ -156,9 +155,10 @@ public final class TipsManager {
scope.getImplicitReceiversHierarchy(result);
descriptorsSet.removeAll(
Collections2.filter(JetScopeUtils.getAllExtensions(scope), new Predicate<CallableDescriptor>() {
Collections2.filter(scope.getAllDescriptors(DescriptorPredicate.extension(name)), new Predicate<DeclarationDescriptor>() {
@Override
public boolean apply(CallableDescriptor callableDescriptor) {
public boolean apply(DeclarationDescriptor declarationDescriptor) {
CallableDescriptor callableDescriptor = (CallableDescriptor) declarationDescriptor;
if (!callableDescriptor.getReceiverParameter().exists()) {
return false;
}
@@ -187,7 +187,8 @@ public final class TipsManager {
private static Set<DeclarationDescriptor> includeExternalCallableExtensions(
@NotNull Collection<DeclarationDescriptor> descriptors,
@NotNull final JetScope externalScope,
@NotNull final ReceiverDescriptor receiverDescriptor
@NotNull final ReceiverDescriptor receiverDescriptor,
@NotNull NamePredicate name
) {
// It's impossible to add extension function for namespace
JetType receiverType = receiverDescriptor.getType();
@@ -198,13 +199,13 @@ public final class TipsManager {
Set<DeclarationDescriptor> descriptorsSet = Sets.newHashSet(descriptors);
descriptorsSet.addAll(
Collections2.filter(JetScopeUtils.getAllExtensions(externalScope),
new Predicate<CallableDescriptor>() {
@Override
public boolean apply(CallableDescriptor callableDescriptor) {
return ExpressionTypingUtils.checkIsExtensionCallable(receiverDescriptor, callableDescriptor);
}
}));
Collections2.filter(externalScope.getAllDescriptors(DescriptorPredicate.extension(name)),
new Predicate<DeclarationDescriptor>() {
@Override
public boolean apply(DeclarationDescriptor callableDescriptor) {
return ExpressionTypingUtils.checkIsExtensionCallable(receiverDescriptor, (CallableDescriptor) callableDescriptor);
}
}));
return descriptorsSet;
}