Intelligent command completion now includes context

Fixes issue 3869

Depends-On: Ib7f049ebe0c771bf7dc43334c6aed9568e0e8d72
Change-Id: I8d6b252b49ea7ae64d8bddd5c31dfb228465a4f6
Reviewed-on: http://gerrit.dmdirc.com/990
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/commandparser/commands/IntelligentCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.ui.input.AdditionalTabTargets;
+import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.List;
 
@@ -34,12 +35,59 @@ import java.util.List;
 public interface IntelligentCommand {
 
     /**
-     * Returns a list of suggestions for the specified argument, given the list
-     * of previous arguments.
+     * Describes the context of an intelligent tab completion request.
+     *
+     * @since 0.6.4
+     */
+    public static class IntelligentCommandContext {
+
+        /** The window the command is being entered in. */
+        private final InputWindow window;
+
+        /** The previously supplied arguments, if any. */
+        private final List<String> previousArgs;
+
+        /**
+         * Creates a new context with the specified arguments.
+         *
+         * @param window The window the command is being entered in
+         * @param previousArgs The previously supplied arguments, if any
+         */
+        public IntelligentCommandContext(final InputWindow window,
+                final List<String> previousArgs) {
+            this.window = window;
+            this.previousArgs = previousArgs;
+        }
+
+        /**
+         * Retrieves the window that the command was entered in.
+         * 
+         * @return The command's input window
+         */
+        public InputWindow getWindow() {
+            return window;
+        }
+
+        /**
+         * Retrieves the previously supplied arguments.
+         *
+         * @return Any arguments supplied prior to the current one
+         */
+        public List<String> getPreviousArgs() {
+            return previousArgs;
+        }
+
+    }
+
+    /**
+     * Returns a list of suggestions for the specified argument, given the
+     * specified context.
+     *
      * @param arg The argument that is being completed
-     * @param previousArgs The contents of the previous arguments, if any
+     * @param context The context in which suggestions are being sought
      * @return A list of suggestions for the argument
+     * @since 0.6.4
      */
-    AdditionalTabTargets getSuggestions(int arg, List<String> previousArgs);
+    AdditionalTabTargets getSuggestions(int arg, IntelligentCommandContext context);
     
 }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -33,8 +33,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The kick command bans a specified user or host from the channel.
  * 
@@ -89,7 +87,8 @@ public final class Ban extends ChannelCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -33,8 +33,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Opens the channel settings window for the channel.
  * @author chris
@@ -76,7 +74,8 @@ public final class ChannelSettings extends ChannelCommand implements Intelligent
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     }
 }

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -34,8 +34,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The kick command kicks a specified user from the channel.
  * This version allows the user to specify a reason.
@@ -92,7 +90,8 @@ public final class KickReason extends ChannelCommand implements IntelligentComma
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -35,8 +35,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The mode command allows the user to inspect and change channel modes.
  * @author chris
