From aa50751893a86640d0ac030a0e9f96c1b2e09ce2 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 13 Jul 2017 09:43:53 -0700 Subject: [PATCH] Fix compile after merge --- .../parts/terminal/electron-browser/terminalInstance.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index e37cee62447..0f5c57802ff 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -12,7 +12,7 @@ import * as platform from 'vs/base/common/platform'; import * as dom from 'vs/base/browser/dom'; import Event, { Emitter } from 'vs/base/common/event'; import Uri from 'vs/base/common/uri'; -import Terminal = require('xterm'); +import XTermTerminal = require('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'; @@ -40,7 +40,7 @@ import pkg from 'vs/platform/node/package'; const LAUNCHING_DURATION = 500; // Enable search functionality in xterm.js instance -(xterm).loadAddon('search'); +(XTermTerminal).loadAddon('search'); class StandardTerminalProcessFactory implements ITerminalProcessFactory { public create(env: { [key: string]: string }): cp.ChildProcess { @@ -76,7 +76,7 @@ export class TerminalInstance implements ITerminalInstance { private _instanceDisposables: lifecycle.IDisposable[]; private _processDisposables: lifecycle.IDisposable[]; private _wrapperElement: HTMLDivElement; - private _xterm: Terminal; + private _xterm: XTermTerminal; private _xtermElement: HTMLDivElement; private _terminalHasTextContextKey: IContextKey; private _cols: number; @@ -209,7 +209,7 @@ export class TerminalInstance implements ITerminalInstance { * Create xterm.js instance and attach data listeners. */ protected _createXterm(): void { - this._xterm = new Terminal({ + this._xterm = new XTermTerminal({ scrollback: this._configHelper.config.scrollback }); if (this._shellLaunchConfig.initialText) { -- GitLab