waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

set DEFAULT_CELL explicit in ctor and remove the global const value

Browse Source
This commit is contained in:
Jörg Breitbart
2018-08-30 21:12:55 +02:00
parent 11df1e1d80
commit 0d49d1f64d
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BufferLine.test.ts
+3 -24
View File
@@ -3,7 +3,7 @@
* @license MIT
*/
import * as chai from 'chai';
import { BufferLine, DEFAULT_CELL } from './BufferLine';
import { BufferLine } 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(DEFAULT_CELL);
chai.expect(line.pop()).eql([0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]);
chai.expect(line.isWrapped).equals(false);
line = new TestBufferLine(10, null, true);
chai.expect(line.length).equals(10);
chai.expect(line.pop()).eql(DEFAULT_CELL);
chai.expect(line.pop()).eql([0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE]);
chai.expect(line.isWrapped).equals(true);
line = new TestBufferLine(10, [123, 'a', 456, 789], true);
chai.expect(line.length).equals(10);
@@ -94,25 +94,4 @@ describe('BufferLine', function(): void {
line.replaceCells(2, 4, [6, 'f', 0, 0]);
chai.expect(line.toArray()).eql([[1, 'a', 0, 0], [2, 'b', 0, 0], [6, 'f', 0, 0], [6, 'f', 0, 0], [5, 'e', 0, 0]]);
});
it('DEFAULT_CELL is not affected by cell writes', function(): void {
// get default values:
const attr = DEFAULT_CELL[CHAR_DATA_ATTR_INDEX];
const char = DEFAULT_CELL[CHAR_DATA_CHAR_INDEX];
const width = DEFAULT_CELL[CHAR_DATA_WIDTH_INDEX];
const code = DEFAULT_CELL[CHAR_DATA_CODE_INDEX];
// create a line with DEFAULT_CELL
const line = new TestBufferLine(3);
// alter first cell only
const first = line.get(0);
// this is bad - never edit a cell after a get!!!! (needs to be fixed in InputHandler.print)
// Note this is currently granted in the codebase by the way
// a blankLine was/is created - all cells point to the same
// CharData object
// we test here, that this unique blankLine object is not
// pointing to the DEFAULT_CELL object
first[CHAR_DATA_ATTR_INDEX] = 123456789;
chai.expect(line.toArray()).eql([[123456789, char, width, code], [123456789, char, width, code], [123456789, char, width, code]]);
chai.expect(DEFAULT_CELL[CHAR_DATA_ATTR_INDEX]).equals(attr);
chai.expect(DEFAULT_CELL[CHAR_DATA_ATTR_INDEX]).not.equals(123456789);
});
});
src/BufferLine.ts
+1 -3
View File
@@ -5,8 +5,6 @@
import { CharData, IBufferLine } from './Types';
import { NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from './Buffer';
export const DEFAULT_CELL: CharData = [0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE];
/**
* Class representing a terminal line.
*/
@@ -24,7 +22,7 @@ export class BufferLine implements IBufferLine {
this.length = this._data.length;
if (cols) {
if (!ch) {
ch = [DEFAULT_CELL[0], DEFAULT_CELL[1], DEFAULT_CELL[2], DEFAULT_CELL[3]];
ch = [0, NULL_CELL_CHAR, NULL_CELL_WIDTH, NULL_CELL_CODE];
}
for (let i = 0; i < cols; i++) {
this.push(ch); // Note: the ctor ch is not cloned (resembles old behavior)