From b88230db8ba0d54fb194f5b903215a53b017a743 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Tue, 5 Feb 2019 08:20:16 -0800
Subject: [PATCH 1/2] Make sure the viewport is filled when reflowing a row
 change

Fixes #1926
---
 src/Buffer.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index 7f4b6071..e40fa8b4 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -233,22 +233,22 @@ export class Buffer implements IBuffer {
 
     // Iterate through rows, ignore the last one as it cannot be wrapped
     if (newCols > this._cols) {
-      this._reflowLarger(newCols);
+      this._reflowLarger(newCols, newRows);
     } else {
       this._reflowSmaller(newCols, newRows);
     }
   }
 
-  private _reflowLarger(newCols: number): void {
+  private _reflowLarger(newCols: number, newRows: number): void {
     const toRemove: number[] = reflowLargerGetLinesToRemove(this.lines, newCols, this.ybase + this.y);
     if (toRemove.length > 0) {
       const newLayoutResult = reflowLargerCreateNewLayout(this.lines, toRemove);
       reflowLargerApplyNewLayout(this.lines, newLayoutResult.layout);
-      this._reflowLargerAdjustViewport(newCols, newLayoutResult.countRemoved);
+      this._reflowLargerAdjustViewport(newCols, newRows, newLayoutResult.countRemoved);
     }
   }
 
-  private _reflowLargerAdjustViewport(newCols: number, countRemoved: number): void {
+  private _reflowLargerAdjustViewport(newCols: number, newRows: number, countRemoved: number): void {
     // Adjust viewport based on number of items removed
     let viewportAdjustments = countRemoved;
     while (viewportAdjustments-- > 0) {
@@ -256,7 +256,7 @@ export class Buffer implements IBuffer {
         if (this.y > 0) {
           this.y--;
         }
-        if (this.lines.length < this._rows) {
+        if (this.lines.length < newRows) {
           // Add an extra row at the bottom of the viewport
           this.lines.push(new BufferLine(newCols, FILL_CHAR_DATA));
         }

From d17dfbc73fc61d467ad079e4e0b90ae778687a88 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 8 Feb 2019 12:13:00 -0800
Subject: [PATCH 2/2] Cover a case when resizing smaller making y go out of
 bounds

---
 src/Buffer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Buffer.ts b/src/Buffer.ts
index e40fa8b4..d017aa7e 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -360,7 +360,7 @@ export class Buffer implements IBuffer {
       let viewportAdjustments = linesToAdd - trimmedLines;
       while (viewportAdjustments-- > 0) {
         if (this.ybase === 0) {
-          if (this.y < this._rows - 1) {
+          if (this.y < newRows - 1) {
             this.y++;
             this.lines.pop();
           } else {