FORGE-614

forge · Aug 20, 2012 · 4d5b5cd · 4d5b5cd
1 parent f8f6ed1
commit 4d5b5cd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...l/src/main/java/org/jboss/forge/shell/command/parser/OrderedValueVarargsOptionParser.java b/...l/src/main/java/org/jboss/forge/shell/command/parser/OrderedValueVarargsOptionParser.java
@@ -34,7 +34,7 @@ public CommandParserContext parse(final CommandMetadata command, final Queue<Str
             while (!tokens.isEmpty())
             {
                lastToken = tokens.peek();
-               if (lastToken.startsWith("-") && command.hasOption(lastToken.replaceAll("^--?", "")))
+               if (lastToken.startsWith("-") && isValidCommandOption(command, lastToken))
                {
                   break;
                }
@@ -56,4 +56,20 @@ public CommandParserContext parse(final CommandMetadata command, final Queue<Str
       return ctx;
    }
 
+   private boolean isValidCommandOption(final CommandMetadata command, final String lastToken)
+   {
+      String name = lastToken.replaceAll("^--?", "");
+      for (OptionMetadata option : command.getOptions())
+      {
+         if (!option.isNamed())
+         {
+            continue;
+         }
+         if (option.getName().startsWith(name) || (!option.getShortName().isEmpty() && option.getShortName().startsWith(name)))
+         {
+            return true;
+         }
+      }
+      return false;
+   }
 }
diff --git a/shell/src/main/java/org/jboss/forge/shell/completer/PluginCommandCompleter.java b/shell/src/main/java/org/jboss/forge/shell/completer/PluginCommandCompleter.java
@@ -59,12 +59,6 @@ public int complete(final String buffer, final int cursor, final List<CharSequen
          }
       }
 
-      if ((state.getPlugin() != null) && !state.isFinalTokenComplete() && !state.hasSuggestions()
-               && state.isDuplicateBuffer())
-      {
-         candidates.add(" ");
-      }
-
       candidates.addAll(state.getCandidates());
 
       // ensure the completer is triggered always