Merge remote-tracking branch 'mattirn/multiline-editing'

# Conflicts: # terminal/src/main/java/org/jline/utils/Status.java
jline · Jul 4, 2019 · 4e87ebc · 4e87ebc
2 parents b4f594e + 062d25c
commit 4e87ebc
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -3718,6 +3718,8 @@ protected void redisplay(boolean flush) {
             }
 
             int cursorPos = -1;
+            int cursorNewLinesId = -1;
+            int cursorColPos = -1;
             if (size.getColumns() > 0) {
                 AttributedStringBuilder sb = new AttributedStringBuilder().tabs(TAB_WIDTH);
                 sb.append(prompt);
@@ -3728,12 +3730,47 @@ protected void redisplay(boolean flush) {
                 sb.append(insertSecondaryPrompts(new AttributedString(buffer), secondaryPrompts, false));
                 List<AttributedString> promptLines = sb.columnSplitLength(size.getColumns(), false, display.delayLineWrap());
                 if (!promptLines.isEmpty()) {
+                    cursorNewLinesId = promptLines.size() - 1;
+                    cursorColPos = promptLines.get(promptLines.size() - 1).columnLength();
                     cursorPos = size.cursorPos(promptLines.size() - 1,
                             promptLines.get(promptLines.size() - 1).columnLength());
                 }
             }
 
-            display.update(newLines, cursorPos, flush);
+            List<AttributedString> newLinesToDisplay = new ArrayList<>();           
+            int displaySize = size.getRows() - Status.getStatus(terminal).size();
+            if (newLines.size() > displaySize) {
+                StringBuilder sb = new StringBuilder(">....");
+                // blanks are needed when displaying command completion candidate list
+                for (int i = sb.toString().length(); i < size.getColumns(); i++) {
+                    sb.append(" ");
+                }
+                AttributedString partialCommandInfo = new AttributedString(sb.toString());
+                int lineId = newLines.size() - displaySize + 1;
+                int endId = displaySize;
+                int startId = 1;
+                if (lineId  > cursorNewLinesId) {
+                    lineId = cursorNewLinesId;
+                    endId = displaySize - 1;
+                    startId = 0;
+                } else {
+                    newLinesToDisplay.add(partialCommandInfo);
+                }
+                int cursorRowPos = 0;
+                for (int i = startId; i < endId; i++) {
+                    if (cursorNewLinesId == lineId) {
+                        cursorRowPos = i;
+                    }
+                    newLinesToDisplay.add(newLines.get(lineId++));
+                }
+                if (startId == 0) {
+                    newLinesToDisplay.add(partialCommandInfo);                    
+                }
+                cursorPos = size.cursorPos(cursorRowPos, cursorColPos);
+            } else {
+                newLinesToDisplay = newLines;
+            }
+            display.update(newLinesToDisplay, cursorPos, flush);
         } finally {
             lock.unlock();
         }

diff --git a/terminal/src/main/java/org/jline/utils/Status.java b/terminal/src/main/java/org/jline/utils/Status.java
@@ -134,4 +134,8 @@ public void restore() {
         linesToRestore = Collections.emptyList();
     }
 
+    public int size() {
+        return oldLines.size();
+    }
+
 }