From e9906f9b9e73f2a8ffefcb6ceccb8dd4c20bd864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Wed, 7 Nov 2018 00:56:45 +0100
Subject: [PATCH] compromise between code safety and speed

---
 src/Terminal.ts            |  8 ++------
 src/common/CircularList.ts | 20 +++++++++++++++++---
 src/common/Types.ts        |  3 ++-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Terminal.ts b/src/Terminal.ts
index 420db146..13be90ef 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -1198,17 +1198,13 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
 
     if (this.buffer.scrollTop === 0) {
       // Determine whether the buffer is going to be trimmed after insertion.
-      const willBufferBeTrimmed = this.buffer.lines.pushWouldTrim();
+      const willBufferBeTrimmed = this.buffer.lines.isFull();
 
       // Insert the line using the fastest method
       if (bottomRow === this.buffer.lines.length - 1) {
         if (useRecycling) {
           if (willBufferBeTrimmed) {
-            // push would trim the oldest line in the ringbuffer
-            // therefore we can recycle it here as the new line
-            const recycled = this.buffer.lines.get(0);
-            recycled.copyFrom(newLine);
-            this.buffer.lines.push(recycled);
+            this.buffer.lines.recycle().copyFrom(newLine);
           } else {
             this.buffer.lines.push(newLine.clone());
           }
diff --git a/src/common/CircularList.ts b/src/common/CircularList.ts
index 00d5a520..0a57ece0 100644
--- a/src/common/CircularList.ts
+++ b/src/common/CircularList.ts
@@ -98,10 +98,24 @@ export class CircularList<T> extends EventEmitter implements ICircularList<T> {
   }
 
   /**
-   * Whether a push would trim.
-   * True when the ringbuffer is full.
+   * Advance ringbuffer index and return current element for recycling.
+   * Note: If the ringbuffer is not full this method will return undefined,
+   * Either precheck with isFull() or handle the undefined return value accordingly.
    */
-  public pushWouldTrim(): boolean {
+  public recycle(): T | undefined {
+    if (this._length === this._maxLength) {
+      this._startIndex = ++this._startIndex % this._maxLength;
+      this.emit('trim', 1);
+    } else {
+      this._length++;
+    }
+    return this._array[this._getCyclicIndex(this._length - 1)];
+  }
+
+  /**
+   * Ringbuffer is at max length.
+   */
+  public isFull(): boolean {
     return this._length === this._maxLength;
   }
 
diff --git a/src/common/Types.ts b/src/common/Types.ts
index c866581d..841029ec 100644
--- a/src/common/Types.ts
+++ b/src/common/Types.ts
@@ -28,7 +28,8 @@ export interface ICircularList<T> extends IEventEmitter {
   get(index: number): T | undefined;
   set(index: number, value: T): void;
   push(value: T): void;
-  pushWouldTrim(): boolean;
+  recycle(): T | undefined;
+  isFull(): boolean;
   pop(): T | undefined;
   splice(start: number, deleteCount: number, ...items: T[]): void;
   trimStart(count: number): void;