Stop TabCompleter depending on CommandManager.

src/com/dmdirc/commandparser/CommandManager.java

@@ -163,11 +163,14 @@ public class CommandManager implements CommandController {
     private void registerCommandName(final CommandInfo command,
             final boolean register) {
         // Do tab completion
-        final String commandName = getCommandChar() + command.getName();
+        final String plainCommandName = getCommandChar() + command.getName();
+        final String silencedCommandName = getCommandChar() + getSilenceChar() + command.getName();
 
         if (command.getType() == CommandType.TYPE_GLOBAL) {
             registerCommandName(globalWindowProvider.get().getTabCompleter(),
-                    commandName, register);
+                    plainCommandName, register);
+            registerCommandName(globalWindowProvider.get().getTabCompleter(),
+                    silencedCommandName, register);
         }
 
         // TODO: This logic is probably in two places. Abstract it.
@@ -175,14 +178,18 @@ public class CommandManager implements CommandController {
             if (command.getType() == CommandType.TYPE_SERVER
                     || command.getType() == CommandType.TYPE_GLOBAL) {
                 registerCommandName(server.getWindowModel().getTabCompleter(),
-                        commandName, register);
+                        plainCommandName, register);
+                registerCommandName(server.getWindowModel().getTabCompleter(),
+                        silencedCommandName, register);
             }
 
             if (command.getType() == CommandType.TYPE_CHANNEL
                     || command.getType() == CommandType.TYPE_CHAT) {
                 for (GroupChat channel : server.getGroupChatManager().getChannels()) {
                     registerCommandName(channel.getWindowModel().getTabCompleter(),
-                            commandName, register);
+                            plainCommandName, register);
+                    registerCommandName(channel.getWindowModel().getTabCompleter(),
+                            silencedCommandName, register);
                 }
             }
 
@@ -190,7 +197,9 @@ public class CommandManager implements CommandController {
                     || command.getType() == CommandType.TYPE_CHAT) {
                 for (Query query : server.getQueries()) {
                     registerCommandName(query.getTabCompleter(),
-                            commandName, register);
+                            plainCommandName, register);
+                    registerCommandName(query.getTabCompleter(),
+                            silencedCommandName, register);
                 }
             }
         }

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.collect.ArrayListMultimap;
@@ -42,38 +41,29 @@ public class TabCompleter {
     private final TabCompleter parent;
     /** The config manager to use for reading settings. */
     private final AggregateConfigProvider configManager;
-    /** The controller to use to retrieve command information. */
-    private final CommandController commandController;
     /** The entries in this completer. */
     private final Multimap<TabCompletionType, String> entries = ArrayListMultimap.create();
 
     /**
      * Creates a new instance of {@link TabCompleter}.
      *
-     * @param commandController The controller to use for command information.
      * @param configManager     The manager to read config settings from.
      */
-    public TabCompleter(
-            final CommandController commandController,
-            final AggregateConfigProvider configManager) {
+    public TabCompleter(final AggregateConfigProvider configManager) {
         this.parent = null;
-        this.commandController = commandController;
         this.configManager = configManager;
     }
 
     /**
      * Creates a new instance of {@link TabCompleter}.
      *
-     * @param commandController The controller to use for command information.
      * @param configManager     The manager to read config settings from.
      * @param parent            The parent tab completer to inherit completions from.
      */
     public TabCompleter(
-            final CommandController commandController,
             final AggregateConfigProvider configManager,
             @Nullable final TabCompleter parent) {
         this.parent = parent;
-        this.commandController = commandController;
         this.configManager = configManager;
     }
 
@@ -134,15 +124,6 @@ public class TabCompleter {
      */
     public void addEntry(final TabCompletionType type, final String entry) {
         entries.put(type, entry);
-
-        if (type == TabCompletionType.COMMAND && entry.length() > 1
-                && entry.charAt(0) == commandController.getCommandChar()
-                && entry.charAt(1) != commandController.getSilenceChar()) {
-            // If we're adding a command name that doesn't include the silence
-            // character, also add a version with the silence char
-            addEntry(type, entry.substring(0, 1) + commandController.getSilenceChar()
-                    + entry.substring(1));
-        }
     }
 
     /**

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

@@ -62,7 +62,7 @@ public class TabCompleterFactory {
     public TabCompleter getTabCompleter(
             final AggregateConfigProvider configProvider,
             final CommandType... commandTypes) {
-        final TabCompleter tabCompleter = new TabCompleter(commandController.get(), configProvider);
+        final TabCompleter tabCompleter = new TabCompleter(configProvider);
         addCommands(tabCompleter, commandTypes);
         return tabCompleter;
     }
@@ -81,8 +81,7 @@ public class TabCompleterFactory {
             final TabCompleter parent,
             final AggregateConfigProvider configProvider,
             final CommandType... commandTypes) {
-        final TabCompleter tabCompleter = new TabCompleter(commandController.get(),
-                configProvider, parent);
+        final TabCompleter tabCompleter = new TabCompleter(configProvider, parent);
         addCommands(tabCompleter, commandTypes);
         return tabCompleter;
     }

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -26,7 +26,6 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
@@ -36,8 +35,6 @@ import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import java.util.Collections;
 import java.util.Optional;
 
-import static org.mockito.Mockito.mock;
-
 public class TestWritableFrameContainer extends FrameContainer {
 
     private final int lineLength;
@@ -48,7 +45,7 @@ public class TestWritableFrameContainer extends FrameContainer {
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory,
-                new TabCompleter(mock(CommandController.class), cm),
+                new TabCompleter(cm),
                 messageSinkManager,
                 eventBus,
                 Collections.<String>emptySet());