From 32231dcd4107e94313372c2315c7c2e0645bf41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Thu, 30 Aug 2018 20:27:52 +0200 Subject: [PATCH] remove static DefaultCell --- src/BufferLine.test.ts | 6 +++--- src/BufferLine.ts | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/BufferLine.test.ts b/src/BufferLine.test.ts index 1695f9aa..2018554b 100644 --- a/src/BufferLine.test.ts +++ b/src/BufferLine.test.ts @@ -3,7 +3,7 @@ * @license MIT */ import * as chai from 'chai'; -import { BufferLine } from './BufferLine'; +import { BufferLine, DEFAULT_CELL } from './BufferLine'; import { CharData, IBufferLine } from './Types'; import { NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE, CHAR_DATA_ATTR_INDEX, CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX } from './Buffer'; @@ -22,11 +22,11 @@ describe('BufferLine', function(): void { chai.expect(line.isWrapped).equals(false); line = new TestBufferLine(10); chai.expect(line.length).equals(10); - chai.expect(line.pop()).eql(TestBufferLine.defaultCell); + chai.expect(line.pop()).eql(DEFAULT_CELL); chai.expect(line.isWrapped).equals(false); line = new TestBufferLine(10, null, true); chai.expect(line.length).equals(10); - chai.expect(line.pop()).eql(TestBufferLine.defaultCell); + chai.expect(line.pop()).eql(DEFAULT_CELL); chai.expect(line.isWrapped).equals(true); line = new TestBufferLine(10, [123, 'a', 456, 789], true); chai.expect(line.length).equals(10); diff --git a/src/BufferLine.ts b/src/BufferLine.ts index 6349467f..e0879b72 100644 --- a/src/BufferLine.ts +++ b/src/BufferLine.ts @@ -5,13 +5,12 @@ import { CharData, IBufferLine } from './Types'; import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from './Buffer'; -export const defaultCell: CharData = [0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]; +export const DEFAULT_CELL: CharData = [0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]; /** * Class representing a terminal line. */ export class BufferLine implements IBufferLine { - static defaultCell: CharData = [0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]; static blankLine(cols: number, attr: number, isWrapped?: boolean): IBufferLine { const ch: CharData = [attr, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]; return new BufferLine(cols, ch, isWrapped); @@ -25,7 +24,7 @@ export class BufferLine implements IBufferLine { this.length = this._data.length; if (cols) { if (!ch) { - ch = BufferLine.defaultCell; + ch = DEFAULT_CELL; } for (let i = 0; i < cols; i++) { this.push(ch); // Note: the ctor ch is not cloned