Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull in xterm.js v3 refactor #32809

Merged
merged 3 commits into from Aug 19, 2017
Merged

Pull in xterm.js v3 refactor #32809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eee02ec
Uplevel xterm.js
Tyriar Aug 17, 2017
84c7d30
Adapt the terminal for xterm v3
Tyriar Aug 18, 2017
43199d6
Pull in latest xterm.js
Tyriar Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -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": {
Expand Down
4 changes: 1 addition & 3 deletions src/typings/xterm.d.ts
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -192,6 +192,4 @@ declare module 'xterm' {
*/
static loadAddon(addon: string): void;
}

export = Terminal;
}
2 changes: 1 addition & 1 deletion src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View file
Open in desktop
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts
View file
Open in desktop
Expand Up @@ -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'];

Expand Down