Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2604] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/codeassist
|
From: <caw...@us...> - 2007-06-12 15:37:54
|
Revision: 2604
http://svn.sourceforge.net/rubyeclipse/?rev=2604&view=rev
Author: cawilliams
Date: 2007-06-12 08:37:53 -0700 (Tue, 12 Jun 2007)
Log Message:
-----------
fix Trac ticket #4373 - handle code completion after ::
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionContext.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionContext.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionContext.java 2007-06-12 15:06:01 UTC (rev 2603)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionContext.java 2007-06-12 15:37:53 UTC (rev 2604)
@@ -12,6 +12,7 @@
private String partialPrefix;
private String fullPrefix;
private int replaceStart;
+ private boolean isAfterDoubleSemiColon = false;
public CompletionContext(IRubyScript script, int offset) throws RubyModelException {
this.script = script;
@@ -38,6 +39,21 @@
// TODO What if there is a valid character after this, so syntax isn't broken?
source.deleteCharAt(i);
break;
+ case ':':
+ if (i > 0) {
+ // Check character before this for :
+ char previous = source.charAt(i - 1);
+ if (previous == ':') {
+ isAfterDoubleSemiColon = true;
+ source.deleteCharAt(i);
+ source.deleteCharAt(i - 1);
+ tmpPrefix.insert(0, "::");
+ partialPrefix = "";
+ i--;
+ continue;
+ }
+ }
+ break;
}
}
if (curChar == '.') {
@@ -139,6 +155,10 @@
public boolean isGlobal() {
return !emptyPrefix() && !isExplicitMethodInvokation() && getPartialPrefix().startsWith("$");
}
+
+ public boolean isDoubleSemiColon() {
+ return isAfterDoubleSemiColon;
+ }
public boolean fullPrefixIsConstant() {
if (getFullPrefix() == null || getFullPrefix().length() == 0) return false;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java 2007-06-12 15:06:01 UTC (rev 2603)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java 2007-06-12 15:37:53 UTC (rev 2604)
@@ -85,6 +85,27 @@
suggestMethodsForEnclosingType(script);
getDocumentsRubyElementsInScope();
} else {
+ if (fContext.isDoubleSemiColon()) {
+ String prefix = fContext.getFullPrefix();
+ prefix = prefix.substring(0, prefix.length() - 2);
+ RubyElementRequestor requestor = new RubyElementRequestor(script);
+ IType[] types = requestor.findType(prefix);
+ for (int i = 0; i < types.length; i++) {
+ IType type = types[i];
+ suggestTypesConstants(type);
+// Suggest nested types
+ suggestNestedTypes(type);
+ // Suggest class level methods
+ Map<String, CompletionProposal> map = suggestMethods(100, type, false);
+ for (CompletionProposal proposal : map.values()) {
+ fRequestor.accept(proposal);
+ }
+ }
+
+ this.fRequestor.endReporting();
+ fContext = null;
+ return;
+ }
if (fContext.isConstant()) { // type or constant
suggestTypeNames();
suggestConstantNames();
@@ -102,7 +123,7 @@
String name = guess.getType();
IType[] types = requestor.findType(name); // FIXME When syntax is broken, grabbing type that is defined in same script like this just doesn't work!
for (int i = 0; i < types.length; i++) {
- Map<String, CompletionProposal> map = suggestMethods(guess.getConfidence(), types[i]);
+ Map<String, CompletionProposal> map = suggestMethods(guess.getConfidence(), types[i], true);
list.addAll(map.values());
}
}
@@ -127,6 +148,34 @@
fContext = null;
}
+ private void suggestTypesConstants(IType type) throws RubyModelException {
+ SearchPattern pattern = SearchPattern.createPattern(IRubyElement.CONSTANT, "*", IRubySearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH);
+ IRubySearchScope scope = BasicSearchEngine.createRubySearchScope(new IRubyElement[] {type});
+ List<SearchMatch> results = search(pattern, scope);
+ for (SearchMatch match: results) {
+ IRubyElement element = (IRubyElement) match.getElement();
+ if (element.getElementType() != IRubyElement.CONSTANT) continue; // XXX we shouldn't have to do this
+ // Add proposal
+ CompletionProposal proposal = createProposal(fContext.getReplaceStart(), CompletionProposal.FIELD_REF, element.getElementName());
+ proposal.setType(type.getFullyQualifiedName());
+ fRequestor.accept(proposal);
+ }
+ }
+
+ private void suggestNestedTypes(IType type) throws RubyModelException {
+ SearchPattern pattern = SearchPattern.createPattern(IRubyElement.TYPE, "*", IRubySearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH);
+ IRubySearchScope scope = BasicSearchEngine.createRubySearchScope(new IRubyElement[] {type});
+ List<SearchMatch> results = search(pattern, scope);
+ for (SearchMatch match: results) {
+ IType aType = (IType) match.getElement();
+ if (!aType.getFullyQualifiedName().startsWith(type.getFullyQualifiedName()) || aType.getFullyQualifiedName().equals(type.getFullyQualifiedName())) continue;
+ // Add proposal
+ CompletionProposal proposal = createProposal(fContext.getReplaceStart(), CompletionProposal.TYPE_REF, aType.getElementName());
+ proposal.setType(aType.getFullyQualifiedName());
+ fRequestor.accept(proposal);
+ }
+ }
+
private List<CompletionProposal> suggestAllMethodsMatchingPrefix(IRubyScript script) {
List< CompletionProposal> list = new ArrayList<CompletionProposal>();
IRubySearchScope scope = BasicSearchEngine.createRubySearchScope(new IRubyElement[] {script.getRubyProject()});
@@ -167,7 +216,7 @@
type = element.getDeclaringType();
}
if (type == null) return;
- List<CompletionProposal> list = sort(suggestMethods(100, type));
+ List<CompletionProposal> list = sort(suggestMethods(100, type, true));
for (CompletionProposal proposal : list) {
fRequestor.accept(proposal);
}
@@ -243,19 +292,22 @@
}
}
- private Map<String, CompletionProposal> suggestMethods(int confidence, IType type) throws RubyModelException {
+ private Map<String, CompletionProposal> suggestMethods(int confidence, IType type, boolean includeInstanceMethods) throws RubyModelException {
Map<String, CompletionProposal> proposals = new HashMap<String, CompletionProposal>();
if (type == null)
return proposals;
IMethod[] methods = type.getMethods();
for (int k = 0; k < methods.length; k++) {
+ if (!includeInstanceMethods && !methods[k].isSingleton()) {
+ continue;
+ }
CompletionProposal proposal = suggestMethod(methods[k], type.getElementName(), confidence);
if (proposal != null && !proposals.containsKey(proposal.getName())) {
proposals.put(proposal.getName(), proposal); // If a method name matches an existing suggestion (i.e. its overriden in the subclass), don't suggest it again!
}
}
proposals.putAll(addModuleMethods(confidence - 1, type)); // Decrement confidence by one as a hack to make sure as we move up the inheritance chain we suggest "closer" parents methods first
- if (!type.isModule()) proposals.putAll(addSuperClassMethods(confidence - 1, type));
+ if (!type.isModule()) proposals.putAll(addSuperClassMethods(confidence - 1, type, includeInstanceMethods));
return proposals;
}
@@ -274,7 +326,7 @@
for (int j = 0; j < moduleTypes.length; j++) {
try {
IType moduleType = moduleTypes[j];
- proposals.putAll(suggestMethods(confidence, moduleType));
+ proposals.putAll(suggestMethods(confidence, moduleType, true));
} catch (RubyModelException e) {
// ignore
}
@@ -283,7 +335,7 @@
return proposals;
}
- private Map<String, CompletionProposal> addSuperClassMethods(int confidence, IType type) throws RubyModelException {
+ private Map<String, CompletionProposal> addSuperClassMethods(int confidence, IType type, boolean includeInstanceMethods) throws RubyModelException {
Map<String, CompletionProposal> proposals = new HashMap<String, CompletionProposal>();
String superClass = type.getSuperclassName();
if (superClass == null) return proposals;
@@ -291,7 +343,7 @@
IType[] supers = requestor.findType(superClass);
for (int i = 0; i < supers.length; i++) {
IType superType = supers[i];
- proposals.putAll(suggestMethods(confidence, superType));
+ proposals.putAll(suggestMethods(confidence, superType, includeInstanceMethods));
}
return proposals;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
