Fix right prompt support

gnodet · Nov 3, 2016 · 8e92151 · 8e92151 · PerBothner · Nov 12, 2016
1 parent 25d3a3d
commit 8e92151
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -3444,11 +3444,15 @@ private AttributedString addRightPrompt(AttributedString prompt, AttributedStrin
         int nb = size.getColumns() - width - line.columnLength() - 3;
         if (nb >= 0) {
             AttributedStringBuilder sb = new AttributedStringBuilder(size.getColumns());
-            sb.append(line);
+            boolean endsWithNl = line.charAt(line.length() - 1) == '\n';
+            sb.append(line, 0, endsWithNl ? line.length() - 1 : line.length());
             for (int j = 0; j < nb + 2; j++) {
                 sb.append(' ');
             }
             sb.append(prompt);
+            if (endsWithNl) {
+                sb.append('\n');
+            }
             line = sb.toAttributedString();
         }
         return line;

diff --git a/src/main/java/org/jline/utils/AttributedStringBuilder.java b/src/main/java/org/jline/utils/AttributedStringBuilder.java
@@ -111,9 +111,12 @@ public AttributedStyle style() {
     }
 
     public AttributedStringBuilder append(AttributedString str) {
-        int l = str.length();
-        ensureCapacity(length + l);
-        for (int i = 0; i < l; i++) {
+        return append(str, 0, str.length());
+    }
+
+    public AttributedStringBuilder append(AttributedString str, int start, int end) {
+        ensureCapacity(length + end - start);
+        for (int i = start; i < end; i++) {
             char c = str.charAt(i);
             int s = str.styleCodeAt(i) & ~current.getMask() | current.getStyle();
             if (tabs > 0 && c == '\t') {