Improved parameter expansion

jline · Jan 24, 2020 · fe80245 · fe80245
1 parent 4e93fdb
commit fe80245
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java b/builtins/src/main/java/org/jline/builtins/ConsoleEngineImpl.java
@@ -367,11 +367,15 @@ private void internalExecute() throws Exception {
                                 line = line.replaceAll("\\s\\$" + i + "\\b",
                                         args[i].startsWith("$") ? (" " + expandName(args[i]) + " ")
                                                 : (" " + quote(args[i]) + " "));
-                                line = line.replaceAll("\\$\\{" + i + "\\}",
+                                line = line.replaceAll("\\$\\{" + i + "(|:-.*)\\}",
                                         args[i].startsWith("$") ? expandName(args[i]) : quote(args[i]));
                             }
                             line = line.replaceAll("\\s\\$\\d\\b", "");
                             line = line.replaceAll("\\$\\{\\d+\\}", "");
+                            Matcher matcher=Pattern.compile("\\$\\{\\d+:-(.*?)\\}").matcher(line);
+                            if (matcher.find()) {
+                                  line = matcher.replaceAll("'$1'");
+                            }
                             if (verbose) {
                                 AttributedStringBuilder asb = new AttributedStringBuilder();
                                 asb.append(line, AttributedStyle.DEFAULT.foreground(AttributedStyle.GREEN));