Small improvements...

jline · Jan 30, 2020 · 1bcf06f · 1bcf06f
1 parent 29077a2
commit 1bcf06f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java b/builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java
@@ -616,7 +616,7 @@ private Map<String,Object> defaultPrntOptions() {
     @Override
     public void println(Object object) {
         Map<String,Object> options = defaultPrntOptions();
-        options.put("exception", "message");
+        options.putIfAbsent("exception", "message");
         println(options, object);
     }
 

diff --git a/builtins/src/main/java/org/jline/builtins/SystemRegistryImpl.java b/builtins/src/main/java/org/jline/builtins/SystemRegistryImpl.java
@@ -254,7 +254,14 @@ public Object invoke(String command, Object... args) throws Exception {
         if (id > -1) {
             out = commandRegistries[id].invoke(command, args);
         } else if (isLocalCommand(command)) {
-            out = invoke(command, args);
+            String[] _args = new String[args.length];
+            for (int i = 0; i < args.length; i++) {
+                if (!(args[i] instanceof String)) {
+                    throw new IllegalArgumentException();
+                }
+                _args[i] = args[i].toString();
+            }
+            out = localExecute(command, _args);
         } else if (consoleId != null) {
             out = consoleEngine().invoke(command, args);
         }

diff --git a/demo/src/main/scripts/optionCompleterTest.jline b/demo/src/main/scripts/optionCompleterTest.jline
@@ -5,12 +5,12 @@ import org.jline.builtins.SystemRegistry
 
 def complete(commandLine) {
     candidates = []
-    completer.complete(reader, parser.parse(commandLine, commandLine.length(),  Parser.ParseContext.ACCEPT_LINE), candidates)
+    completer.complete(null, parser.parse(commandLine, commandLine.length(),  Parser.ParseContext.ACCEPT_LINE), candidates)
     candidates.each { println it.value()}
+    null
 }
 
-reader=null   // reader is not really needed here!
-parser=SystemRegistry.get().parser
+parser = SystemRegistry.get().parser
 
 options=['--opt1','--opt2']
 optionValues=['--option':['val1','val2'],'--option2':['val3','val4']]

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/groovy/src/main/java/org/jline/script/GroovyEngine.java b/groovy/src/main/java/org/jline/script/GroovyEngine.java
@@ -435,12 +435,15 @@ private List<AttributedString> highlightMap(Map<String, Object> map, int width)
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             AttributedStringBuilder asb = new AttributedStringBuilder().tabs(Arrays.asList(0, max + 1));
             asb.append(entry.getKey(), AttributedStyle.DEFAULT.foreground(AttributedStyle.BLUE + AttributedStyle.BRIGHT));
-            asb.append("\t");
-            asb.append(Utils.toString(entry.getValue()), AttributedStyle.DEFAULT.foreground(AttributedStyle.YELLOW));
-            if (asb.columnLength() > width) {
-                asb.setLength(width);
+            for (String v : Utils.toString(entry.getValue()).split("\n")) {
+                asb.append("\t");
+                asb.append(v, AttributedStyle.DEFAULT.foreground(AttributedStyle.YELLOW));
+                if (asb.columnLength() > width) {
+                    asb.setLength(width);
+                }
+                out.add(asb.toAttributedString());
+                asb = new AttributedStringBuilder().tabs(Arrays.asList(0, max + 1));
             }
-            out.add(asb.toAttributedString());
         }
         return out;
     }