Pass word to be completed to intelligent completion handlers

Fixes issue 3874

Change-Id: I364a558f1bf3deeea51edcc254dc0895d948b27b
Reviewed-on: http://gerrit.dmdirc.com/993
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -47,16 +47,21 @@ public interface IntelligentCommand {
         /** The previously supplied arguments, if any. */
         private final List<String> previousArgs;
 
+        /** The partially typed word, if any. */
+        private final String partial;
+
         /**
          * 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
+         * @param partial The partially-typed word being completed
          */
         public IntelligentCommandContext(final InputWindow window,
-                final List<String> previousArgs) {
+                final List<String> previousArgs, final String partial) {
             this.window = window;
             this.previousArgs = previousArgs;
+            this.partial = partial;
         }
 
         /**
@@ -77,6 +82,15 @@ public interface IntelligentCommand {
             return previousArgs;
         }
 
+        /**
+         * Retrieves the partially typed word which is being completed.
+         *
+         * @return The partial word being completed
+         */
+        public String getPartial() {
+            return partial;
+        }
+
     }
 
     /**

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

@@ -459,7 +459,8 @@ 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(parentWindow, text.substring(0, start)));
+                TabCompleter.getIntelligentResults(parentWindow,
+                text.substring(0, start), text.substring(start, end)));
     }
 
     /**

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

@@ -221,7 +221,7 @@ public class TabCompleter {
         } else {
             return getIntelligentResults(context.getWindow(),
                     new CommandArguments(context.getPreviousArgs().subList(offset,
-                    context.getPreviousArgs().size())));
+                    context.getPreviousArgs().size())), context.getPartial());
         }        
     }
     
@@ -231,11 +231,12 @@ public class TabCompleter {
      *
      * @param window The input window the results are required for
      * @param args The input arguments
+     * @param partial The partially-typed word being completed (if any)
      * @return Additional tab targets for the text, or null if none are available
      * @since 0.6.4
      */
     private static AdditionalTabTargets getIntelligentResults(final InputWindow window,
-            final CommandArguments args) {
+            final CommandArguments args, final String partial) {
         if (!args.isCommand()) {
             return null;
         }
@@ -250,7 +251,7 @@ public class TabCompleter {
                 targets = ((IntelligentCommand) command.getValue())
                         .getSuggestions(args.getArguments().length,
                         new IntelligentCommandContext(window,
-                        Arrays.asList(args.getArguments())));
+                        Arrays.asList(args.getArguments()), partial));
             }
 
             if (command.getValue() instanceof ChannelCommand) {
@@ -270,11 +271,12 @@ public class TabCompleter {
      *
      * @param window The input window the results are required for
      * @param text The text that is being completed
+     * @param partial The partially-typed word being completed (if any)
      * @return Additional tab targets for the text, or null if none are available
      * @since 0.6.4
      */
     public static AdditionalTabTargets getIntelligentResults(final InputWindow window,
-            final String text) {
-        return getIntelligentResults(window, new CommandArguments(text));
+            final String text, final String partial) {
+        return getIntelligentResults(window, new CommandArguments(text), partial);
     }
 }