Skip to content

Commit

Permalink
model support for autocompleting overloaded decs
Browse files Browse the repository at this point in the history
  • Loading branch information
@gavinking
gavinking committed Feb 27, 2012
1 parent adb68ca commit 8c4cfe9
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 29 deletions.
6 changes: 3 additions & 3 deletions src/com/redhat/ceylon/compiler/typechecker/model/Element.java
View file
Expand Up @@ -120,12 +120,12 @@ else if (getContainer()!=null) {
}
}

public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = getContainer()
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = getContainer()
.getMatchingDeclarations(unit, startingWith, proximity+1);
for (Declaration d: getMembers()) {
if (isResolvable(d) && isNameMatching(startingWith, d)) {
result.put(d.getName(), new DeclarationWithProximity(d, proximity));
result.put(new DeclarationKey(d), new DeclarationWithProximity(d, proximity));
}
}
return result;
Expand Down
2 changes: 1 addition & 1 deletion src/com/redhat/ceylon/compiler/typechecker/model/ImportList.java
View file
Expand Up @@ -73,7 +73,7 @@ public void setContainer(Package container) {
}

@Override
public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit,
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit,
String startingWith, int proximity) {
if (importedPackage!=null) {
return importedPackage.getImportableDeclarations(unit, startingWith, imports, proximity);
Expand Down
6 changes: 3 additions & 3 deletions src/com/redhat/ceylon/compiler/typechecker/model/NamedArgumentList.java
View file
Expand Up @@ -17,12 +17,12 @@ public void setParameterList(ParameterList parameterList) {
}

@Override
public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = super.getMatchingDeclarations(unit, startingWith, proximity+1);
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = super.getMatchingDeclarations(unit, startingWith, proximity+1);
if (getParameterList()!=null) {
for (Parameter p: getParameterList().getParameters()) {
if (p.getName().startsWith(startingWith) && !getArgumentNames().contains(p.getName())) {
result.put(p.getName(), new DeclarationWithProximity(p, proximity));
result.put(new DeclarationKey(p), new DeclarationWithProximity(p, proximity));
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/com/redhat/ceylon/compiler/typechecker/model/Package.java
View file
Expand Up @@ -6,9 +6,9 @@
import static com.redhat.ceylon.compiler.typechecker.model.Util.lookupMember;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;

public class Package implements Scope {

Expand Down Expand Up @@ -155,11 +155,11 @@ public TypeDeclaration getInheritingDeclaration(Declaration d) {
}

@Override
public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = new TreeMap<String, DeclarationWithProximity>();
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = new HashMap<DeclarationKey, DeclarationWithProximity>();
for (Declaration d: getMembers()) {
if (isResolvable(d) && isNameMatching(startingWith, d)) {
result.put(d.getName(), new DeclarationWithProximity(d, proximity+1));
result.put(new DeclarationKey(d), new DeclarationWithProximity(d, proximity+1));
}
}
if (unit!=null) {
Expand All @@ -168,8 +168,8 @@ public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit,
return result;
}

Map<String, DeclarationWithProximity> getImportableDeclarations(Unit unit, String startingWith, List<Import> imports, int proximity) {
Map<String, DeclarationWithProximity> result = new TreeMap<String, DeclarationWithProximity>();
Map<DeclarationKey, DeclarationWithProximity> getImportableDeclarations(Unit unit, String startingWith, List<Import> imports, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = new HashMap<DeclarationKey, DeclarationWithProximity>();
for (Declaration d: getMembers()) {
if (isResolvable(d) && d.isShared() && isNameMatching(startingWith, d) ) {
boolean already = false;
Expand All @@ -180,7 +180,7 @@ Map<String, DeclarationWithProximity> getImportableDeclarations(Unit unit, Strin
}
}
if (!already) {
result.put(d.getName(), new DeclarationWithProximity(d, proximity));
result.put(new DeclarationKey(d), new DeclarationWithProximity(d, proximity));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/com/redhat/ceylon/compiler/typechecker/model/Scope.java
View file
Expand Up @@ -26,7 +26,7 @@ public interface Scope {

public Scope getContainer();

public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity);
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity);

@Deprecated
public List<Declaration> getMembers();
Expand Down
10 changes: 5 additions & 5 deletions src/com/redhat/ceylon/compiler/typechecker/model/TypeDeclaration.java
View file
Expand Up @@ -509,16 +509,16 @@ public ProducedType getSelfType() {
}

@Override
public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = getMatchingMemberDeclarations(startingWith, proximity);
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = getMatchingMemberDeclarations(startingWith, proximity);
//TODO: is this correct? I thought inherited declarations hide outer
// declarations! I think this is a bug
result.putAll(super.getMatchingDeclarations(unit, startingWith, proximity));
return result;
}

public Map<String, DeclarationWithProximity> getMatchingMemberDeclarations(String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = new TreeMap<String, DeclarationWithProximity>();
public Map<DeclarationKey, DeclarationWithProximity> getMatchingMemberDeclarations(String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = new HashMap<DeclarationKey, DeclarationWithProximity>();
TypeDeclaration et = getExtendedTypeDeclaration();
for (TypeDeclaration st: getSatisfiedTypeDeclarations()) {
//TODO: account for the case where one interface refines
Expand All @@ -534,7 +534,7 @@ public Map<String, DeclarationWithProximity> getMatchingMemberDeclarations(Strin
for (Declaration d: getMembers()) {
if (isResolvable(d) && d.isShared() &&
isNameMatching(startingWith, d)) {
result.put(d.getName(), new DeclarationWithProximity(d, proximity));
result.put(new DeclarationKey(d), new DeclarationWithProximity(d, proximity));
}
}
//TODO: self type?
Expand Down
6 changes: 3 additions & 3 deletions src/com/redhat/ceylon/compiler/typechecker/model/TypedDeclaration.java
View file
Expand Up @@ -87,16 +87,16 @@ public boolean isVariable() {
}

@Override
public Map<String, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = super.getMatchingDeclarations(unit, startingWith, proximity);
public Map<DeclarationKey, DeclarationWithProximity> getMatchingDeclarations(Unit unit, String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = super.getMatchingDeclarations(unit, startingWith, proximity);
TypeDeclaration td = getTypeDeclaration();
if (td instanceof Class && !((Class) td).isAbstract()) {
//in case this is a named argument style definition,
//add the parameters of the return type
//TODO: they should not hide locals with the same name!
for ( Parameter p: ((Class) td).getParameterList().getParameters() ) {
if ( isNameMatching(startingWith, p) ) {
result.put(p.getName(), new DeclarationWithProximity(p, proximity));
result.put(new DeclarationKey(p), new DeclarationWithProximity(p, proximity));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/com/redhat/ceylon/compiler/typechecker/model/UnionType.java
View file
Expand Up @@ -63,10 +63,10 @@ else if (getCaseTypes().size()==1) {
}

@Override
public Map<String, DeclarationWithProximity> getMatchingMemberDeclarations(String startingWith, int proximity) {
public Map<DeclarationKey, DeclarationWithProximity> getMatchingMemberDeclarations(String startingWith, int proximity) {
//TODO: this can result in the wrong parameter types, and the
// same bug also affects intersection types
Map<String, DeclarationWithProximity> result = super.getMatchingMemberDeclarations(startingWith, proximity);
Map<DeclarationKey, DeclarationWithProximity> result = super.getMatchingMemberDeclarations(startingWith, proximity);
result.putAll(getCaseTypes().get(0).getDeclaration().getMatchingMemberDeclarations(startingWith, proximity));
for (ProducedType ct: getCaseTypes()) {
result.keySet().retainAll(ct.getDeclaration().getMatchingMemberDeclarations(startingWith, proximity).keySet());
Expand Down
8 changes: 4 additions & 4 deletions src/com/redhat/ceylon/compiler/typechecker/model/Unit.java
View file
Expand Up @@ -5,11 +5,11 @@
import static com.redhat.ceylon.compiler.typechecker.model.Util.unionType;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;

import com.redhat.ceylon.compiler.typechecker.tree.Tree.Identifier;

Expand Down Expand Up @@ -113,12 +113,12 @@ public Declaration getImportedDeclaration(TypeDeclaration td, String name,
return null;
}

public Map<String, DeclarationWithProximity> getMatchingImportedDeclarations(String startingWith, int proximity) {
Map<String, DeclarationWithProximity> result = new TreeMap<String, DeclarationWithProximity>();
public Map<DeclarationKey, DeclarationWithProximity> getMatchingImportedDeclarations(String startingWith, int proximity) {
Map<DeclarationKey, DeclarationWithProximity> result = new HashMap<DeclarationKey, DeclarationWithProximity>();
for (Import i: getImports()) {
if (i.getAlias()!=null &&
i.getAlias().toLowerCase().startsWith(startingWith.toLowerCase())) {
result.put(i.getAlias(), new DeclarationWithProximity(i, proximity));
result.put(new DeclarationKey(i), new DeclarationWithProximity(i, proximity));
}
}
return result;
Expand Down
5 changes: 5 additions & 0 deletions src/com/redhat/ceylon/compiler/typechecker/model/Util.java
View file
Expand Up @@ -201,6 +201,11 @@ static boolean isNameMatching(String startingWith, Declaration d) {
d.getName().toLowerCase().startsWith(startingWith.toLowerCase());
}

static boolean isAbstraction(Declaration d) {
return d instanceof Functional ?
((Functional) d).isAbstraction() : false;
}

/**
* Collect together type arguments given a list of
* type arguments to a declaration and the receiving
Expand Down

0 comments on commit 8c4cfe9

Please sign in to comment.