[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1606] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/text/ruby/RubyScriptCompletion.java

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

Revision: 1606
          http://svn.sourceforge.net/rubyeclipse/?rev=1606&view=rev
Author:   cawilliams
Date:     2006-09-02 13:57:25 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
create method proposals differently from keywords, use a method image

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyScriptCompletion.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyScriptCompletion.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyScriptCompletion.java	2006-09-02 20:56:55 UTC (rev 1605)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyScriptCompletion.java	2006-09-02 20:57:25 UTC (rev 1606)
@@ -24,6 +24,7 @@
 	/** Tells whether this class is in debug mode. */
 	private static final boolean DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("org.rubypeople.rdt.ui/debug/ResultCollector"));  //$NON-NLS-1$//$NON-NLS-2$
 
+	private final CompletionProposalLabelProvider fLabelProvider= new CompletionProposalLabelProvider();
 	private final ImageDescriptorRegistry fRegistry= RubyPlugin.getImageDescriptorRegistry();
 
 	/** Triggers for variables. Do not modify. */
@@ -188,7 +189,7 @@
 	protected IRubyCompletionProposal createRubyCompletionProposal(CompletionProposal proposal) {
 //		switch (proposal.getKind()) {
 //			case CompletionProposal.KEYWORD:
-				return createKeywordProposal(proposal);
+//				return createKeywordProposal(proposal);
 //			case CompletionProposal.TYPE_REF:
 //				return createTypeProposal(proposal);
 //			case CompletionProposal.FIELD_REF:
@@ -205,11 +206,39 @@
 //			default:
 //				return null;
 //		}
+		switch (proposal.getKind()) {
+		case CompletionProposal.KEYWORD:
+			return createKeywordProposal(proposal);
+		case CompletionProposal.METHOD_REF:
+		case CompletionProposal.METHOD_NAME_REFERENCE:
+			return createMethodReferenceProposal(proposal);
+		default:
+			return createKeywordProposal(proposal);
+		}
 	}
 	
+	private IRubyCompletionProposal createMethodReferenceProposal(CompletionProposal proposal) {
+		String completion= proposal.getCompletion();
+		int start= proposal.getReplaceStart();
+		int length= getLength(proposal);
+		String label= proposal.getName();
+		int relevance= computeRelevance(proposal);
+		Image image = getImage(fLabelProvider.createImageDescriptor(proposal));
+		return new RubyCompletionProposal(completion, start, length, image, label, relevance);
+	}
 	
+	/**
+	 * Returns the ruby script that the receiver operates on, or
+	 * <code>null</code> if the <code>IRubyProject</code> constructor was
+	 * used to create the receiver.
+	 *
+	 * @return the ruby script that the receiver operates on, or
+	 *         <code>null</code>
+	 */
+	protected final IRubyScript getRubyScript() {
+		return fRubyScript;
+	}
 	
-	
 	/**
 	 * Returns a cached image for the given descriptor.
 	 *


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