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

Merge branch 'master' into search_strict

Browse Source
This commit is contained in:
Daniel Imms
2019-06-05 06:22:05 -07:00
committed by GitHub
parent 0ab72d5ce9 360bf64562
commit 2526b2d76d
5 changed files with 1 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
-1
View File
@@ -14,7 +14,6 @@ npm-debug.log
.env
build/
.DS_Store
fixtures/typings-test/*.js
package-lock.json
# Keep bundled code out of Git
bin/test.js
+1 -2
View File
@@ -14,8 +14,7 @@ let testFiles = [
'./out/*test.js',
'./out/**/*test.js',
'./out/*integration.js',
'./out/**/*integration.js',
'./lib/**/*test.js'
'./out/**/*integration.js'
];
// ability to inject particular test files via
fixtures/typings-test/tsconfig.json
-14
View File
@@ -1,14 +0,0 @@
{
"files": [
"typings-test.ts"
],
"compilerOptions": {
"module": "commonjs",
"target": "es5",
"lib": [
"dom",
"es6"
],
"noEmit": true
}
}
fixtures/typings-test/typings-test.ts
-249
View File
@@ -1,249 +0,0 @@
/**
* @license MIT
*/
/// <reference path="../../typings/xterm.d.ts" />
import { Terminal, IDisposable } from 'xterm';
namespace constructor {
{
new Terminal();
new Terminal({});
new Terminal({
cols: 1,
rows: 1
});
new Terminal({
'cols': 1,
'cursorBlink': true,
'cursorStyle': 'block',
'disableStdin': false,
'rows': 1,
'scrollback': 10,
'tabStopWidth': 2
});
}
}
namespace properties {
{
const t: Terminal = new Terminal();
const element: HTMLElement = t.element;
const textarea: HTMLTextAreaElement = t.textarea;
}
}
namespace static_methods {
{
Terminal.applyAddon({});
Terminal.applyAddon({});
Terminal.applyAddon({});
Terminal.applyAddon({});
Terminal.applyAddon({});
Terminal.applyAddon({});
}
}
namespace methods_core {
{
const t: Terminal = new Terminal();
t.blur();
t.focus();
t.clear();
t.refresh(0, 1);
t.reset();
t.resize(1, 1);
t.write('foo');
t.writeln('foo');
}
{
const t: Terminal = new Terminal();
// no arg
t.on('blur', () => {});
t.on('focus', () => {});
t.on('linefeed', () => {});
t.on('selection', () => {});
// args
t.on('data', () => {});
t.on('data', (data: string) => console.log(data));
t.on('key', () => {});
t.on('key', (key: string) => console.log(key, event));
t.on('key', (key: string, event: KeyboardEvent) => console.log(key, event));
t.on('keydown', () => {});
t.on('keydown', (event: KeyboardEvent) => console.log(event));
t.on('keypress', () => {});
t.on('keypress', (event: KeyboardEvent) => console.log(event));
t.on('refresh', () => {});
t.on('refresh', (data: {start: number, end: number}) => console.log(data));
t.on('resize', () => {});
t.on('resize', (data: {cols: number, rows: number}) => console.log(data));
t.on('scroll', () => {});
t.on('scroll', (ydisp: number) => console.log(ydisp));
t.on('title', () => {});
t.on('title', (title: string) => console.log(title));
}
{
const t: Terminal = new Terminal();
// no arg
t.off('blur', () => {});
t.off('focus', () => {});
t.off('linefeed', () => {});
t.off('selection', () => {});
// args
t.off('data', () => {});
t.off('data', (data: string) => console.log(data));
t.off('key', () => {});
t.off('key', (key: string) => console.log(key, event));
t.off('key', (key: string, event: KeyboardEvent) => console.log(key, event));
t.off('keydown', () => {});
t.off('keydown', (event: KeyboardEvent) => console.log(event));
t.off('keypress', () => {});
t.off('keypress', (event: KeyboardEvent) => console.log(event));
t.off('refresh', () => {});
t.off('refresh', (data: {element: HTMLElement, start: number, end: number}) => console.log(data));
t.off('resize', () => {});
t.off('resize', (data: {terminal: Terminal, cols: number, rows: number}) => console.log(data));
t.off('scroll', () => {});
t.off('scroll', (ydisp: number) => console.log(ydisp));
t.off('title', () => {});
t.off('title', (title: string) => console.log(title));
}
{
const t: Terminal = new Terminal();
const e: HTMLElement = null;
t.open(e);
}
{
const t: Terminal = new Terminal();
t.attachCustomKeyEventHandler((e: KeyboardEvent) => true);
t.attachCustomKeyEventHandler((e: KeyboardEvent) => false);
const d1: IDisposable = t.addCsiHandler('x',
(params: number[], collect: string): boolean => params[0] === 1);
d1.dispose();
const d2: IDisposable = t.addOscHandler(199,
(data: string): boolean => true);
d2.dispose();
}
namespace options {
{
const t: Terminal = new Terminal();
const r01: string = t.getOption('cursorStyle');
const r02: string = t.getOption('termName');
const r03: boolean = t.getOption('cancelEvents');
const r04: boolean = t.getOption('convertEol');
const r05: boolean = t.getOption('cursorBlink');
const r06: boolean = t.getOption('debug');
const r07: boolean = t.getOption('disableStdin');
const r08: boolean = t.getOption('popOnBell');
const r09: boolean = t.getOption('screenKeys');
const r10: boolean = t.getOption('useFlowControl');
const r11: boolean = t.getOption('visualBell');
const r12: string[] = t.getOption('colors');
const r13: number = t.getOption('cols');
const r14: number = t.getOption('rows');
const r15: number = t.getOption('tabStopWidth');
const r16: number = t.getOption('scrollback');
const r18: (data: string) => void = t.getOption('handler');
const r19: string = t.getOption('bellSound');
const r20: string = t.getOption('bellStyle');
const r22: number = t.getOption('letterSpacing');
const r23: boolean = t.getOption('macOptionIsMeta');
const r24: string = t.getOption('fontWeight');
const r25: string = t.getOption('fontWeightBold');
const r26: boolean = t.getOption('allowTransparency');
const r27: boolean = t.getOption('rightClickSelectsWord');
const r28: boolean = t.getOption('windowsMode');
}
{
const t: Terminal = new Terminal();
t.setOption('cursorStyle', 'bar');
t.setOption('cursorStyle', 'block');
t.setOption('cursorStyle', 'underline');
t.setOption('termName', 'foo');
t.setOption('cancelEvents', true);
t.setOption('convertEol', true);
t.setOption('cursorBlink', true);
t.setOption('debug', true);
t.setOption('disableStdin', true);
t.setOption('fontWeight', 'normal');
t.setOption('fontWeight', 'bold');
t.setOption('fontWeightBold', 'normal');
t.setOption('fontWeightBold', 'bold');
t.setOption('popOnBell', true);
t.setOption('screenKeys', true);
t.setOption('useFlowControl', true);
t.setOption('allowTransparency', true);
t.setOption('visualBell', true);
t.setOption('windowsMode', true);
t.setOption('colors', ['a', 'b']);
t.setOption('letterSpacing', 1);
t.setOption('cols', 1);
t.setOption('rows', 1);
t.setOption('tabStopWidth', 1);
t.setOption('scrollback', 1);
t.setOption('handler', (data: string) => console.log(data));
t.setOption('bellSound', 'foo');
t.setOption('bellStyle', 'none');
// t.setOption('bellStyle', 'visual');
t.setOption('bellStyle', 'sound');
// t.setOption('bellStyle', 'both');
t.setOption('fontSize', 1);
t.setOption('lineHeight', 1);
t.setOption('fontFamily', 'foo');
t.setOption('theme', {background: '#ff0000'});
t.setOption('macOptionIsMeta', true);
t.setOption('rightClickSelectsWord', false);
}
}
namespace scrolling {
{
const t: Terminal = new Terminal();
t.scrollLines(-1);
t.scrollLines(1);
t.scrollLines(-1);
t.scrollLines(1);
t.scrollToTop();
t.scrollToBottom();
}
}
namespace selection {
{
const t: Terminal = new Terminal();
const r1: boolean = t.hasSelection();
const r2: string = t.getSelection();
t.clearSelection();
t.selectAll();
}
}
}
namespace methods_experimental {
{
const t: Terminal = new Terminal();
t.registerLinkMatcher(/foo/, () => {});
t.registerLinkMatcher(new RegExp('foo'), () => {});
t.registerLinkMatcher(/foo/, () => {}, {});
t.registerLinkMatcher(/foo/, (event: MouseEvent, uri: string) => {
console.log(event, uri);
return void 0;
}, {});
t.registerLinkMatcher(/foo/, () => true, {});
t.registerLinkMatcher(/foo/, () => false, {});
t.registerLinkMatcher(/foo/, () => true, {
matchIndex: 1
});
t.registerLinkMatcher(/foo/, () => true, {
matchIndex: 1,
priority: 1,
validationCallback: (uri: string, callback: (isValid: boolean) => void) => {
console.log(uri, callback);
},
tooltipCallback: (e: MouseEvent, uri: string) => {
console.log(e, uri);
},
leaveCallback: () => {}
});
t.deregisterLinkMatcher(1);
}
}
src/Terminal.integration.ts
-15
View File
@@ -5,13 +5,11 @@
* This file contains integration tests for xterm.js.
*/
import * as cp from 'child_process';
import * as glob from 'glob';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as pty from 'node-pty';
import { assert } from 'chai';
import { Terminal } from './Terminal';
import { IViewport } from './Types';
import { CellData, WHITESPACE_CELL_CHAR } from 'core/buffer/BufferLine';
@@ -154,16 +152,3 @@ if (os.platform() !== 'win32') {
}
});
}
describe('typings', () => {
it('should throw no compile errors', function (): void {
this.timeout(20000);
let tsc = path.join(__dirname, '..', 'node_modules', '.bin', 'tsc');
if (process.platform === 'win32') {
tsc += '.cmd';
}
const fixtureDir = path.join(__dirname, '..', 'fixtures', 'typings-test');
const result = cp.spawnSync(tsc, { cwd: fixtureDir });
assert.equal(result.status, 0, `build did not succeed:\nstdout: ${result.stdout.toString()}\nstderr: ${result.stderr.toString()}\n`);
});
});