ConsoleEngineImpl: exclude pipe name aliases from command completion

jline · Nov 15, 2020 · 495b534 · 495b534
1 parent df99187
commit 495b534
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/console/src/main/java/org/jline/console/impl/ConsoleEngineImpl.java b/console/src/main/java/org/jline/console/impl/ConsoleEngineImpl.java
@@ -23,6 +23,7 @@
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.jline.builtins.Completers.FilesCompleter;
 import org.jline.builtins.Completers.OptDesc;
@@ -186,10 +187,19 @@ public List<Completer> scriptCompleters() {
                                                         , this::commandOptions
                                                         , 1)
                                        ));
-        out.add(new ArgumentCompleter(new StringsCompleter(aliases::keySet), NullCompleter.INSTANCE));
+        out.add(new ArgumentCompleter(new StringsCompleter(this::commandAliasNames)
+                                     , NullCompleter.INSTANCE));
         return out;
     }
 
+    private Set<String> commandAliasNames() {
+        Set<String> opers = pipes.keySet().stream().filter(p -> !p.matches("\\w+")).collect(Collectors.toSet());
+        opers.addAll(systemRegistry.getPipeNames());
+        return aliases.entrySet().stream()
+                .filter(e -> !opers.contains(e.getValue().split(" ")[0]))
+                .map(Map.Entry::getKey).collect(Collectors.toSet());
+    }
+
     private Set<String> scriptNames() {
         return scripts().keySet();
     }