Merge pull request #1736 from jerch/fix_bufferline_resize
fix BufferLine resize
This commit is contained in:
@@ -133,4 +133,31 @@ describe('BufferLine', function(): void {
|
|||||||
const line3 = line.clone();
|
const line3 = line.clone();
|
||||||
chai.expect(TestBufferLine.prototype.toArray.apply(line3)).eql(line.toArray());
|
chai.expect(TestBufferLine.prototype.toArray.apply(line3)).eql(line.toArray());
|
||||||
});
|
});
|
||||||
|
it('resize enlarge', function(): void {
|
||||||
|
const line = new TestBufferLine(5, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(10, [1, 'a', 0, 'a'.charCodeAt(0)]);
|
||||||
|
chai.expect(line.toArray()).eql(Array(10).fill([1, 'a', 0, 'a'.charCodeAt(0)]));
|
||||||
|
});
|
||||||
|
it('resize shrink(true)', function(): void {
|
||||||
|
const line = new TestBufferLine(10, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(5, [1, 'a', 0, 'a'.charCodeAt(0)], true);
|
||||||
|
chai.expect(line.toArray()).eql(Array(5).fill([1, 'a', 0, 'a'.charCodeAt(0)]));
|
||||||
|
});
|
||||||
|
it('resize shrink(false)', function(): void {
|
||||||
|
const line = new TestBufferLine(10, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(5, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
chai.expect(line.toArray()).eql(Array(5).fill([1, 'a', 0, 'a'.charCodeAt(0)]));
|
||||||
|
});
|
||||||
|
it('resize shrink(false) + shrink(false)', function(): void {
|
||||||
|
const line = new TestBufferLine(20, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(10, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(5, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
chai.expect(line.toArray()).eql(Array(5).fill([1, 'a', 0, 'a'.charCodeAt(0)]));
|
||||||
|
});
|
||||||
|
it('resize shrink(false) + enlarge', function(): void {
|
||||||
|
const line = new TestBufferLine(20, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(10, [1, 'a', 0, 'a'.charCodeAt(0)], false);
|
||||||
|
line.resize(15, [1, 'a', 0, 'a'.charCodeAt(0)]);
|
||||||
|
chai.expect(line.toArray()).eql(Array(15).fill([1, 'a', 0, 'a'.charCodeAt(0)]));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
+5
-1
@@ -218,7 +218,11 @@ export class BufferLineTypedArray implements IBufferLine {
|
|||||||
if (cols > this.length) {
|
if (cols > this.length) {
|
||||||
const data = new Uint32Array(cols * CELL_SIZE);
|
const data = new Uint32Array(cols * CELL_SIZE);
|
||||||
if (this._data) {
|
if (this._data) {
|
||||||
data.set(this._data);
|
if (cols * CELL_SIZE < this._data.length) {
|
||||||
|
data.set(this._data.subarray(0, cols * CELL_SIZE));
|
||||||
|
} else {
|
||||||
|
data.set(this._data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
this._data = data;
|
this._data = data;
|
||||||
for (let i = this.length; i < cols; ++i) {
|
for (let i = this.length; i < cols; ++i) {
|
||||||
|
|||||||
Reference in New Issue
Block a user