mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 13:00:58 +00:00
parent
80e2fcaf43
commit
76f8ae85c9
|
@ -45,7 +45,7 @@
|
|||
"vscode-debugprotocol": "1.25.0",
|
||||
"vscode-ripgrep": "^0.6.0-patch.0.5",
|
||||
"vscode-textmate": "^3.2.0",
|
||||
"xterm": "Tyriar/xterm.js#vscode-release/1.20",
|
||||
"vscode-xterm": "3.0.0-beta1",
|
||||
"yauzl": "2.8.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
* to be stable and consumed by external programs.
|
||||
*/
|
||||
|
||||
declare module 'xterm' {
|
||||
declare module 'vscode-xterm' {
|
||||
/**
|
||||
* An object containing start up options for the 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 { Terminal as XTermTerminal } from 'xterm';
|
||||
import { Terminal as XTermTerminal } from 'vscode-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';
|
||||
|
@ -254,11 +254,11 @@ export class TerminalInstance implements ITerminalInstance {
|
|||
*/
|
||||
protected async _createXterm(): TPromise<void> {
|
||||
if (!Terminal) {
|
||||
Terminal = (await import('xterm')).Terminal;
|
||||
Terminal = (await import('vscode-xterm')).Terminal;
|
||||
// Enable search functionality in xterm.js instance
|
||||
Terminal.applyAddon(require.__$__nodeRequire('xterm/lib/addons/search/search'));
|
||||
Terminal.applyAddon(require.__$__nodeRequire('vscode-xterm/lib/addons/search/search'));
|
||||
// Enable the winpty compatibility addon which will simulate wraparound mode
|
||||
Terminal.applyAddon(require.__$__nodeRequire('xterm/lib/addons/winptyCompat/winptyCompat'));
|
||||
Terminal.applyAddon(require.__$__nodeRequire('vscode-xterm/lib/addons/winptyCompat/winptyCompat'));
|
||||
}
|
||||
const font = this._configHelper.getFont(true);
|
||||
this._xterm = new Terminal({
|
||||
|
|
|
@ -7,7 +7,7 @@ import * as platform from 'vs/base/common/platform';
|
|||
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 { Terminal as XTermTerminal } from 'xterm';
|
||||
import { Terminal as XTermTerminal } from 'vscode-xterm';
|
||||
|
||||
const SHELL_EXECUTABLES = ['cmd.exe', 'powershell.exe', 'bash.exe'];
|
||||
|
||||
|
|
|
@ -5808,6 +5808,10 @@ vscode-textmate@^3.2.0:
|
|||
fast-plist "^0.1.2"
|
||||
oniguruma "^6.0.1"
|
||||
|
||||
vscode-xterm@3.0.0-beta1:
|
||||
version "3.0.0-beta1"
|
||||
resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.0.0-beta1.tgz#5510cccd489ee14d7a48c3dc2a8c615ab47fcb5b"
|
||||
|
||||
vso-node-api@^6.1.2-preview:
|
||||
version "6.1.2-preview"
|
||||
resolved "https://registry.yarnpkg.com/vso-node-api/-/vso-node-api-6.1.2-preview.tgz#aab3546df2451ecd894e071bb99b5df19c5fa78f"
|
||||
|
@ -5946,10 +5950,6 @@ xtend@~3.0.0:
|
|||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
|
||||
|
||||
xterm@Tyriar/xterm.js#vscode-release/1.20:
|
||||
version "2.9.1"
|
||||
resolved "https://codeload.github.com/Tyriar/xterm.js/tar.gz/aeb2a98443b9278b05d76a84878156bf7f258d35"
|
||||
|
||||
y18n@^3.2.0:
|
||||
version "3.2.1"
|
||||
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
|
||||
|
|
Loading…
Reference in a new issue