development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace vscode-xterm with xterm

Browse source
This commit is contained in:
Daniel Imms 2019-05-24 17:34:10 -07:00
parent 649d6befa1
commit 34aa37c398
14 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -53,7 +53,7 @@
"vscode-ripgrep": "^1.2.5",
"vscode-sqlite3": "4.0.7",
"vscode-textmate": "^4.1.1",
"vscode-xterm": "3.14.0-beta5",
"xterm": "3.14.0-beta27",
"yauzl": "^2.9.1",
"yazl": "^2.4.3"
},

26
src/typings/vscode-xterm.d.ts → src/typings/xterm.d.ts vendored
View file

@ -1,15 +1,20 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/**
* @license MIT
*
* This contains the type declarations for the xterm.js library. Note that
* some interfaces differ between this file and the actual implementation in
* src/, that's because this file declares the *public* API which is intended
* to be stable and consumed by external programs.
*/
* @license MIT
*
* This contains the type declarations for the xterm.js library. Note that
* some interfaces differ between this file and the actual implementation in
* src/, that's because this file declares the *public* API which is intended
* to be stable and consumed by external programs.
*/
/// <reference lib="dom"/>
declare module 'vscode-xterm' {
declare module 'xterm' {
/**
* A string representing text font weight.
*/
@ -1013,8 +1018,9 @@ declare module 'vscode-xterm' {
}
// Modifications to official .d.ts below
declare module 'vscode-xterm' {
declare module 'xterm' {
interface TerminalCore {
debug: boolean;
@ -1075,4 +1081,4 @@ declare module 'vscode-xterm' {
*/
findPrevious(term: string, findOptions: ISearchOptions): boolean;
}
}
}

2
src/vs/platform/driver/electron-browser/driver.ts
View file

@ -10,7 +10,7 @@ import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProces
import { getTopLeftOffset, getClientArea } from 'vs/base/browser/dom';
import * as electron from 'electron';
import { IWindowService } from 'vs/platform/windows/common/windows';
import { Terminal } from 'vscode-xterm';
import { Terminal } from 'xterm';
import { timeout } from 'vs/base/common/async';
import { coalesce } from 'vs/base/common/arrays';

2
src/vs/workbench/contrib/terminal/browser/terminal.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Terminal as XTermTerminal } from 'vscode-xterm';
import { Terminal as XTermTerminal } from 'xterm';
import { ITerminalInstance, IWindowsShellHelper, ITerminalProcessManager, ITerminalConfigHelper, ITerminalChildProcess, IShellLaunchConfig } from 'vs/workbench/contrib/terminal/common/terminal';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IProcessEnvironment, Platform } from 'vs/base/common/platform';

2
src/vs/workbench/contrib/terminal/browser/terminalCommandTracker.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Terminal, IMarker } from 'vscode-xterm';
import { Terminal, IMarker } from 'xterm';
import { ITerminalCommandTracker } from 'vs/workbench/contrib/terminal/common/terminal';
import { IDisposable } from 'vs/base/common/lifecycle';

2
src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts
View file

@ -10,7 +10,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
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';
import Severity from 'vs/base/common/severity';
import { Terminal as XTermTerminal } from 'vscode-xterm';
import { Terminal as XTermTerminal } from 'xterm';
import { INotificationService } from 'vs/platform/notification/common/notification';
import { IBrowserTerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/terminal';
import { mergeDefaultShellPathAndArgs } from 'vs/workbench/contrib/terminal/common/terminalEnvironment';

2
src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
View file

@ -32,7 +32,7 @@ import { TerminalConfigHelper } from 'vs/workbench/contrib/terminal/browser/term
import { TerminalLinkHandler } from 'vs/workbench/contrib/terminal/browser/terminalLinkHandler';
import { TerminalCommandTracker } from 'vs/workbench/contrib/terminal/browser/terminalCommandTracker';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import { ISearchOptions, Terminal as XTermTerminal, IBuffer } from 'vscode-xterm';
import { ISearchOptions, Terminal as XTermTerminal, IBuffer } from 'xterm';
import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';

2
src/vs/workbench/contrib/terminal/browser/terminalLinkHandler.ts
View file

@ -14,7 +14,7 @@ import { ITerminalService, ITerminalProcessManager } from 'vs/workbench/contrib/
import { ITextEditorSelection } from 'vs/platform/editor/common/editor';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IFileService } from 'vs/platform/files/common/files';
import { ILinkMatcherOptions } from 'vscode-xterm';
import { ILinkMatcherOptions } from 'xterm';
import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
import { posix, win32 } from 'vs/base/common/path';

