Parser: added static method getCommand()

jline · Nov 18, 2019 · e4efe36 · e4efe36 · mattirn · Nov 19, 2019
1 parent 06eb15f
commit e4efe36
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java
@@ -31,11 +31,13 @@
 import org.jline.reader.Candidate;
 import org.jline.reader.LineReader;
 import org.jline.reader.LineReader.Option;
+import org.jline.reader.Parser;
 import org.jline.reader.impl.completer.AggregateCompleter;
 import org.jline.reader.impl.completer.ArgumentCompleter;
 import org.jline.reader.impl.completer.StringsCompleter;
 import org.jline.reader.ParsedLine;
 import org.jline.terminal.Terminal;
+import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStringBuilder;
 import org.jline.utils.AttributedStyle;
 
@@ -584,9 +586,22 @@ public void complete(LineReader reader, ParsedLine commandLine, List<Candidate>
             assert candidates != null;
             if (commandLine.words().size() > 0) {
                 if (commandLine.words().size() == 1) {
-                    commands.complete(reader, commandLine, candidates);
-                } else if (command(commandLine.words().get(0)) != null) {
-                    completers.get(command(commandLine.words().get(0))).get(0).complete(reader, commandLine, candidates);
+                    String buffer = commandLine.words().get(0);
+                    int eq = buffer.indexOf('=');
+                    if (eq < 0) {
+                        commands.complete(reader, commandLine, candidates);
+                    } else {
+                        String curBuf = buffer.substring(0, eq + 1);
+                        for (String c: completers.keySet()) {
+                            candidates.add(new Candidate(AttributedString.stripAnsi(curBuf+c)
+                                        , c, null, null, null, null, true));                                           
+                        }
+                    }
+                } else {
+                    String cmd = Parser.getCommand(commandLine.words().get(0));
+                    if (command(cmd) != null) {
+                        completers.get(command(cmd)).get(0).complete(reader, commandLine, candidates);
+                    }
                 }
             }
         }

diff --git a/builtins/src/main/java/org/jline/builtins/Widgets.java b/builtins/src/main/java/org/jline/builtins/Widgets.java
@@ -24,6 +24,7 @@
 import org.jline.reader.Binding;
 import org.jline.reader.Buffer;
 import org.jline.reader.LineReader;
+import org.jline.reader.Parser;
 import org.jline.reader.LineReader.SuggestionType;
 import org.jline.reader.Parser.ParseContext;
 import org.jline.reader.Reference;
@@ -1005,7 +1006,7 @@ private Pair<String,Boolean> evaluateCommandLine(String line, List<String> args,
                 } else {
                     if (line.length() == curPos) {
                         cmd = args != null && (args.size() > 1 || (args.size() == 1
-                                 && line.endsWith(" "))) ? args.get(0) : null;
+                                 && line.endsWith(" "))) ? Parser.getCommand(args.get(0)) : null;
                         descType = CmdLine.DescriptionType.COMMAND;
                     }
                     int brackets = 0;

diff --git a/reader/src/main/java/org/jline/reader/Parser.java b/reader/src/main/java/org/jline/reader/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2016, the original author or authors.
+ * Copyright (c) 2002-2019, the original author or authors.
  *
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
@@ -8,6 +8,9 @@
  */
 package org.jline.reader;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public interface Parser {
 
     ParsedLine parse(String line, int cursor, ParseContext context) throws SyntaxError;
@@ -20,6 +23,18 @@ default boolean isEscapeChar(char ch) {
         return ch == '\\';
     }
 
+    static String getCommand(final String line) {
+        String out = null;
+        Pattern  patternCommand = Pattern.compile("^\\s*[a-zA-Z]{1,}[a-zA-Z0-9]*=([a-zA-Z]{1,}[a-zA-Z0-9]*)(\\s+|$)");
+        Matcher matcher = patternCommand.matcher(line);
+        if (matcher.find()) {
+            out = matcher.group(1);
+        } else {
+            out = line.trim().split("\\s+")[0];
+        }
+        return out;
+    }
+
     enum ParseContext {
         UNSPECIFIED,