Fixed auto-completion separator issue.

forge · Aug 28, 2013 · 9ee4745 · 9ee4745
1 parent fb56025
commit 9ee4745
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...n/java/org/jboss/forge/addon/shell/aesh/completion/SelectComponentCompletionStrategy.java b/...n/java/org/jboss/forge/addon/shell/aesh/completion/SelectComponentCompletionStrategy.java
@@ -17,14 +17,16 @@
 import org.jboss.forge.addon.shell.ui.ShellContext;
 import org.jboss.forge.addon.ui.input.InputComponent;
 import org.jboss.forge.addon.ui.input.SelectComponent;
+import org.jboss.forge.addon.ui.input.UISelectMany;
+import org.jboss.forge.addon.ui.input.UISelectOne;
 import org.jboss.forge.addon.ui.util.InputComponents;
 
 /**
- * 
+ * Called when auto-completion of a {@link UISelectOne} or {@link UISelectMany} component is needed
  * 
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
-public class SelectComponentCompletionStrategy implements CompletionStrategy
+class SelectComponentCompletionStrategy implements CompletionStrategy
 {
 
    @SuppressWarnings("unchecked")
@@ -51,13 +53,13 @@ public void complete(final CompleteOperation completeOperation, final InputCompo
       if (choices.size() > 1)
       {
          String startsWith = Parser.findStartsWith(choices);
-         if (startsWith != null && startsWith.length() > 0 &&
-                  startsWith.length() > typedValue.length())
+         if (startsWith.length() > typedValue.length())
          {
             String substring = startsWith.substring(typedValue.length());
             String candidate = Parser.switchSpacesToEscapedSpacesInWord(substring);
             completeOperation.addCompletionCandidate(candidate);
             completeOperation.setOffset(completeOperation.getCursor() - typedValue.length());
+            completeOperation.doAppendSeparator(false);
          }
          else
          {
@@ -71,10 +73,7 @@ public void complete(final CompleteOperation completeOperation, final InputCompo
       else if (choices.size() == 1)
       {
          completeOperation.addCompletionCandidate(choices.get(0).substring(typedValue.length()));
-         if (!completeOperation.getCompletionCandidates().isEmpty() && !typedValue.isEmpty())
-         {
-            completeOperation.setOffset(completeOperation.getCursor() - typedValue.length());
-         }
+         completeOperation.setOffset(completeOperation.getCursor() - typedValue.length());
       }
 
    }