@@ -96,7 +94,8 @@ public final class Mode extends ChannelCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
 
         if (arg > 0) {

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -33,8 +33,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Sends a names request.
  * 
@@ -87,7 +85,8 @@ public class Names extends ChannelCommand implements IntelligentCommand, Externa
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     } 
 

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -37,7 +37,6 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
-import java.util.List;
 
 /**
  * Allows the user to set a nickname on the channel to use a custom colour.
@@ -129,7 +128,8 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
         targets.excludeAll();
         
@@ -137,8 +137,8 @@ public final class SetNickColour extends ChannelCommand implements IntelligentCo
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.add("--nicklist");
             targets.add("--text");
-        } else if (arg == 1 && (previousArgs.get(0).equals("--text")
-                || previousArgs.get(0).equals("--nicklist"))) {
+        } else if (arg == 1 && (context.getPreviousArgs().get(0).equals("--text")
+                || context.getPreviousArgs().get(0).equals("--nicklist"))) {
             targets.include(TabCompletionType.CHANNEL_NICK);            
         }
         

src/com/dmdirc/commandparser/commands/global/Active.java

@@ -31,8 +31,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The Active command issues a command to the active window.
  * @author chris
@@ -83,8 +81,9 @@ public final class Active extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
-        return TabCompleter.getIntelligentResults(arg, previousArgs, 0);
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        return TabCompleter.getIntelligentResults(arg, context, 0);
     }
     
 }

src/com/dmdirc/commandparser/commands/global/AliasCommand.java

@@ -34,8 +34,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The alias command allows users to create aliases on-the-fly.
  * 
@@ -139,17 +137,17 @@ public final class AliasCommand extends GlobalCommand implements
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
-                                               final List<String> previousArgs) {
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
 
         if (arg == 0) {
             res.add("--remove");
-        } else if (arg == 1 && previousArgs.get(0).equals("--remove")) {
+        } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--remove")) {
             for (Action alias : AliasWrapper.getAliasWrapper()) {
                 res.add(AliasWrapper.getCommandName(alias));
             }
-        } else if (arg >= 1 && !previousArgs.get(0).equals("--remove")) {
-            return TabCompleter.getIntelligentResults(arg, previousArgs, 1);
+        } else if (arg >= 1 && !context.getPreviousArgs().get(0).equals("--remove")) {
+            return TabCompleter.getIntelligentResults(arg, context, 1);
         }
 
         return res;

src/com/dmdirc/commandparser/commands/global/AllServers.java

@@ -32,8 +32,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The AllServers command allows users to issue commands to all servers.
  * @author chris
@@ -82,8 +80,9 @@ public final class AllServers extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
-        return TabCompleter.getIntelligentResults(arg, previousArgs, 0);
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        return TabCompleter.getIntelligentResults(arg, context, 0);
     }
     
 }

src/com/dmdirc/commandparser/commands/global/Clear.java

@@ -29,8 +29,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The clear command clears the main text area of the current window.
  * 
@@ -75,7 +73,8 @@ public final class Clear extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     } 
     

src/com/dmdirc/commandparser/commands/global/Debug.java

@@ -43,7 +43,6 @@ import com.dmdirc.updater.UpdateChecker;
 
 import java.io.Serializable;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.SortedSet;
@@ -476,7 +475,8 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         res.excludeAll();
@@ -499,12 +499,12 @@ public class Debug extends GlobalCommand implements IntelligentCommand {
             res.add("migration");
             res.add("notify");
             res.add("services");
-        } else if (arg == 1 && "error".equals(previousArgs.get(0))) {
+        } else if (arg == 1 && "error".equals(context.getPreviousArgs().get(0))) {
             res.add("user");
             res.add("app");
-        } else if (arg == 1 && "services".equals(previousArgs.get(0))) {
+        } else if (arg == 1 && "services".equals(context.getPreviousArgs().get(0))) {
             res.add("full");
-        } else if (arg == 2 && "error".equals(previousArgs.get(0))) {
+        } else if (arg == 2 && "error".equals(context.getPreviousArgs().get(0))) {
             res.add("low");
             res.add("medium");
             res.add("high");

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -31,8 +31,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
-import java.util.List;
-
 /**
  * The echo commands simply echos text to the current window.
  * 
@@ -106,13 +104,14 @@ public final class Echo extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
         
         if (arg == 0) {
             targets.add("--active");
             targets.add("--target");
-        } else if (arg == 1 && previousArgs.get(0).equals("--target")) {
+        } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--target")) {
             targets.excludeAll();
             // TODO: Include window names
         }

src/com/dmdirc/commandparser/commands/global/Help.java

@@ -155,7 +155,8 @@ public final class Help extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
 
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/global/Ifplugin.java

@@ -33,8 +33,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The if plugin command allows the user to execute commands based on whether
  * or not a plugin is loaded.
@@ -104,7 +102,8 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         AdditionalTabTargets res;
         
         if (arg == 0) {
@@ -116,7 +115,7 @@ public final class Ifplugin extends GlobalCommand implements IntelligentCommand
                 res.add("!" + possPlugin.getName());
             }            
         } else {
-            res = TabCompleter.getIntelligentResults(arg, previousArgs, 1);
+            res = TabCompleter.getIntelligentResults(arg, context, 1);
         }
         
         return res;

src/com/dmdirc/commandparser/commands/global/Input.java

@@ -30,8 +30,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The input command allows you to maniplulate text in a windows inputField.
  *
@@ -87,7 +85,8 @@ public class Input extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/global/LoadPlugin.java

@@ -31,8 +31,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to load a plugin.
  * @author chris
@@ -99,7 +97,8 @@ public final class LoadPlugin extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
 
         res.excludeAll();

src/com/dmdirc/commandparser/commands/global/Notify.java

@@ -31,7 +31,6 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;
-import java.util.List;
 
 /**
  * The notify command allows the user to set the notification colour for a
@@ -92,7 +91,8 @@ public final class Notify extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     } 
     

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -32,11 +32,10 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
-import java.util.List;
-
 /**
- * @author chris
+ * Opens a new window.
  * 
+ * @author chris
  */
 public class OpenWindow extends GlobalCommand implements IntelligentCommand {
     
@@ -117,7 +116,8 @@ public class OpenWindow extends GlobalCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/global/ReloadActions.java

@@ -30,10 +30,9 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to reload actions.
+ *
  * @author chris
  */
 public final class ReloadActions extends GlobalCommand implements IntelligentCommand {
@@ -48,6 +47,7 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     }
     
     /** {@inheritDoc} */
+    @Override
     public void execute(final InputWindow origin, final boolean isSilent,
             final CommandArguments args) {
         ActionManager.loadActions();
@@ -56,23 +56,27 @@ public final class ReloadActions extends GlobalCommand implements IntelligentCom
     
     
     /** {@inheritDoc}. */
+    @Override
     public String getName() {
         return "reloadactions";
     }
     
     /** {@inheritDoc}. */
+    @Override
     public boolean showInHelp() {
         return true;
     }
     
     /** {@inheritDoc}. */
+    @Override
     public String getHelp() {
         return "reloadactions - reloads actions from disk";
     }
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     }
     

src/com/dmdirc/commandparser/commands/global/ReloadIdentities.java

@@ -30,8 +30,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to reload identities.
  * 
@@ -75,7 +73,8 @@ public class ReloadIdentities extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     } 
 

