Merge branch 'master' into 1473_slow_build

This commit is contained in:
Daniel Imms
2018-06-03 06:43:42 -07:00
committed by GitHub
50 changed files with 368 additions and 256 deletions
+5 -1
View File
@@ -8,5 +8,9 @@
"removeComments": true,
"declaration": true,
"preserveWatchOutput": true
}
},
"include": [
"**/*.ts",
"../../../typings/xterm.d.ts"
]
}
+2 -2
View File
@@ -34,8 +34,8 @@ describe('webLinks addon', () => {
const row = ' http://foo.com/a~b#c~d?e~f ';
let match = row.match(term.regex);
let uri = match[term.options.matchIndex];
const match = row.match(term.regex);
const uri = match[term.options.matchIndex];
assert.equal(uri, 'http://foo.com/a~b#c~d?e~f');
});
-2
View File
@@ -3,8 +3,6 @@
* @license MIT
*/
/// <reference path="../../../typings/xterm.d.ts"/>
import { Terminal, ILinkMatcherOptions } from 'xterm';
const protocolClause = '(https?:\\/\\/)';