REPL parameter expansion, do not add quote chars on numeric parameters

jline · Apr 5, 2020 · 88c28ae · 88c28ae
1 parent 5438565
commit 88c28ae
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java b/builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java
@@ -564,6 +564,15 @@ public boolean execute() throws Exception {
             return true;
         }
 
+        private String expandParameterName(String parameter) {
+            if (parameter.startsWith("$")) {
+                return expandName(parameter);            
+            } else if (isNumber(parameter)) {
+                return parameter;
+            }
+            return quote(parameter);
+        }
+
         private void internalExecute() throws Exception {
             if (isEngineScript()) {
                 result = engine.execute(script, expandParameters(args));
@@ -584,18 +593,17 @@ private void internalExecute() throws Exception {
                             done = true;
                             for (int i = 1; i < args.length; i++) {
                                 line = line.replaceAll("\\s\\$" + i + "\\b",
-                                        args[i].startsWith("$") ? (" " + expandName(args[i]) + " ")
-                                                : (" " + quote(args[i]) + " "));
+                                             (" " + expandParameterName(args[i]) + " "));
                                 line = line.replaceAll("\\$\\{" + i + "(|:-.*)\\}",
-                                        args[i].startsWith("$") ? expandName(args[i]) : quote(args[i]));
+                                             expandParameterName(args[i]));
                             }
                             line = line.replaceAll("\\$\\{@\\}", expandToList(args));
                             line = line.replaceAll("\\$@", expandToList(args));
                             line = line.replaceAll("\\s\\$\\d\\b", "");
                             line = line.replaceAll("\\$\\{\\d+\\}", "");
                             Matcher matcher = Pattern.compile("\\$\\{\\d+:-(.*?)\\}").matcher(line);
                             if (matcher.find()) {
-                                  line = matcher.replaceAll("'$1'");
+                                line = matcher.replaceAll(expandParameterName(matcher.group(1)));
                             }
                             if (verbose) {
                                 AttributedStringBuilder asb = new AttributedStringBuilder();