src/com/dmdirc/commandparser/commands/global/ReloadPlugin.java

@@ -31,8 +31,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to reload a plugin.
  * 
@@ -88,7 +86,8 @@ public final class ReloadPlugin extends GlobalCommand implements IntelligentComm
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/global/SaveConfig.java

@@ -30,8 +30,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to save the config file.
  * 
@@ -78,7 +76,8 @@ public final class SaveConfig extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     } 
     

src/com/dmdirc/commandparser/commands/global/Set.java

@@ -246,7 +246,9 @@ public final class Set extends GlobalCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        final List<String> previousArgs = context.getPreviousArgs();
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/global/UnloadPlugin.java

@@ -31,8 +31,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to unload a plugin.
  * 
@@ -90,7 +88,8 @@ public final class UnloadPlugin extends GlobalCommand implements IntelligentComm
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets().excludeAll();
         
         if (arg == 0) {            

src/com/dmdirc/commandparser/commands/server/AllChannels.java

@@ -31,8 +31,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The AllChannels command allows the user to issue a command to all channels
  * on a server.
@@ -82,8 +80,9 @@ public final class AllChannels extends ServerCommand implements IntelligentComma
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
-        return TabCompleter.getIntelligentResults(arg, previousArgs, 0);
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        return TabCompleter.getIntelligentResults(arg, context, 0);
     }
     
 }

src/com/dmdirc/commandparser/commands/server/Back.java

@@ -31,8 +31,6 @@ import com.dmdirc.commandparser.commands.ServerCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * The back command allows the user to unset their away status.
  * @author chris
@@ -83,7 +81,8 @@ public final class Back extends ServerCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     }
     

src/com/dmdirc/commandparser/commands/server/Ctcp.java

@@ -32,8 +32,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to send CTCP messages.
  * @author chris
@@ -91,7 +89,8 @@ public final class Ctcp extends ServerCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -180,7 +180,8 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
         targets.excludeAll();
         
@@ -189,10 +190,10 @@ public final class Ignore extends ServerCommand implements IntelligentCommand {
             targets.add("--remove");
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
-        } else if (arg == 1 && previousArgs.get(0).equals("--regex")) {
+        } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--regex")) {
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
-        } else if (arg == 1 && previousArgs.get(0).equals("--remove")) {
+        } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--remove")) {
             // TODO: If/when passed a server, include known ignore list entries
         }
         

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -114,7 +114,7 @@ public final class JoinChannelCommand extends ServerCommand implements
     /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
