[autocomplete] 103/143: AutoComplete: Template completions with no params should move caret to ${cursor} location. Relaxing shorthand cache requirements.

[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 69cfbdfea2a225808549a1c1bca24d9ee690c9c8
Author: bobbylight <robert at fifesoft.com>
Date:   Sat Aug 11 16:00:41 2012 +0000

    AutoComplete: Template completions with no params should move caret to ${cursor} location.
    Relaxing shorthand cache requirements.
---
 src/org/fife/ui/autocomplete/AutoCompletion.java     |    2 +-
 src/org/fife/ui/autocomplete/TemplateCompletion.java |    8 ++++++++
 src/org/fife/ui/autocomplete/TemplatePiece.java      |   12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/org/fife/ui/autocomplete/AutoCompletion.java b/src/org/fife/ui/autocomplete/AutoCompletion.java
index 2677253..9fcb8ef 100644
--- a/src/org/fife/ui/autocomplete/AutoCompletion.java
+++ b/src/org/fife/ui/autocomplete/AutoCompletion.java
@@ -988,7 +988,7 @@ public class AutoCompletion {
 		hideParameterCompletionPopups();
 
 		// Don't bother with a tooltip if there are no parameters.
-		if (pc.getParamCount()==0) {
+		if (pc.getParamCount()==0 && !(pc instanceof TemplateCompletion)) {
 			CompletionProvider p = pc.getProvider();
 			char end = p.getParameterListEnd(); // Might be '\0'
 			String text = end=='\0' ? "" : Character.toString(end);
diff --git a/src/org/fife/ui/autocomplete/TemplateCompletion.java b/src/org/fife/ui/autocomplete/TemplateCompletion.java
index bbbef83..7c31734 100644
--- a/src/org/fife/ui/autocomplete/TemplateCompletion.java
+++ b/src/org/fife/ui/autocomplete/TemplateCompletion.java
@@ -217,7 +217,15 @@ public class TemplateCompletion extends AbstractCompletion
 			}
 		}
 
+		// Highlight the first parameter.  If no params were specified, move
+		// the caret to the ${cursor} location, if specified
+		if (selStart==minPos && selStart==selEnd && getParamCount()==0) {
+			if (defaultEndOffs>-1) { // ${cursor} specified
+				selStart = selEnd = defaultEndOffs;
+			}
+		}
 		info.setInitialSelection(selStart, selEnd);
+
 		if (defaultEndOffs>-1) {
 			// Keep this location "after" all others when tabbing
 			info.addReplacementLocation(defaultEndOffs, defaultEndOffs);
diff --git a/src/org/fife/ui/autocomplete/TemplatePiece.java b/src/org/fife/ui/autocomplete/TemplatePiece.java
index 095478f..ff4d2c4 100644
--- a/src/org/fife/ui/autocomplete/TemplatePiece.java
+++ b/src/org/fife/ui/autocomplete/TemplatePiece.java
@@ -35,6 +35,10 @@ interface TemplatePiece {
 			return text;
 		}
 
+		public String toString() {
+			return "[TemplatePiece.Text: text=" + text + "]";
+		}
+
 	}
 
 
@@ -50,6 +54,10 @@ interface TemplatePiece {
 			return text;
 		}
 
+		public String toString() {
+			return "[TemplatePiece.Param: param=" + text + "]";
+		}
+
 	}
 
 
@@ -65,6 +73,10 @@ interface TemplatePiece {
 			return text;
 		}
 
+		public String toString() {
+			return "[TemplatePiece.ParamCopy: param=" + text + "]";
+		}
+
 	}
 
 

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