Use CommandArguments in intelligent tab completion code.

This enables completion on silenced commands (/.)
Fixes issue 2729

Change-Id: Idf0cf6c70fb40b33d1b965973fd37e34ecce722e
Reviewed-on: http://gerrit.dmdirc.com/210
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

src/com/dmdirc/commandparser/CommandArguments.java

@@ -26,6 +26,7 @@ import com.dmdirc.Precondition;
 import com.dmdirc.logger.Logger;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -55,6 +56,28 @@ public class CommandArguments {
         this.line = line;
     }
 
+    /**
+     * Creates a new command arguments parser for the specified words.
+     *
+     * @param words The words which form the line ot be parsed
+     * @since 0.6.3
+     */
+    public CommandArguments(final Collection<String> words) {
+        this.words = words.toArray(new String[words.size()]);
+
+        final StringBuilder builder = new StringBuilder();
+
+        for (String word : words) {
+            if (builder.length() > 0) {
+                builder.append(' ');
+            }
+
+            builder.append(word);
+        }
+
+        this.line = builder.toString();
+    }
+
     /**
      * Retrieves the raw line that was input, including any command character(s)
      * and names.

src/com/dmdirc/ui/input/TabCompleter.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.input;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ChannelCommand;
@@ -224,7 +225,8 @@ public final class TabCompleter implements Serializable {
             targets.include(TabCompletionType.COMMAND);
             return targets;
         } else {
-            return getIntelligentResults(previousArgs.subList(offset, previousArgs.size()));
+            return getIntelligentResults(
+                    new CommandArguments(previousArgs.subList(offset, previousArgs.size())));
         }        
     }
     
@@ -232,23 +234,24 @@ public final class TabCompleter implements Serializable {
      * Retrieves the intelligent results for the command and its arguments
      * formed from args.
      * 
-     * @param args A list of "words" in the input
+     * @param args The input arguments
      * @return Additional tab targets for the text, or null if none are available
      */
-    private static AdditionalTabTargets getIntelligentResults(final List<String> args) {
-        if (args.isEmpty() || args.get(0).charAt(0) != CommandManager.getCommandChar()) {
+    private static AdditionalTabTargets getIntelligentResults(final CommandArguments args) {
+        if (!args.isCommand()) {
             return null;
         }
         
-        final String signature = args.get(0).substring(1);
-        final Map.Entry<CommandInfo, Command> command = CommandManager.getCommand(signature);
+        final Map.Entry<CommandInfo, Command> command
+                = CommandManager.getCommand(args.getCommandName());
 
         AdditionalTabTargets targets = null;
 
         if (command != null) {
             if (command.getValue() instanceof IntelligentCommand) {
                 targets = ((IntelligentCommand) command.getValue())
-                        .getSuggestions(args.size() - 1, args.subList(1, args.size()));
+                        .getSuggestions(args.getArguments().length,
+                        Arrays.asList(args.getArgumentsAsString()));
             }
 
             if (command.getValue() instanceof ChannelCommand) {
@@ -270,6 +273,6 @@ public final class TabCompleter implements Serializable {
      * @return Additional tab targets for the text, or null if none are available
      */
     public static AdditionalTabTargets getIntelligentResults(final String text) {
-        return getIntelligentResults(Arrays.asList(text.split(" ")));
+        return getIntelligentResults(new CommandArguments(text));
     }
 }