[autocomplete] 131/143: RSTA/RSTALanguageSupport: JavaScript now syntax highlights and includes code completion for JSDoc.

[Benjamin Mesing]

This is an automated email from the git hooks/post-receive script.

ben pushed a commit to branch master
in repository autocomplete.

commit 356c9803be6e00e3cb2d4efd84413d0323beecff
Author: bobbylight <robert at fifesoft.com>
Date:   Thu Apr 25 02:00:24 2013 +0000

    RSTA/RSTALanguageSupport: JavaScript now syntax highlights and includes code completion for JSDoc.
---
 src/org/fife/ui/autocomplete/CompletionCellRenderer.java |   14 ++++++++++++++
 .../ui/autocomplete/LanguageAwareCompletionProvider.java |    7 +++++++
 src/org/fife/ui/autocomplete/TemplateCompletion.java     |    6 ++----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/org/fife/ui/autocomplete/CompletionCellRenderer.java b/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
index af6365a..2177f16 100644
--- a/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
+++ b/src/org/fife/ui/autocomplete/CompletionCellRenderer.java
@@ -428,6 +428,20 @@ public class CompletionCellRenderer extends DefaultListCellRenderer {
 		StringBuffer sb = new StringBuffer(PREFIX);
 		sb.append(c.getInputText());
 
+		if (c instanceof BasicCompletion) {
+			String definition = ((BasicCompletion)c).getShortDescription();
+			if (definition!=null) {
+				sb.append(" - ");
+				if (!selected) {
+					sb.append("<font color='").append(typeColor).append("'>");
+				}
+				sb.append(definition);
+				if (!selected) {
+					sb.append("</font>");
+				}
+			}
+		}
+
 		setText(sb.toString());
 
 	}
diff --git a/src/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java b/src/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java
index d8aef17..b5775cc 100644
--- a/src/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java
+++ b/src/org/fife/ui/autocomplete/LanguageAwareCompletionProvider.java
@@ -249,6 +249,13 @@ public class LanguageAwareCompletionProvider extends CompletionProviderBase
 				type = temp.type;
 			}
 
+			// TokenMakers can use types < 0 for "internal types."  This
+			// gives them a chance to map their internal types back to "real"
+			// types to get completion providers.
+			else if (type<0) {
+				type = doc.getClosestStandardTokenTypeForInternalType(type);
+			}
+
 			switch (type) {
 				case Token.ERROR_STRING_DOUBLE:
 					return getStringCompletionProvider();
diff --git a/src/org/fife/ui/autocomplete/TemplateCompletion.java b/src/org/fife/ui/autocomplete/TemplateCompletion.java
index 1cde2ea..507b2da 100644
--- a/src/org/fife/ui/autocomplete/TemplateCompletion.java
+++ b/src/org/fife/ui/autocomplete/TemplateCompletion.java
@@ -174,7 +174,6 @@ public class TemplateCompletion extends AbstractCompletion
 			ble.printStackTrace(); // Never happens
 		}
 		info.setCaretRange(minPos, maxPos);
-		int firstParamLen = 0;
 		int selStart = dot; // Default value
 		int selEnd = selStart;
 
@@ -210,10 +209,9 @@ public class TemplateCompletion extends AbstractCompletion
 				sb.append(text);
 				if (piece instanceof Param) {
 					info.addReplacementLocation(start, end);
-					if (firstParamLen==0) {
-						firstParamLen = text.length();
+					if (selStart==dot) {
 						selStart = start;
-						selEnd = selStart + firstParamLen;
+						selEnd = selStart + text.length();
 					}
 				}
 				else if (piece instanceof ParamCopy) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/autocomplete.git