From a2161532db2deb3b05da3f1238790bc929797552 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 25 Aug 2017 12:11:20 -0700
Subject: [PATCH] Fix reverseIndex to work with scroll regions and 0 scrollback

---
 src/Buffer.ts       |  4 ++++
 src/InputHandler.ts |  3 +++
 src/Terminal.ts     | 48 +++++++++++++++++++++++++++++++++------------
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index 7af090ac..53645837 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -46,6 +46,10 @@ export class Buffer implements IBuffer {
     return this._lines;
   }
 
+  public get hasScrollback(): boolean {
+    return this._hasScrollback && this.lines.maxLength > this._terminal.rows;
+  }
+
   /**
    * Gets the correct buffer length based on the rows provided, the terminal's
    * scrollback and whether this buffer is flagged to have scrollback or not.
diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index f2d97751..e6ab5540 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -464,10 +464,13 @@ export class InputHandler implements IInputHandler {
     let j: number;
     j = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;
     j = this._terminal.rows - 1 + this._terminal.buffer.ybase - j;
+    console.log('deleteLines', params);
     while (param--) {
       // test: echo -e '\e[44m\e[1M\e[0m'
       // blankLine(true) - xterm/linux behavior
+      console.log('splice delete row: ' + (row - 1) + '(' + this._terminal.buffer.lines.get(row - 1)[0][1] + ')');
       this._terminal.buffer.lines.splice(row - 1, 1);
+      console.log('splice add blank row: ' + (j) + '(' + this._terminal.buffer.lines.get(j)[0][1] + ')');
       this._terminal.buffer.lines.splice(j, 0, this._terminal.blankLine(true));
     }
 
diff --git a/src/Terminal.ts b/src/Terminal.ts
index a083d9d4..fa3161f0 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -1184,39 +1184,62 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT
     // This should work with minimal effort utilizing the CiruclarList
 
     // TODO: Need to hold onto top given the if?
-    const bottomRow = this.buffer.ybase + this.buffer.scrollBottom;
+    const newLine = this.blankLine(undefined, isWrapped);
+    const topRow = this.buffer.ybase + this.buffer.scrollTop;
+    let bottomRow = this.buffer.ybase + this.buffer.scrollBottom;
+
+
+
+// TODO: There's a problem with ybase going beyond scrollback?
+
+
     console.log('bottomRow', bottomRow);
     console.log('this.buffer.scrollTop: ' + this.buffer.scrollTop);
     if (this.buffer.scrollTop === 0) {
       const willBufferBeTrimmed = this.buffer.lines.length === this.buffer.lines.maxLength;
 
+      // Remove the line first if there is no scrollback so the list is not
+      // trimmed
+      if (!this.buffer.hasScrollback) {
+        this.buffer.lines.splice(topRow, 1);
+        // Adjust bottomRow to make up for the deleted row
+        // bottomRow--;
+      }
+
       if (bottomRow === this.buffer.lines.length - 1) {
         // Pushing when possible is faster than splicing
-        this.buffer.lines.push(this.blankLine(undefined, isWrapped));
+        this.buffer.lines.push(newLine);
         console.log('push');
       } else {
         // Insert a row *below* the bottomRow, pushing the top row into the scrollback
-        this.buffer.lines.splice(bottomRow + 1, 0, this.blankLine(undefined, isWrapped));
+        if (!this.buffer.hasScrollback) {
+          // A line is deleted in this case so bottomRow is pushed up
+          this.buffer.lines.splice(bottomRow, 0, newLine);
+        } else {
+          this.buffer.lines.splice(bottomRow + 1, 0, newLine);
+        }
         console.log('splice');
       }
 
-      // Adjust ydisp and ybase to accommodate the changes after the buffer was
-      // trimmed.
+      // Only adjust ybase and ydisp when the buffer is not trimmed
       if (!willBufferBeTrimmed) {
         console.log('increment ydisp/ybase');
         this.buffer.ybase++;
         this.buffer.ydisp++;
       }
+
       console.log('this.buffer.ybase: ' + this.buffer.ybase);
-      console.log('this.buffer.ybase: ' + this.buffer.ydisp);
+      console.log('this.buffer.ydisp: ' + this.buffer.ydisp);
+
     } else {
-      const topRow = this.buffer.ybase + this.buffer.scrollTop;
       const scrollRegionHeight = bottomRow - topRow + 1/*as it's zero-based*/;
-console.log('shiftElements');
-console.log('topRow: ' + topRow + '(' + this.buffer.lines.get(topRow)[0][1] + ')');
-console.log('scrollRegionHeight: ' + scrollRegionHeight);
+
+      console.log('shiftElements');
+      console.log('topRow: ' + topRow + '(' + this.buffer.lines.get(topRow)[0][1] + ')');
+      console.log('scrollRegionHeight: ' + scrollRegionHeight);
+
       this.buffer.lines.shiftElements(topRow + 1, scrollRegionHeight - 1, -1);
-      this.buffer.lines.set(bottomRow, this.blankLine(undefined, isWrapped));
+      this.buffer.lines.set(bottomRow, newLine);
     }
 
     if (!this.userScrolling) {
@@ -2247,7 +2270,8 @@ console.log('scrollRegionHeight: ' + scrollRegionHeight);
       // possibly move the code below to term.reverseScroll();
       // test: echo -ne '\e[1;1H\e[44m\eM\e[0m'
       // blankLine(true) is xterm/linux behavior
-      this.buffer.lines.shiftElements(this.buffer.y + this.buffer.ybase, this.rows - 1, 1);
+      const scrollRegionHeight = this.buffer.scrollBottom - this.buffer.scrollTop;
+      this.buffer.lines.shiftElements(this.buffer.y + this.buffer.ybase, scrollRegionHeight, 1);
       this.buffer.lines.set(this.buffer.y + this.buffer.ybase, this.blankLine(true));
       this.updateRange(this.buffer.scrollTop);
       this.updateRange(this.buffer.scrollBottom);