Skip to content

Commit a6f0ec3

Browse files
TyriarTyriar
committed
Improve terminal layering
1 parent 1655a6a commit a6f0ec3

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts renamed to src/vs/workbench/parts/terminal/browser/terminalFindWidget.ts

File renamed without changes.

src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.ts renamed to src/vs/workbench/parts/terminal/common/terminalColorRegistry.ts

File renamed without changes.

src/vs/workbench/parts/terminal/electron-browser/terminalCommands.ts renamed to src/vs/workbench/parts/terminal/common/terminalCommands.ts

File renamed without changes.

‎src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import * as debugActions from 'vs/workbench/parts/debug/browser/debugActions';
1111
import * as nls from 'vs/nls';
1212
import * as panel from 'vs/workbench/browser/panel';
1313
import * as platform from 'vs/base/common/platform';
14-
import * as terminalCommands from 'vs/workbench/parts/terminal/electron-browser/terminalCommands';
14+
import * as terminalCommands from 'vs/workbench/parts/terminal/common/terminalCommands';
1515
import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
1616
import { ITerminalService, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_PANEL_ID, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TerminalCursorStyle, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_NOT_VISIBLE } from 'vs/workbench/parts/terminal/common/terminal';
1717
import { getTerminalDefaultShellUnixLike, getTerminalDefaultShellWindows } from 'vs/workbench/parts/terminal/electron-browser/terminal';
@@ -28,7 +28,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
2828
import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
2929
import { OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusSecondGroupAction, FocusThirdGroupAction } from 'vs/workbench/browser/parts/editor/editorActions';
3030
import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
31-
import { registerColors } from './terminalColorRegistry';
31+
import { registerColors } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
3232
import { NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction } from 'vs/workbench/electron-browser/actions';
3333
import { QUICKOPEN_ACTION_ID, getQuickNavigateHandler, QUICKOPEN_FOCUS_SECONDARY_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen';
3434
import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';

‎src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as platform from 'vs/base/common/platform';
99
import * as dom from 'vs/base/browser/dom';
1010
import * as paths from 'vs/base/common/paths';
1111
import { Event, Emitter } from 'vs/base/common/event';
12-
import { WindowsShellHelper } from 'vs/workbench/parts/terminal/electron-browser/windowsShellHelper';
12+
import { WindowsShellHelper } from 'vs/workbench/parts/terminal/node/windowsShellHelper';
1313
import { Terminal as XTermTerminal } from 'vscode-xterm';
1414
import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
1515
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -25,7 +25,7 @@ import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService }
2525
import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
2626
import { TPromise } from 'vs/base/common/winjs.base';
2727
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
28-
import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
28+
import { ansiColorIdentifiers, TERMINAL_BACKGROUND_COLOR, TERMINAL_FOREGROUND_COLOR, TERMINAL_CURSOR_FOREGROUND_COLOR, TERMINAL_CURSOR_BACKGROUND_COLOR, TERMINAL_SELECTION_BACKGROUND_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
2929
import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
3030
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
3131
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';

‎src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
1515
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1616
import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal';
1717
import { IThemeService, ITheme, registerThemingParticipant, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
18-
import { TerminalFindWidget } from './terminalFindWidget';
18+
import { TerminalFindWidget } from 'vs/workbench/parts/terminal/browser/terminalFindWidget';
1919
import { editorHoverBackground, editorHoverBorder, editorForeground } from 'vs/platform/theme/common/colorRegistry';
2020
import { KillTerminalAction, SwitchTerminalAction, SwitchTerminalActionItem, CopyTerminalSelectionAction, TerminalPasteAction, ClearTerminalAction, SelectAllTerminalAction, CreateNewTerminalAction, SplitTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions';
2121
import { Panel } from 'vs/workbench/browser/panel';
2222
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
2323
import { TPromise } from 'vs/base/common/winjs.base';
2424
import URI from 'vs/base/common/uri';
2525
import { PANEL_BACKGROUND, PANEL_BORDER } from 'vs/workbench/common/theme';
26-
import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
26+
import { TERMINAL_BACKGROUND_COLOR, TERMINAL_BORDER_COLOR } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
2727
import { DataTransfers } from 'vs/base/browser/dnd';
2828
import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
2929

‎src/vs/workbench/parts/terminal/electron-browser/terminalTab.ts‎

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

6-
import { ITerminalInstance, IShellLaunchConfig, ITerminalTab, Direction, ITerminalService } from 'vs/workbench/parts/terminal/common/terminal';
6+
import { ITerminalInstance, IShellLaunchConfig, ITerminalTab, Direction, ITerminalService, ITerminalConfigHelper } from 'vs/workbench/parts/terminal/common/terminal';
77
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
8-
import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
98
import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
9+
// TODO: Let service create instance, and move to browser layer
1010
import { TerminalInstance } from 'vs/workbench/parts/terminal/electron-browser/terminalInstance';
1111
import { Event, Emitter, anyEvent } from 'vs/base/common/event';
1212
import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
@@ -255,7 +255,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
255255

256256
constructor(
257257
terminalFocusContextKey: IContextKey<boolean>,
258-
configHelper: TerminalConfigHelper,
258+
configHelper: ITerminalConfigHelper,
259259
private _container: HTMLElement,
260260
shellLaunchConfig: IShellLaunchConfig,
261261
@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -393,7 +393,7 @@ export class TerminalTab extends Disposable implements ITerminalTab {
393393

394394
public split(
395395
terminalFocusContextKey: IContextKey<boolean>,
396-
configHelper: TerminalConfigHelper,
396+
configHelper: ITerminalConfigHelper,
397397
shellLaunchConfig: IShellLaunchConfig
398398
): ITerminalInstance {
399399
const instance = this._instantiationService.createInstance(TerminalInstance,

src/vs/workbench/parts/terminal/electron-browser/windowsShellHelper.ts renamed to src/vs/workbench/parts/terminal/node/windowsShellHelper.ts

File renamed without changes.

‎src/vs/workbench/parts/terminal/test/electron-browser/terminalColorRegistry.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as assert from 'assert';
77
import { Extensions as ThemeingExtensions, IColorRegistry, ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
88
import { Registry } from 'vs/platform/registry/common/platform';
9-
import { ansiColorIdentifiers, registerColors } from 'vs/workbench/parts/terminal/electron-browser/terminalColorRegistry';
9+
import { ansiColorIdentifiers, registerColors } from 'vs/workbench/parts/terminal/common/terminalColorRegistry';
1010
import { ITheme, ThemeType } from 'vs/platform/theme/common/themeService';
1111
import { Color } from 'vs/base/common/color';
1212

0 commit comments

Comments
 (0)