Fix two regressions caused by pull request #518:

1) NPE in OptionCompleter 2) script command info returns empty string
jline · Mar 23, 2020 · c191801 · c191801
1 parent d3336a0
commit c191801
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/builtins/src/main/java/org/jline/builtins/Builtins.java b/builtins/src/main/java/org/jline/builtins/Builtins.java
@@ -410,6 +410,8 @@ public String[] lines() {
                 } else {
                     out = helpMessage.substring(0,tm.start(1));
                 }
+            } else if (!body) {
+                out = helpMessage;
             }
             return out.split("\\r?\\n");
         }

diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java
@@ -945,7 +945,7 @@ public void complete(LineReader reader, final ParsedLine commandLine, List<Candi
                 candidates.add(new Candidate(buffer, buffer, null, null, null, null, true));
                 return;
             }
-            String command = reader.getParser().getCommand(words.get(words.size() - startPos));
+            String command = reader.getParser().getCommand(words.get(startPos - 1));
             if (buffer.startsWith("-")) {
                 boolean addbuff = true;
                 boolean valueCandidates = false;