From 9c4ff54f22e87ecacb0b99d3bfa339d282d3ae60 Mon Sep 17 00:00:00 2001 From: Bruno Ribeito Date: Sun, 5 Nov 2017 21:13:54 +0000 Subject: [PATCH] Fix review comments --- src/Buffer.ts | 6 +++--- src/Terminal.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Buffer.ts b/src/Buffer.ts index 3072f552..623c3854 100644 --- a/src/Buffer.ts +++ b/src/Buffer.ts @@ -11,7 +11,7 @@ export const CHAR_DATA_ATTR_INDEX = 0; export const CHAR_DATA_CHAR_INDEX = 1; export const CHAR_DATA_WIDTH_INDEX = 2; export const CHAR_DATA_CODE_INDEX = 3; -export const MAX_BUFFER_SIZE = -1 >>> 0; // 2^32 - 1 +export const MAX_BUFFER_SIZE = 4294967295; // 2^32 - 1 /** * This class represents a terminal buffer (an internal state of the terminal), where the @@ -70,9 +70,9 @@ export class Buffer implements IBuffer { return rows; } - const correctBuferLength = rows + this._terminal.options.scrollback; + const correctBufferLength = rows + this._terminal.options.scrollback; - return correctBuferLength > MAX_BUFFER_SIZE ? MAX_BUFFER_SIZE : correctBuferLength; + return correctBufferLength > MAX_BUFFER_SIZE ? MAX_BUFFER_SIZE : correctBufferLength; } /** diff --git a/src/Terminal.ts b/src/Terminal.ts index 2dc83883..5ac8a1a0 100644 --- a/src/Terminal.ts +++ b/src/Terminal.ts @@ -384,7 +384,7 @@ export class Terminal extends EventEmitter implements ITerminal, IInputHandlingT } break; case 'scrollback': - value = value > 0 && value <= MAX_BUFFER_SIZE ? value : MAX_BUFFER_SIZE; + value = Math.min(value, MAX_BUFFER_SIZE); if (value < 0) { console.warn(`${key} cannot be less than 0, value: ${value}`);