Pass correct cursor position to Parser#parse() inside the acceptLine …

…method, fixes #84
jline · Jan 5, 2017 · 6f7a2e5 · 6f7a2e5
1 parent 66ce215
commit 6f7a2e5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -2474,12 +2474,11 @@ protected boolean quit() {
 
     protected boolean acceptLine() {
         parsedLine = null;
-        String str = buf.toString();
         if (!isSet(Option.DISABLE_EVENT_EXPANSION)) {
             try {
+                String str = buf.toString();
                 String exp = expander.expandHistory(history, str);
                 if (!exp.equals(str)) {
-                    str = exp;
                     buf.clear();
                     buf.write(exp);
                     if (isSet(Option.HISTORY_VERIFY)) {
@@ -2491,7 +2490,7 @@ protected boolean acceptLine() {
             }
         }
         try {
-            parsedLine = parser.parse(str, str.length(), ParseContext.ACCEPT_LINE);
+            parsedLine = parser.parse(buf.toString(), buf.cursor(), ParseContext.ACCEPT_LINE);
         } catch (EOFError e) {
             buf.write("\n");
             return true;