From 7684f93773fbde3bd9c16e9d56230c17ab312fc0 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 28 Dec 2018 01:32:19 -0800
Subject: [PATCH] Fix ydisp/ybase after trimming buffer

---
 src/Buffer.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index ef91055d..acba0c32 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -356,8 +356,6 @@ export class Buffer implements IBuffer {
     const linesNeeded = Math.ceil(cellsNeeded / newCols);
     const linesToAdd = linesNeeded - wrappedLines.length;
     const trimmedLines = Math.max(0, this.lines.length - this.lines.maxLength + linesToAdd);
-    console.log('linesToAdd', linesToAdd);
-    console.log('trimmedLines', trimmedLines);
 
     // Add the new lines
     const newLines: BufferLine[] = [];
@@ -393,7 +391,7 @@ export class Buffer implements IBuffer {
     }
 
     // Adjust viewport as needed
-    let viewportAdjustments = linesToAdd;
+    let viewportAdjustments = linesToAdd - trimmedLines;
     while (viewportAdjustments-- > 0) {
       if (this.ybase === 0) {
         if (this.y < this._terminal.rows - 1) {
@@ -412,9 +410,6 @@ export class Buffer implements IBuffer {
       }
     }
 
-    // TODO: Adjust viewport if needed (remove rows on end if ybase === 0? etc.
-    // TODO: Handle list trimming
-
     return wrappedLines.length - 1 - linesToAdd + trimmedLines;
   }