2
src/vs/workbench/contrib/terminal/browser/terminalTypeAheadAddon.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Terminal as XTermTerminal } from 'vscode-xterm';
import { Terminal as XTermTerminal } from 'xterm';
import { ITerminalProcessManager } from 'vs/workbench/contrib/terminal/common/terminal';
import { IThemeService } from 'vs/platform/theme/common/themeService';

8
src/vs/workbench/contrib/terminal/electron-browser/terminalInstanceService.ts
View file

@ -5,7 +5,7 @@
import * as nls from 'vs/nls';
import { ITerminalInstanceService } from 'vs/workbench/contrib/terminal/browser/terminal';
import { Terminal as XTermTerminal } from 'vscode-xterm';
import { Terminal as XTermTerminal } from 'xterm';
import { ITerminalInstance, IWindowsShellHelper, ITerminalConfigHelper, ITerminalProcessManager, IShellLaunchConfig, ITerminalChildProcess } from 'vs/workbench/contrib/terminal/common/terminal';
import { WindowsShellHelper } from 'vs/workbench/contrib/terminal/node/windowsShellHelper';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@ -32,10 +32,10 @@ export class TerminalInstanceService implements ITerminalInstanceService {
public async getXtermConstructor(): Promise<typeof XTermTerminal> {
if (!Terminal) {
Terminal = (await import('vscode-xterm')).Terminal;
Terminal = (await import('xterm')).Terminal;
// Enable xterm.js addons
Terminal.applyAddon(require.__$__nodeRequire('vscode-xterm/lib/addons/search/search'));
Terminal.applyAddon(require.__$__nodeRequire('vscode-xterm/lib/addons/webLinks/webLinks'));
Terminal.applyAddon(require.__$__nodeRequire('xterm/lib/addons/search/search'));
Terminal.applyAddon(require.__$__nodeRequire('xterm/lib/addons/webLinks/webLinks'));
Terminal.applyAddon(typeAheadAddon);
// Localize strings
Terminal.strings.blankLine = nls.localize('terminal.integrated.a11yBlankLine', 'Blank line');

2
src/vs/workbench/contrib/terminal/node/windowsShellHelper.ts
View file

@ -6,7 +6,7 @@
import * as platform from 'vs/base/common/platform';
import { Emitter, Event } from 'vs/base/common/event';
import { ITerminalInstance, IWindowsShellHelper } from 'vs/workbench/contrib/terminal/common/terminal';
import { Terminal as XTermTerminal } from 'vscode-xterm';
import { Terminal as XTermTerminal } from 'xterm';
import WindowsProcessTreeType = require('windows-process-tree');
const SHELL_EXECUTABLES = [

2
src/vs/workbench/contrib/terminal/test/electron-browser/terminalCommandTracker.test.ts
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { Terminal, TerminalCore } from 'vscode-xterm';
import { Terminal, TerminalCore } from 'xterm';
import { TerminalCommandTracker } from 'vs/workbench/contrib/terminal/browser/terminalCommandTracker';
import { isWindows } from 'vs/base/common/platform';

2
tslint.json
View file

@ -506,7 +506,7 @@
{
"target": "**/vs/workbench/contrib/terminal/browser/**",
"restrictions": [
"vscode-xterm",
"xterm",
"**/vs/**"
]
},

10
yarn.lock
View file

@ -9636,11 +9636,6 @@ vscode-windows-registry@1.0.1:
dependencies:
nan "^2.12.1"
vscode-xterm@3.14.0-beta5:
version "3.14.0-beta5"
resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.14.0-beta5.tgz#53817b035c3dc786efd82f231caa1bdabab7f06f"
integrity sha512-gluTw/GjnOAf2EQ+WqFLjmgSe7P7c1HRmJedkC0uvHaMAOsLeSw3G9UrMkIejN4bTWEfKrAOLYG2hOTVd8ejaw==
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"
@ -9910,6 +9905,11 @@ xtend@~2.1.1:
dependencies:
object-keys "~0.4.0"
xterm@3.14.0-beta27:
version "3.14.0-beta27"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.14.0-beta27.tgz#57843f7600aed80021b0f4f55c1a97a20e28be09"
integrity sha512-p/Z4iWZhnjKNYVv7k7tbSNd9BC5sG12RfLsU13Wd+YFyRlNf5S2CBAH8TXT+qWg0JyJTlgfDl1xp2/ROf3LKjA==
y18n@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"