Fix cursor computation when using a mask

jline · Mar 7, 2017 · 3e402db · 3e402db
1 parent b3eb67b
commit 3e402db
Showing 1 changed file with 13 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
@@ -3286,11 +3286,21 @@ protected void redisplay(boolean flush) {
 
         int cursorPos = -1;
         if (size.getColumns() > 0) {
-            // TODO: buf.upToCursor() does not take into account the mask which could modify the display length
-            // TODO: in case of wide chars
             AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
             sb.append(prompt);
-            sb.append(insertSecondaryPrompts(new AttributedString(buf.upToCursor()), secondaryPrompts, false));
+            String buffer = buf.upToCursor();
+            if (mask != null) {
+                if (mask == NULL_MASK) {
+                    buffer = "";
+                } else {
+                    StringBuilder nsb = new StringBuilder();
+                    for (int i = buffer.length(); i-- > 0; ) {
+                        nsb.append((char) mask);
+                    }
+                    buffer = nsb.toString();
+                }
+            }
+            sb.append(insertSecondaryPrompts(new AttributedString(buffer), secondaryPrompts, false));
             List<AttributedString> promptLines = sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
             if (!promptLines.isEmpty()) {
                 cursorPos = size.cursorPos(promptLines.size() - 1,