eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

properly await all parseP calls

Browse Source
This commit is contained in:
Jörg Breitbart
2021-10-22 13:32:31 +02:00
parent 0a7ac8b978
commit c9e8db38b6
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/InputHandler.test.ts
+41 -41
View File
@@ -77,54 +77,54 @@ describe('InputHandler', () => {
optionsService.options.scrollback = 1; optionsService.options.scrollback = 1;
bufferService.reset(); bufferService.reset();
}); });
it('SL (scrollLeft)', () => { it('SL (scrollLeft)', async () => {
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[ @'); await inputHandler.parseP('\x1b[ @');
assert.deepEqual(getLines(bufferService, 6), ['12345', '2345', '2345', '2345', '2345', '2345']); assert.deepEqual(getLines(bufferService, 6), ['12345', '2345', '2345', '2345', '2345', '2345']);
inputHandler.parseP('\x1b[0 @'); await inputHandler.parseP('\x1b[0 @');
assert.deepEqual(getLines(bufferService, 6), ['12345', '345', '345', '345', '345', '345']); assert.deepEqual(getLines(bufferService, 6), ['12345', '345', '345', '345', '345', '345']);
inputHandler.parseP('\x1b[2 @'); await inputHandler.parseP('\x1b[2 @');
assert.deepEqual(getLines(bufferService, 6), ['12345', '5', '5', '5', '5', '5']); assert.deepEqual(getLines(bufferService, 6), ['12345', '5', '5', '5', '5', '5']);
}); });
it('SR (scrollRight)', () => { it('SR (scrollRight)', async () => {
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[ A'); await inputHandler.parseP('\x1b[ A');
assert.deepEqual(getLines(bufferService, 6), ['12345', ' 1234', ' 1234', ' 1234', ' 1234', ' 1234']); assert.deepEqual(getLines(bufferService, 6), ['12345', ' 1234', ' 1234', ' 1234', ' 1234', ' 1234']);
inputHandler.parseP('\x1b[0 A'); await inputHandler.parseP('\x1b[0 A');
assert.deepEqual(getLines(bufferService, 6), ['12345', ' 123', ' 123', ' 123', ' 123', ' 123']); assert.deepEqual(getLines(bufferService, 6), ['12345', ' 123', ' 123', ' 123', ' 123', ' 123']);
inputHandler.parseP('\x1b[2 A'); await inputHandler.parseP('\x1b[2 A');
assert.deepEqual(getLines(bufferService, 6), ['12345', ' 1', ' 1', ' 1', ' 1', ' 1']); assert.deepEqual(getLines(bufferService, 6), ['12345', ' 1', ' 1', ' 1', ' 1', ' 1']);
}); });
it('insertColumns (DECIC)', () => { it('insertColumns (DECIC)', async () => {
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[3;3H'); await inputHandler.parseP('\x1b[3;3H');
inputHandler.parseP('\x1b[\'}'); await inputHandler.parseP('\x1b[\'}');
assert.deepEqual(getLines(bufferService, 6), ['12345', '12 34', '12 34', '12 34', '12 34', '12 34']); assert.deepEqual(getLines(bufferService, 6), ['12345', '12 34', '12 34', '12 34', '12 34', '12 34']);
bufferService.reset(); bufferService.reset();
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[3;3H'); await inputHandler.parseP('\x1b[3;3H');
inputHandler.parseP('\x1b[1\'}'); await inputHandler.parseP('\x1b[1\'}');
assert.deepEqual(getLines(bufferService, 6), ['12345', '12 34', '12 34', '12 34', '12 34', '12 34']); assert.deepEqual(getLines(bufferService, 6), ['12345', '12 34', '12 34', '12 34', '12 34', '12 34']);
bufferService.reset(); bufferService.reset();
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[3;3H'); await inputHandler.parseP('\x1b[3;3H');
inputHandler.parseP('\x1b[2\'}'); await inputHandler.parseP('\x1b[2\'}');
assert.deepEqual(getLines(bufferService, 6), ['12345', '12 3', '12 3', '12 3', '12 3', '12 3']); assert.deepEqual(getLines(bufferService, 6), ['12345', '12 3', '12 3', '12 3', '12 3', '12 3']);
}); });
it('deleteColumns (DECDC)', () => { it('deleteColumns (DECDC)', async () => {
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[3;3H'); await inputHandler.parseP('\x1b[3;3H');
inputHandler.parseP('\x1b[\'~'); await inputHandler.parseP('\x1b[\'~');
assert.deepEqual(getLines(bufferService, 6), ['12345', '1245', '1245', '1245', '1245', '1245']); assert.deepEqual(getLines(bufferService, 6), ['12345', '1245', '1245', '1245', '1245', '1245']);
bufferService.reset(); bufferService.reset();
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[3;3H'); await inputHandler.parseP('\x1b[3;3H');
inputHandler.parseP('\x1b[1\'~'); await inputHandler.parseP('\x1b[1\'~');
assert.deepEqual(getLines(bufferService, 6), ['12345', '1245', '1245', '1245', '1245', '1245']); assert.deepEqual(getLines(bufferService, 6), ['12345', '1245', '1245', '1245', '1245', '1245']);
bufferService.reset(); bufferService.reset();
inputHandler.parseP('12345'.repeat(6)); await inputHandler.parseP('12345'.repeat(6));
inputHandler.parseP('\x1b[3;3H'); await inputHandler.parseP('\x1b[3;3H');
inputHandler.parseP('\x1b[2\'~'); await inputHandler.parseP('\x1b[2\'~');
assert.deepEqual(getLines(bufferService, 6), ['12345', '125', '125', '125', '125', '125']); assert.deepEqual(getLines(bufferService, 6), ['12345', '125', '125', '125', '125', '125']);
}); });
}); });
@@ -137,41 +137,41 @@ describe('InputHandler', () => {
bufferService.reset(); bufferService.reset();
}); });
describe('reverseWraparound set', () => { describe('reverseWraparound set', () => {
it('should not reverse outside of scroll margins', () => { it('should not reverse outside of scroll margins', async () => {
// prepare buffer content // prepare buffer content
inputHandler.parseP('#####abcdefghijklmnopqrstuvwxy'); await inputHandler.parseP('#####abcdefghijklmnopqrstuvwxy');
assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', 'uvwxy']); assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', 'uvwxy']);
assert.equal(bufferService.buffers.active.ydisp, 1); assert.equal(bufferService.buffers.active.ydisp, 1);
assert.equal(bufferService.buffers.active.x, 5); assert.equal(bufferService.buffers.active.x, 5);
assert.equal(bufferService.buffers.active.y, 4); assert.equal(bufferService.buffers.active.y, 4);
inputHandler.parseP(ttyBS.repeat(100)); await inputHandler.parseP(ttyBS.repeat(100));
assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', ' y']); assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', ' y']);
inputHandler.parseP('\x1b[?45h'); await inputHandler.parseP('\x1b[?45h');
inputHandler.parseP('uvwxy'); await inputHandler.parseP('uvwxy');
// set top/bottom to 1/3 (0-based) // set top/bottom to 1/3 (0-based)
inputHandler.parseP('\x1b[2;4r'); await inputHandler.parseP('\x1b[2;4r');
// place cursor below scroll bottom // place cursor below scroll bottom
bufferService.buffers.active.x = 5; bufferService.buffers.active.x = 5;
bufferService.buffers.active.y = 4; bufferService.buffers.active.y = 4;
inputHandler.parseP(ttyBS.repeat(100)); await inputHandler.parseP(ttyBS.repeat(100));
assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', ' ']); assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', 'fghij', 'klmno', 'pqrst', ' ']);
inputHandler.parseP('uvwxy'); await inputHandler.parseP('uvwxy');
// place cursor within scroll margins // place cursor within scroll margins
bufferService.buffers.active.x = 5; bufferService.buffers.active.x = 5;
bufferService.buffers.active.y = 3; bufferService.buffers.active.y = 3;
inputHandler.parseP(ttyBS.repeat(100)); await inputHandler.parseP(ttyBS.repeat(100));
assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', ' ', ' ', ' ', 'uvwxy']); assert.deepEqual(getLines(bufferService, 6), ['#####', 'abcde', ' ', ' ', ' ', 'uvwxy']);
assert.equal(bufferService.buffers.active.x, 0); assert.equal(bufferService.buffers.active.x, 0);
assert.equal(bufferService.buffers.active.y, bufferService.buffers.active.scrollTop); // stops at 0, scrollTop assert.equal(bufferService.buffers.active.y, bufferService.buffers.active.scrollTop); // stops at 0, scrollTop
inputHandler.parseP('fghijklmnopqrst'); await inputHandler.parseP('fghijklmnopqrst');
// place cursor above scroll top // place cursor above scroll top
bufferService.buffers.active.x = 5; bufferService.buffers.active.x = 5;
bufferService.buffers.active.y = 0; bufferService.buffers.active.y = 0;
inputHandler.parseP(ttyBS.repeat(100)); await inputHandler.parseP(ttyBS.repeat(100));
assert.deepEqual(getLines(bufferService, 6), ['#####', ' ', 'fghij', 'klmno', 'pqrst', 'uvwxy']); assert.deepEqual(getLines(bufferService, 6), ['#####', ' ', 'fghij', 'klmno', 'pqrst', 'uvwxy']);
}); });
}); });