-            final List<String> previousArgs) {
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets();
     }
     

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -33,8 +33,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to send privmsgs.
  * @author chris
@@ -96,7 +94,8 @@ public final class Message extends ServerCommand implements IntelligentCommand,
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/server/Nick.java

@@ -32,8 +32,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to change nickname.
  * @author chris
@@ -83,7 +81,8 @@ public final class Nick extends ServerCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         res.exclude(TabCompletionType.COMMAND);

src/com/dmdirc/commandparser/commands/server/Notice.java

@@ -32,8 +32,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
-import java.util.List;
-
 /**
  * Allows the user to send notices.
  * @author chris
@@ -85,7 +83,8 @@ public final class Notice extends ServerCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
         
         if (arg == 0) {

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -33,8 +33,6 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 
-import java.util.List;
-
 /**
  * Allows the user to open a query dialog with another user.
  * @author chris
@@ -103,7 +101,8 @@ public final class OpenQuery extends ServerCommand implements
     
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets targets = new AdditionalTabTargets();
         
         if (arg == 0) {

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

@@ -459,7 +459,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     private void doCommandTabCompletion(final String text, final int start,
             final int end, final boolean shiftPressed) {
         doNormalTabCompletion(text, start, end, shiftPressed,
-                TabCompleter.getIntelligentResults(text.substring(0, start)));
+                TabCompleter.getIntelligentResults(parentWindow, text.substring(0, start)));
     }
 
     /**

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

@@ -28,7 +28,9 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ChannelCommand;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.util.MapList;
 
 import java.util.Arrays;
@@ -211,25 +213,29 @@ public class TabCompleter {
      * @return Additional tab targets for the text, or null if none are available
      */
     public static AdditionalTabTargets getIntelligentResults(final int arg,
-            final List<String> previousArgs, final int offset) {
+            final IntelligentCommandContext context, final int offset) {
         if (arg == offset) {
             final AdditionalTabTargets targets = new AdditionalTabTargets().excludeAll();
             targets.include(TabCompletionType.COMMAND);
             return targets;
         } else {
-            return getIntelligentResults(
-                    new CommandArguments(previousArgs.subList(offset, previousArgs.size())));
+            return getIntelligentResults(context.getWindow(),
+                    new CommandArguments(context.getPreviousArgs().subList(offset,
+                    context.getPreviousArgs().size())));
         }        
     }
     
     /**
      * Retrieves the intelligent results for the command and its arguments
      * formed from args.
-     * 
+     *
+     * @param window The input window the results are required for
      * @param args The input arguments
      * @return Additional tab targets for the text, or null if none are available
+     * @since 0.6.4
      */
-    private static AdditionalTabTargets getIntelligentResults(final CommandArguments args) {
+    private static AdditionalTabTargets getIntelligentResults(final InputWindow window,
+            final CommandArguments args) {
         if (!args.isCommand()) {
             return null;
         }
@@ -243,7 +249,8 @@ public class TabCompleter {
             if (command.getValue() instanceof IntelligentCommand) {
                 targets = ((IntelligentCommand) command.getValue())
                         .getSuggestions(args.getArguments().length,
-                        Arrays.asList(args.getArguments()));
+                        new IntelligentCommandContext(window,
+                        Arrays.asList(args.getArguments())));
             }
 
             if (command.getValue() instanceof ChannelCommand) {
@@ -261,10 +268,13 @@ public class TabCompleter {
     /**
      * Handles potentially intelligent tab completion.
      *
+     * @param window The input window the results are required for
      * @param text The text that is being completed
      * @return Additional tab targets for the text, or null if none are available
+     * @since 0.6.4
      */
-    public static AdditionalTabTargets getIntelligentResults(final String text) {
-        return getIntelligentResults(new CommandArguments(text));
+    public static AdditionalTabTargets getIntelligentResults(final InputWindow window,
+            final String text) {
+        return getIntelligentResults(window, new CommandArguments(text));
     }
 }