Skip to content

Commit 34aa37c

Browse files
TyriarTyriar
committed
Replace vscode-xterm with xterm
1 parent 649d6be commit 34aa37c

14 files changed

Lines changed: 36 additions & 30 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"vscode-ripgrep": "^1.2.5",
5454
"vscode-sqlite3": "4.0.7",
5555
"vscode-textmate": "^4.1.1",
56-
"vscode-xterm": "3.14.0-beta5",
56+
"xterm": "3.14.0-beta27",
5757
"yauzl": "^2.9.1",
5858
"yazl": "^2.4.3"
5959
},

src/typings/vscode-xterm.d.ts renamed to src/typings/xterm.d.ts

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
16
/**
2-
* @license MIT
3-
*
4-
* This contains the type declarations for the xterm.js library. Note that
5-
* some interfaces differ between this file and the actual implementation in
6-
* src/, that's because this file declares the *public* API which is intended
7-
* to be stable and consumed by external programs.
8-
*/
7+
* @license MIT
8+
*
9+
* This contains the type declarations for the xterm.js library. Note that
10+
* some interfaces differ between this file and the actual implementation in
11+
* src/, that's because this file declares the *public* API which is intended
12+
* to be stable and consumed by external programs.
13+
*/
914

1015
/// <reference lib="dom"/>
1116

12-
declare module 'vscode-xterm' {
17+
declare module 'xterm' {
1318
/**
1419
* A string representing text font weight.
1520
*/
@@ -1013,8 +1018,9 @@ declare module 'vscode-xterm' {
10131018
}
10141019

10151020

1021+
10161022
// Modifications to official .d.ts below
1017-
declare module 'vscode-xterm' {
1023+
declare module 'xterm' {
10181024
interface TerminalCore {
10191025
debug: boolean;
10201026

@@ -1075,4 +1081,4 @@ declare module 'vscode-xterm' {
10751081
*/
10761082
findPrevious(term: string, findOptions: ISearchOptions): boolean;
10771083
}
1078-
}
1084+
}

‎src/vs/platform/driver/electron-browser/driver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProces
1010
import { getTopLeftOffset, getClientArea } from 'vs/base/browser/dom';
1111
import * as electron from 'electron';
1212
import { IWindowService } from 'vs/platform/windows/common/windows';
13-
import { Terminal } from 'vscode-xterm';
13+
import { Terminal } from 'xterm';
1414
import { timeout } from 'vs/base/common/async';
1515
import { coalesce } from 'vs/base/common/arrays';
1616

‎src/vs/workbench/contrib/terminal/browser/terminal.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { Terminal as XTermTerminal } from 'vscode-xterm';
6+
import { Terminal as XTermTerminal } from 'xterm';
77
import { ITerminalInstance, IWindowsShellHelper, ITerminalProcessManager, ITerminalConfigHelper, ITerminalChildProcess, IShellLaunchConfig } from 'vs/workbench/contrib/terminal/common/terminal';
88
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
99
import { IProcessEnvironment, Platform } from 'vs/base/common/platform';

‎src/vs/workbench/contrib/terminal/browser/terminalCommandTracker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { Terminal, IMarker } from 'vscode-xterm';
6+
import { Terminal, IMarker } from 'xterm';
77
import { ITerminalCommandTracker } from 'vs/workbench/contrib/terminal/common/terminal';
88
import { IDisposable } from 'vs/base/common/lifecycle';
99

‎src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
1010
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
1111
import { ITerminalConfiguration, ITerminalFont, IShellLaunchConfig, IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, TERMINAL_CONFIG_SECTION, DEFAULT_LETTER_SPACING, DEFAULT_LINE_HEIGHT, MINIMUM_LETTER_SPACING, LinuxDistro } from 'vs/workbench/contrib/terminal/common/terminal';
1212
import Severity from 'vs/base/common/severity';
13-
import { Terminal as XTermTerminal } from 'vscode-xterm';
13+
import { Terminal as XTermTerminal } from 'xterm';
1414
import { INotificationService } from 'vs/platform/notification/common/notification';
1515
import { IBrowserTerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminal';
1616
import { mergeDefaultShellPathAndArgs } from 'vs/workbench/contrib/terminal/common/terminalEnvironment';

‎src/vs/workbench/contrib/terminal/browser/terminalInstance.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/term
3232
import { TerminalLinkHandler } from 'vs/workbench/contrib/terminal/browser/terminalLinkHandler';
3333
import { TerminalCommandTracker } from 'vs/workbench/contrib/terminal/browser/terminalCommandTracker';
3434
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
35-
import { ISearchOptions, Terminal as XTermTerminal, IBuffer } from 'vscode-xterm';
35+
import { ISearchOptions, Terminal as XTermTerminal, IBuffer } from 'xterm';
3636
import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
3737
import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
3838

‎src/vs/workbench/contrib/terminal/browser/terminalLinkHandler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { ITerminalService, ITerminalProcessManager } from 'vs/workbench/contrib/
1414
import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
1515
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1616
import { IFileService } from 'vs/platform/files/common/files';
17-
import { ILinkMatcherOptions } from 'vscode-xterm';
17+
import { ILinkMatcherOptions } from 'xterm';
1818
import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
1919
import { posix, win32 } from 'vs/base/common/path';
2020

‎src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { Terminal as XTermTerminal } from 'vscode-xterm';
6+
import { Terminal as XTermTerminal } from 'xterm';
77
import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
88
import { IThemeService } from 'vs/platform/theme/common/themeService';
99

‎src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import * as nls from 'vs/nls';
77
import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
8-
import { Terminal as XTermTerminal } from 'vscode-xterm';
8+
import { Terminal as XTermTerminal } from 'xterm';
99
import { ITerminalInstance, IWindowsShellHelper, ITerminalConfigHelper, ITerminalProcessManager, IShellLaunchConfig, ITerminalChildProcess } from 'vs/workbench/contrib/terminal/common/terminal';
1010
import { WindowsShellHelper } from 'vs/workbench/contrib/terminal/node/windowsShellHelper';
1111
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -32,10 +32,10 @@ export class TerminalInstanceService implements ITerminalInstanceService {
3232

3333
public async getXtermConstructor(): Promise<typeof XTermTerminal> {
3434
if (!Terminal) {
35-
Terminal = (await import('vscode-xterm')).Terminal;
35+
Terminal = (await import('xterm')).Terminal;
3636
// Enable xterm.js addons
37-
Terminal.applyAddon(require.__$__nodeRequire('vscode-xterm/lib/addons/search/search'));
38-
Terminal.applyAddon(require.__$__nodeRequire('vscode-xterm/lib/addons/webLinks/webLinks'));
37+
Terminal.applyAddon(require.__$__nodeRequire('xterm/lib/addons/search/search'));
38+
Terminal.applyAddon(require.__$__nodeRequire('xterm/lib/addons/webLinks/webLinks'));
3939
Terminal.applyAddon(typeAheadAddon);
4040
// Localize strings
4141
Terminal.strings.blankLine = nls.localize('terminal.integrated.a11yBlankLine', 'Blank line');

0 commit comments

Comments
 (0)