Improved PipelineCompleter

jline · Jun 30, 2020 · 99e5efe · 99e5efe
1 parent c0f0e79
commit 99e5efe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/console/src/main/java/org/jline/console/impl/SystemRegistryImpl.java b/console/src/main/java/org/jline/console/impl/SystemRegistryImpl.java
@@ -292,7 +292,7 @@ public Completer completer() {
         completers.add(customAggregateCompleter);
         if (consoleId != null) {
             completers.addAll(consoleEngine().scriptCompleters());
-            completers.add(new PipelineCompleter().doCompleter());
+            completers.add(new PipelineCompleter(workDir, pipeName, names).doCompleter());
         }
         return new AggregateCompleter(completers);
     }
@@ -868,6 +868,12 @@ private boolean isEnclosed() {
             return round == 0 && curly == 0 && square == 0 && !quoted && !doubleQuoted;
         }
 
+        public boolean isEnclosed(String arg) {
+            reset();
+            next(arg);
+            return isEnclosed();
+        }
+
         private void enclosedArgs(List<String> words) {
             args = new ArrayList<>();
             reset();
@@ -1595,9 +1601,16 @@ private int registryId(String command) {
         return -1;
     }
 
-    private class PipelineCompleter implements Completer {
+    private static class PipelineCompleter implements Completer {
+        private NamesAndValues names;
+        private Supplier<Path> workDir;
+        private Map<Pipe, String> pipeName = new HashMap<>();
 
-        public PipelineCompleter() {}
+        public PipelineCompleter(Supplier<Path> workDir, Map<Pipe, String> pipeName, NamesAndValues names) {
+            this.workDir = workDir;
+            this.pipeName = pipeName;
+            this.names = names;
+        }
 
         public Completer doCompleter() {
             ArgumentCompleter out = new ArgumentCompleter(this);
@@ -1609,15 +1622,19 @@ public Completer doCompleter() {
         public void complete(LineReader reader, ParsedLine commandLine, List<Candidate> candidates) {
             assert commandLine != null;
             assert candidates != null;
-            if (commandLine.wordIndex() < 2 || !names.hasPipes(commandLine.words())) {
+            ArgsParser ap = new ArgsParser(reader.getParser());
+            ap.parse(commandLine.line().substring(0, commandLine.cursor()));
+            List<String> args = ap.args();
+            if (args.size() < 2 || !names.hasPipes(args)) {
                 return;
             }
+            boolean enclosed = ap.isEnclosed(args.get(args.size() - 1));
             String pWord = commandLine.words().get(commandLine.wordIndex() - 1);
-            if (pWord.equals(pipeName.get(Pipe.NAMED))) {
+            if (enclosed && pWord.equals(pipeName.get(Pipe.NAMED))) {
                 for (String name : names.namedPipes()) {
                     candidates.add(new Candidate(name, name, null, null, null, null, true));
                 }
-            } else if (pWord.equals(">") || pWord.equals(">>")) {
+            } else if (enclosed && pWord.equals(">") || pWord.equals(">>")) {
                 Completer c = new FilesCompleter(workDir);
                 c.complete(reader, commandLine, candidates);
             } else {

diff --git a/reader/src/main/java/org/jline/reader/impl/DefaultParser.java b/reader/src/main/java/org/jline/reader/impl/DefaultParser.java
@@ -285,7 +285,7 @@ public ParsedLine parse(final String line, final int cursor, ParseContext contex
             rawWordLength = rawWordCursor;
         }
 
-        if (context != ParseContext.COMPLETE) {
+        if (context != ParseContext.COMPLETE && context != ParseContext.SPLIT_LINE) {
             if (eofOnEscapedNewLine && isEscapeChar(line, line.length() - 1)) {
                 throw new EOFError(-1, -1, "Escaped new line", "newline");
             }