mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
Merge pull request #32809 from Microsoft/tyriar/xterm-v3
Pull in xterm.js v3 refactor
This commit is contained in:
commit
441d6c7bd6
6
npm-shrinkwrap.json
generated
6
npm-shrinkwrap.json
generated
|
@ -567,9 +567,9 @@
|
|||
"resolved": "https://registry.npmjs.org/winreg/-/winreg-1.2.0.tgz"
|
||||
},
|
||||
"xterm": {
|
||||
"version": "2.8.1",
|
||||
"from": "Tyriar/xterm.js#vscode-release/1.15",
|
||||
"resolved": "git+https://github.com/Tyriar/xterm.js.git#75ffea5ebd5510ad0478b017c3946cb8d504855f"
|
||||
"version": "2.9.1",
|
||||
"from": "Tyriar/xterm.js#vscode-release/1.16",
|
||||
"resolved": "git+https://github.com/Tyriar/xterm.js.git#74fde417c97962730a5fbbc8e8e7dcd47e1b897b"
|
||||
},
|
||||
"yauzl": {
|
||||
"version": "2.8.0",
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
"vscode-ripgrep": "0.0.25",
|
||||
"vscode-textmate": "^3.1.5",
|
||||
"winreg": "1.2.0",
|
||||
"xterm": "Tyriar/xterm.js#vscode-release/1.15",
|
||||
"xterm": "Tyriar/xterm.js#vscode-release/1.16",
|
||||
"yauzl": "2.8.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
4
src/typings/xterm.d.ts
vendored
4
src/typings/xterm.d.ts
vendored
|
@ -6,7 +6,7 @@
|
|||
declare module 'xterm' {
|
||||
type LinkMatcherHandler = (event: MouseEvent, uri: string) => boolean | void;
|
||||
|
||||
class Terminal {
|
||||
export class Terminal {
|
||||
cols: number;
|
||||
rows: number;
|
||||
ydisp: number;
|
||||
|
@ -192,6 +192,4 @@ declare module 'xterm' {
|
|||
*/
|
||||
static loadAddon(addon: string): void;
|
||||
}
|
||||
|
||||
export = Terminal;
|
||||
}
|
|
@ -13,7 +13,7 @@ import * as dom from 'vs/base/browser/dom';
|
|||
import Event, { Emitter } from 'vs/base/common/event';
|
||||
import Uri from 'vs/base/common/uri';
|
||||
import { WindowsShellHelper } from 'vs/workbench/parts/terminal/electron-browser/windowsShellHelper';
|
||||
import XTermTerminal = require('xterm');
|
||||
import { Terminal as XTermTerminal } from 'xterm';
|
||||
import { Dimension } from 'vs/base/browser/builder';
|
||||
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||
|
|
|
@ -10,7 +10,7 @@ import * as path from 'path';
|
|||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { Emitter, debounceEvent } from 'vs/base/common/event';
|
||||
import { ITerminalInstance } from 'vs/workbench/parts/terminal/common/terminal';
|
||||
import XTermTerminal = require('xterm');
|
||||
import { Terminal as XTermTerminal } from 'xterm';
|
||||
|
||||
const SHELL_EXECUTABLES = ['cmd.exe', 'powershell.exe', 'bash.exe'];
|
||||
|
||||
|
|
Loading…
Reference in a new issue