[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2751] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/codeassist/CompletionEngine.java

[<caw...@us...>]

Revision: 2751
          http://svn.sourceforge.net/rubyeclipse/?rev=2751&view=rev
Author:   cawilliams
Date:     2007-07-12 08:15:55 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
when suggesting type names, only suggest unique names (remove duplicates)

Modified Paths:
--------------
    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/CompletionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java	2007-07-12 13:50:45 UTC (rev 2750)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/CompletionEngine.java	2007-07-12 15:15:55 UTC (rev 2751)
@@ -52,7 +52,6 @@
 import org.rubypeople.rdt.core.search.SearchParticipant;
 import org.rubypeople.rdt.core.search.SearchPattern;
 import org.rubypeople.rdt.internal.core.RubyElement;
-import org.rubypeople.rdt.internal.core.RubyScript;
 import org.rubypeople.rdt.internal.core.RubyType;
 import org.rubypeople.rdt.internal.core.parser.RubyParser;
 import org.rubypeople.rdt.internal.core.search.BasicSearchEngine;
@@ -334,11 +333,14 @@
 		SearchPattern pattern = SearchPattern.createPattern(IRubyElement.TYPE, "*", IRubySearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH);
 		IRubySearchScope scope = BasicSearchEngine.createRubySearchScope(new IRubyElement[] {fContext.getScript().getRubyProject()});
 		List<SearchMatch> results = search(pattern, scope);		
+		Set<String> names = new HashSet<String>();
 		for (SearchMatch match: results) {
 			IRubyElement element = (IRubyElement) match.getElement();
 			String name = element.getElementName();
 			if (!fContext.prefixStartsWith(name))
 				continue;
+			if (names.contains(name)) continue;
+			names.add(name);
 			CompletionProposal proposal = createProposal(fContext.getReplaceStart(), CompletionProposal.TYPE_REF, name, element);
 			proposal.setType(name);
 			fRequestor.accept(proposal);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.