diff --git a/src/vs/workbench/parts/terminal/common/terminalCommands.ts b/src/vs/workbench/parts/terminal/common/terminalCommands.ts index 489ce3b0e39d9088ceb437088f8030fc657ee2cb..fa7471a23167692c2c0ac62738cadd7aa645d5f0 100644 --- a/src/vs/workbench/parts/terminal/common/terminalCommands.ts +++ b/src/vs/workbench/parts/terminal/common/terminalCommands.ts @@ -6,7 +6,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal'; -export const enum COMMAND_ID { +export const enum TERMINAL_COMMAND_ID { TOGGLE = 'workbench.action.terminal.toggleTerminal', KILL = 'workbench.action.terminal.kill', QUICK_KILL = 'workbench.action.terminal.quickKill', diff --git a/src/vs/workbench/parts/terminal/common/terminalMenu.ts b/src/vs/workbench/parts/terminal/common/terminalMenu.ts index d7b5a0a743ed680f2e48edd7f8e261ec72efade8..df51b81f073cbebe5df9caa2612a3206ac8121ae 100644 --- a/src/vs/workbench/parts/terminal/common/terminalMenu.ts +++ b/src/vs/workbench/parts/terminal/common/terminalMenu.ts @@ -5,7 +5,7 @@ import * as nls from 'vs/nls'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; +import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; export function setupTerminalMenu() { // Manage @@ -13,7 +13,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: manageGroup, command: { - id: COMMAND_ID.NEW, + id: TERMINAL_COMMAND_ID.NEW, title: nls.localize({ key: 'miNewTerminal', comment: ['&& denotes a mnemonic'] }, "&&New Terminal") }, order: 1 @@ -21,7 +21,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: manageGroup, command: { - id: COMMAND_ID.SPLIT, + id: TERMINAL_COMMAND_ID.SPLIT, title: nls.localize({ key: 'miSplitTerminal', comment: ['&& denotes a mnemonic'] }, "&&Split Terminal") }, order: 2 @@ -30,7 +30,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: manageGroup, command: { - id: COMMAND_ID.KILL, + id: TERMINAL_COMMAND_ID.KILL, title: nls.localize({ key: 'miKillTerminal', comment: ['&& denotes a mnemonic'] }, "&&Kill Terminal") }, order: 3 @@ -41,7 +41,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: runGroup, command: { - id: COMMAND_ID.CLEAR, + id: TERMINAL_COMMAND_ID.CLEAR, title: nls.localize({ key: 'miClear', comment: ['&& denotes a mnemonic'] }, "&&Clear") }, order: 1 @@ -49,7 +49,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: runGroup, command: { - id: COMMAND_ID.RUN_ACTIVE_FILE, + id: TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE, title: nls.localize({ key: 'miRunActiveFile', comment: ['&& denotes a mnemonic'] }, "Run &&Active File") }, order: 2 @@ -57,7 +57,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: runGroup, command: { - id: COMMAND_ID.RUN_SELECTED_TEXT, + id: TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT, title: nls.localize({ key: 'miRunSelectedText', comment: ['&& denotes a mnemonic'] }, "Run &&Selected Text") }, order: 3 @@ -68,7 +68,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: navigationGroup, command: { - id: COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND, + id: TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND, title: nls.localize({ key: 'miScrollToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Previous Command") }, order: 1 @@ -76,7 +76,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: navigationGroup, command: { - id: COMMAND_ID.SCROLL_TO_NEXT_COMMAND, + id: TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND, title: nls.localize({ key: 'miScrollToNextCommand', comment: ['&& denotes a mnemonic'] }, "Scroll To Next Command") }, order: 2 @@ -84,7 +84,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: navigationGroup, command: { - id: COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND, + id: TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND, title: nls.localize({ key: 'miSelectToPreviousCommand', comment: ['&& denotes a mnemonic'] }, "Select To Previous Command") }, order: 3 @@ -92,7 +92,7 @@ export function setupTerminalMenu() { MenuRegistry.appendMenuItem(MenuId.MenubarTerminalMenu, { group: navigationGroup, command: { - id: COMMAND_ID.SELECT_TO_NEXT_COMMAND, + id: TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND, title: nls.localize({ key: 'miSelectToNextCommand', comment: ['&& denotes a mnemonic'] }, "Select To Next Command") }, order: 4 diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index 74941ddcae081ca8df3a453692c917037c42fdf2..9171535df6a09b7a2c26dc2acb5c15f5ad3a2240 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -36,7 +36,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { TogglePanelAction } from 'vs/workbench/browser/parts/panel/panelActions'; import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; import { TerminalPickerHandler } from 'vs/workbench/parts/terminal/browser/terminalQuickOpen'; -import { setupTerminalCommands, COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; +import { setupTerminalCommands, TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; import { setupTerminalMenu } from 'vs/workbench/parts/terminal/common/terminalMenu'; const quickOpenRegistry = (Registry.as(QuickOpenExtensions.Quickopen)); @@ -227,46 +227,46 @@ configurationRegistry.registerConfiguration({ 'type': 'string' }, 'default': [ - COMMAND_ID.CLEAR_SELECTION, - COMMAND_ID.CLEAR, - COMMAND_ID.COPY_SELECTION, - COMMAND_ID.DELETE_WORD_LEFT, - COMMAND_ID.DELETE_WORD_RIGHT, - COMMAND_ID.FIND_WIDGET_FOCUS, - COMMAND_ID.FIND_WIDGET_HIDE, - COMMAND_ID.FOCUS_NEXT_PANE, - COMMAND_ID.FOCUS_NEXT, - COMMAND_ID.FOCUS_PREVIOUS_PANE, - COMMAND_ID.FOCUS_PREVIOUS, - COMMAND_ID.FOCUS, - COMMAND_ID.KILL, - COMMAND_ID.MOVE_TO_LINE_END, - COMMAND_ID.MOVE_TO_LINE_START, - COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE, - COMMAND_ID.NEW, - COMMAND_ID.PASTE, - COMMAND_ID.RESIZE_PANE_DOWN, - COMMAND_ID.RESIZE_PANE_LEFT, - COMMAND_ID.RESIZE_PANE_RIGHT, - COMMAND_ID.RESIZE_PANE_UP, - COMMAND_ID.RUN_ACTIVE_FILE, - COMMAND_ID.RUN_SELECTED_TEXT, - COMMAND_ID.SCROLL_DOWN_LINE, - COMMAND_ID.SCROLL_DOWN_PAGE, - COMMAND_ID.SCROLL_TO_BOTTOM, - COMMAND_ID.SCROLL_TO_NEXT_COMMAND, - COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND, - COMMAND_ID.SCROLL_TO_TOP, - COMMAND_ID.SCROLL_UP_LINE, - COMMAND_ID.SCROLL_UP_PAGE, - COMMAND_ID.SELECT_ALL, - COMMAND_ID.SELECT_TO_NEXT_COMMAND, - COMMAND_ID.SELECT_TO_NEXT_LINE, - COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND, - COMMAND_ID.SELECT_TO_PREVIOUS_LINE, - COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE, - COMMAND_ID.SPLIT, - COMMAND_ID.TOGGLE, + TERMINAL_COMMAND_ID.CLEAR_SELECTION, + TERMINAL_COMMAND_ID.CLEAR, + TERMINAL_COMMAND_ID.COPY_SELECTION, + TERMINAL_COMMAND_ID.DELETE_WORD_LEFT, + TERMINAL_COMMAND_ID.DELETE_WORD_RIGHT, + TERMINAL_COMMAND_ID.FIND_WIDGET_FOCUS, + TERMINAL_COMMAND_ID.FIND_WIDGET_HIDE, + TERMINAL_COMMAND_ID.FOCUS_NEXT_PANE, + TERMINAL_COMMAND_ID.FOCUS_NEXT, + TERMINAL_COMMAND_ID.FOCUS_PREVIOUS_PANE, + TERMINAL_COMMAND_ID.FOCUS_PREVIOUS, + TERMINAL_COMMAND_ID.FOCUS, + TERMINAL_COMMAND_ID.KILL, + TERMINAL_COMMAND_ID.MOVE_TO_LINE_END, + TERMINAL_COMMAND_ID.MOVE_TO_LINE_START, + TERMINAL_COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE, + TERMINAL_COMMAND_ID.NEW, + TERMINAL_COMMAND_ID.PASTE, + TERMINAL_COMMAND_ID.RESIZE_PANE_DOWN, + TERMINAL_COMMAND_ID.RESIZE_PANE_LEFT, + TERMINAL_COMMAND_ID.RESIZE_PANE_RIGHT, + TERMINAL_COMMAND_ID.RESIZE_PANE_UP, + TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE, + TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT, + TERMINAL_COMMAND_ID.SCROLL_DOWN_LINE, + TERMINAL_COMMAND_ID.SCROLL_DOWN_PAGE, + TERMINAL_COMMAND_ID.SCROLL_TO_BOTTOM, + TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND, + TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND, + TERMINAL_COMMAND_ID.SCROLL_TO_TOP, + TERMINAL_COMMAND_ID.SCROLL_UP_LINE, + TERMINAL_COMMAND_ID.SCROLL_UP_PAGE, + TERMINAL_COMMAND_ID.SELECT_ALL, + TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND, + TERMINAL_COMMAND_ID.SELECT_TO_NEXT_LINE, + TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND, + TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_LINE, + TERMINAL_COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE, + TERMINAL_COMMAND_ID.SPLIT, + TERMINAL_COMMAND_ID.TOGGLE, ToggleTabFocusModeAction.ID, QUICKOPEN_ACTION_ID, QUICKOPEN_FOCUS_SECONDARY_ACTION_ID, @@ -369,7 +369,7 @@ registerSingleton(ITerminalService, TerminalService); nls.localize('terminal', "Terminal"), 'terminal', 40, - ToggleTerminalAction.ID + TERMINAL_COMMAND_ID.TOGGLE )); // On mac cmd+` is reserved to cycle between windows, that's why the keybindings use WinCtrl @@ -409,7 +409,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SelectAllTermina }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Select All', category); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(RunSelectedTextInTerminalAction, RunSelectedTextInTerminalAction.ID, RunSelectedTextInTerminalAction.LABEL), 'Terminal: Run Selected Text In Active Terminal', category); actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(RunActiveFileInTerminalAction, RunActiveFileInTerminalAction.ID, RunActiveFileInTerminalAction.LABEL), 'Terminal: Run Active File In Active Terminal', category); -actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleTerminalAction, ToggleTerminalAction.ID, ToggleTerminalAction.LABEL, { +actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ToggleTerminalAction, TERMINAL_COMMAND_ID.TOGGLE, ToggleTerminalAction.LABEL, { primary: KeyMod.CtrlCmd | KeyCode.US_BACKTICK, mac: { primary: KeyMod.WinCtrl | KeyCode.US_BACKTICK } }), 'View: Toggle Integrated Terminal', nls.localize('viewCategory', "View")); diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index fc7e402d72d2035ac02bc5d9559705f97979395a..7eea6afdb4c32cf8a8b0abb44b990d22e97051cc 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -26,13 +26,13 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from 'vs/workbench/browser/actions/workspaceCommands'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; +import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; export const TERMINAL_PICKER_PREFIX = 'term '; export class ToggleTerminalAction extends TogglePanelAction { - public static readonly ID = COMMAND_ID.TOGGLE; + public static readonly ID = TERMINAL_COMMAND_ID.TOGGLE; public static readonly LABEL = nls.localize('workbench.action.terminal.toggleTerminal', "Toggle Integrated Terminal"); constructor( @@ -60,7 +60,7 @@ export class ToggleTerminalAction extends TogglePanelAction { export class KillTerminalAction extends Action { - public static readonly ID = COMMAND_ID.KILL; + public static readonly ID = TERMINAL_COMMAND_ID.KILL; public static readonly LABEL = nls.localize('workbench.action.terminal.kill', "Kill the Active Terminal Instance"); public static readonly PANEL_LABEL = nls.localize('workbench.action.terminal.kill.short', "Kill Terminal"); @@ -85,7 +85,7 @@ export class KillTerminalAction extends Action { export class QuickKillTerminalAction extends Action { - public static readonly ID = COMMAND_ID.QUICK_KILL; + public static readonly ID = TERMINAL_COMMAND_ID.QUICK_KILL; public static readonly LABEL = nls.localize('workbench.action.terminal.quickKill', "Kill Terminal Instance"); constructor( @@ -111,7 +111,7 @@ export class QuickKillTerminalAction extends Action { */ export class CopyTerminalSelectionAction extends Action { - public static readonly ID = COMMAND_ID.COPY_SELECTION; + public static readonly ID = TERMINAL_COMMAND_ID.COPY_SELECTION; public static readonly LABEL = nls.localize('workbench.action.terminal.copySelection', "Copy Selection"); constructor( @@ -132,7 +132,7 @@ export class CopyTerminalSelectionAction extends Action { export class SelectAllTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SELECT_ALL; + public static readonly ID = TERMINAL_COMMAND_ID.SELECT_ALL; public static readonly LABEL = nls.localize('workbench.action.terminal.selectAll', "Select All"); constructor( @@ -171,7 +171,7 @@ export abstract class BaseSendTextTerminalAction extends Action { } export class DeleteWordLeftTerminalAction extends BaseSendTextTerminalAction { - public static readonly ID = COMMAND_ID.DELETE_WORD_LEFT; + public static readonly ID = TERMINAL_COMMAND_ID.DELETE_WORD_LEFT; public static readonly LABEL = nls.localize('workbench.action.terminal.deleteWordLeft', "Delete Word Left"); constructor( @@ -185,7 +185,7 @@ export class DeleteWordLeftTerminalAction extends BaseSendTextTerminalAction { } export class DeleteWordRightTerminalAction extends BaseSendTextTerminalAction { - public static readonly ID = COMMAND_ID.DELETE_WORD_RIGHT; + public static readonly ID = TERMINAL_COMMAND_ID.DELETE_WORD_RIGHT; public static readonly LABEL = nls.localize('workbench.action.terminal.deleteWordRight', "Delete Word Right"); constructor( @@ -199,7 +199,7 @@ export class DeleteWordRightTerminalAction extends BaseSendTextTerminalAction { } export class MoveToLineStartTerminalAction extends BaseSendTextTerminalAction { - public static readonly ID = COMMAND_ID.MOVE_TO_LINE_START; + public static readonly ID = TERMINAL_COMMAND_ID.MOVE_TO_LINE_START; public static readonly LABEL = nls.localize('workbench.action.terminal.moveToLineStart', "Move To Line Start"); constructor( @@ -213,7 +213,7 @@ export class MoveToLineStartTerminalAction extends BaseSendTextTerminalAction { } export class MoveToLineEndTerminalAction extends BaseSendTextTerminalAction { - public static readonly ID = COMMAND_ID.MOVE_TO_LINE_END; + public static readonly ID = TERMINAL_COMMAND_ID.MOVE_TO_LINE_END; public static readonly LABEL = nls.localize('workbench.action.terminal.moveToLineEnd', "Move To Line End"); constructor( @@ -228,7 +228,7 @@ export class MoveToLineEndTerminalAction extends BaseSendTextTerminalAction { export class CreateNewTerminalAction extends Action { - public static readonly ID = COMMAND_ID.NEW; + public static readonly ID = TERMINAL_COMMAND_ID.NEW; public static readonly LABEL = nls.localize('workbench.action.terminal.new', "Create New Integrated Terminal"); public static readonly PANEL_LABEL = nls.localize('workbench.action.terminal.new.short', "New Terminal"); @@ -281,7 +281,7 @@ export class CreateNewTerminalAction extends Action { export class CreateNewInActiveWorkspaceTerminalAction extends Action { - public static readonly ID = COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE; + public static readonly ID = TERMINAL_COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE; public static readonly LABEL = nls.localize('workbench.action.terminal.newInActiveWorkspace', "Create New Integrated Terminal (In Active Workspace)"); constructor( @@ -302,7 +302,7 @@ export class CreateNewInActiveWorkspaceTerminalAction extends Action { } export class SplitTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SPLIT; + public static readonly ID = TERMINAL_COMMAND_ID.SPLIT; public static readonly LABEL = nls.localize('workbench.action.terminal.split', "Split Terminal"); constructor( @@ -348,7 +348,7 @@ export class SplitTerminalAction extends Action { } export class SplitInActiveWorkspaceTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE; + public static readonly ID = TERMINAL_COMMAND_ID.SPLIT_IN_ACTIVE_WORKSPACE; public static readonly LABEL = nls.localize('workbench.action.terminal.splitInActiveWorkspace', "Split Terminal (In Active Workspace)"); constructor( @@ -369,7 +369,7 @@ export class SplitInActiveWorkspaceTerminalAction extends Action { } export class FocusPreviousPaneTerminalAction extends Action { - public static readonly ID = COMMAND_ID.FOCUS_PREVIOUS_PANE; + public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_PREVIOUS_PANE; public static readonly LABEL = nls.localize('workbench.action.terminal.focusPreviousPane', "Focus Previous Pane"); constructor( @@ -390,7 +390,7 @@ export class FocusPreviousPaneTerminalAction extends Action { } export class FocusNextPaneTerminalAction extends Action { - public static readonly ID = COMMAND_ID.FOCUS_NEXT_PANE; + public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_NEXT_PANE; public static readonly LABEL = nls.localize('workbench.action.terminal.focusNextPane', "Focus Next Pane"); constructor( @@ -429,7 +429,7 @@ export abstract class BaseFocusDirectionTerminalAction extends Action { } export class ResizePaneLeftTerminalAction extends BaseFocusDirectionTerminalAction { - public static readonly ID = COMMAND_ID.RESIZE_PANE_LEFT; + public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_LEFT; public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneLeft', "Resize Pane Left"); constructor( @@ -441,7 +441,7 @@ export class ResizePaneLeftTerminalAction extends BaseFocusDirectionTerminalActi } export class ResizePaneRightTerminalAction extends BaseFocusDirectionTerminalAction { - public static readonly ID = COMMAND_ID.RESIZE_PANE_RIGHT; + public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_RIGHT; public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneRight', "Resize Pane Right"); constructor( @@ -453,7 +453,7 @@ export class ResizePaneRightTerminalAction extends BaseFocusDirectionTerminalAct } export class ResizePaneUpTerminalAction extends BaseFocusDirectionTerminalAction { - public static readonly ID = COMMAND_ID.RESIZE_PANE_UP; + public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_UP; public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneUp', "Resize Pane Up"); constructor( @@ -465,7 +465,7 @@ export class ResizePaneUpTerminalAction extends BaseFocusDirectionTerminalAction } export class ResizePaneDownTerminalAction extends BaseFocusDirectionTerminalAction { - public static readonly ID = COMMAND_ID.RESIZE_PANE_DOWN; + public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_DOWN; public static readonly LABEL = nls.localize('workbench.action.terminal.resizePaneDown', "Resize Pane Down"); constructor( @@ -478,7 +478,7 @@ export class ResizePaneDownTerminalAction extends BaseFocusDirectionTerminalActi export class FocusActiveTerminalAction extends Action { - public static readonly ID = COMMAND_ID.FOCUS; + public static readonly ID = TERMINAL_COMMAND_ID.FOCUS; public static readonly LABEL = nls.localize('workbench.action.terminal.focus', "Focus Terminal"); constructor( @@ -500,7 +500,7 @@ export class FocusActiveTerminalAction extends Action { export class FocusNextTerminalAction extends Action { - public static readonly ID = COMMAND_ID.FOCUS_NEXT; + public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_NEXT; public static readonly LABEL = nls.localize('workbench.action.terminal.focusNext', "Focus Next Terminal"); constructor( @@ -518,7 +518,7 @@ export class FocusNextTerminalAction extends Action { export class FocusPreviousTerminalAction extends Action { - public static readonly ID = COMMAND_ID.FOCUS_PREVIOUS; + public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_PREVIOUS; public static readonly LABEL = nls.localize('workbench.action.terminal.focusPrevious', "Focus Previous Terminal"); constructor( @@ -536,7 +536,7 @@ export class FocusPreviousTerminalAction extends Action { export class TerminalPasteAction extends Action { - public static readonly ID = COMMAND_ID.PASTE; + public static readonly ID = TERMINAL_COMMAND_ID.PASTE; public static readonly LABEL = nls.localize('workbench.action.terminal.paste', "Paste into Active Terminal"); constructor( @@ -557,7 +557,7 @@ export class TerminalPasteAction extends Action { export class SelectDefaultShellWindowsTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SELECT_DEFAULT_SHELL; + public static readonly ID = TERMINAL_COMMAND_ID.SELECT_DEFAULT_SHELL; public static readonly LABEL = nls.localize('workbench.action.terminal.selectDefaultShell', "Select Default Shell"); constructor( @@ -574,7 +574,7 @@ export class SelectDefaultShellWindowsTerminalAction extends Action { export class RunSelectedTextInTerminalAction extends Action { - public static readonly ID = COMMAND_ID.RUN_SELECTED_TEXT; + public static readonly ID = TERMINAL_COMMAND_ID.RUN_SELECTED_TEXT; public static readonly LABEL = nls.localize('workbench.action.terminal.runSelectedText', "Run Selected Text In Active Terminal"); constructor( @@ -609,7 +609,7 @@ export class RunSelectedTextInTerminalAction extends Action { export class RunActiveFileInTerminalAction extends Action { - public static readonly ID = COMMAND_ID.RUN_ACTIVE_FILE; + public static readonly ID = TERMINAL_COMMAND_ID.RUN_ACTIVE_FILE; public static readonly LABEL = nls.localize('workbench.action.terminal.runActiveFile', "Run Active File In Active Terminal"); constructor( @@ -642,7 +642,7 @@ export class RunActiveFileInTerminalAction extends Action { export class SwitchTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SWITCH_TERMINAL; + public static readonly ID = TERMINAL_COMMAND_ID.SWITCH_TERMINAL; public static readonly LABEL = nls.localize('workbench.action.terminal.switchTerminal', "Switch Terminal"); constructor( @@ -685,7 +685,7 @@ export class SwitchTerminalActionItem extends SelectActionItem { export class ScrollDownTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_DOWN_LINE; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_DOWN_LINE; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollDown', "Scroll Down (Line)"); constructor( @@ -706,7 +706,7 @@ export class ScrollDownTerminalAction extends Action { export class ScrollDownPageTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_DOWN_PAGE; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_DOWN_PAGE; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollDownPage', "Scroll Down (Page)"); constructor( @@ -727,7 +727,7 @@ export class ScrollDownPageTerminalAction extends Action { export class ScrollToBottomTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_TO_BOTTOM; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_BOTTOM; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToBottom', "Scroll to Bottom"); constructor( @@ -748,7 +748,7 @@ export class ScrollToBottomTerminalAction extends Action { export class ScrollUpTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_UP_LINE; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_UP_LINE; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollUp', "Scroll Up (Line)"); constructor( @@ -769,7 +769,7 @@ export class ScrollUpTerminalAction extends Action { export class ScrollUpPageTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_UP_PAGE; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_UP_PAGE; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollUpPage', "Scroll Up (Page)"); constructor( @@ -790,7 +790,7 @@ export class ScrollUpPageTerminalAction extends Action { export class ScrollToTopTerminalAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_TO_TOP; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_TOP; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToTop', "Scroll to Top"); constructor( @@ -811,7 +811,7 @@ export class ScrollToTopTerminalAction extends Action { export class ClearTerminalAction extends Action { - public static readonly ID = COMMAND_ID.CLEAR; + public static readonly ID = TERMINAL_COMMAND_ID.CLEAR; public static readonly LABEL = nls.localize('workbench.action.terminal.clear', "Clear"); constructor( @@ -832,7 +832,7 @@ export class ClearTerminalAction extends Action { export class ClearSelectionTerminalAction extends Action { - public static readonly ID = COMMAND_ID.CLEAR_SELECTION; + public static readonly ID = TERMINAL_COMMAND_ID.CLEAR_SELECTION; public static readonly LABEL = nls.localize('workbench.action.terminal.clearSelection', "Clear Selection"); constructor( @@ -853,7 +853,7 @@ export class ClearSelectionTerminalAction extends Action { export class AllowWorkspaceShellTerminalCommand extends Action { - public static readonly ID = COMMAND_ID.WORKSPACE_SHELL_ALLOW; + public static readonly ID = TERMINAL_COMMAND_ID.WORKSPACE_SHELL_ALLOW; public static readonly LABEL = nls.localize('workbench.action.terminal.allowWorkspaceShell', "Allow Workspace Shell Configuration"); constructor( @@ -871,7 +871,7 @@ export class AllowWorkspaceShellTerminalCommand extends Action { export class DisallowWorkspaceShellTerminalCommand extends Action { - public static readonly ID = COMMAND_ID.WORKSPACE_SHELL_DISALLOW; + public static readonly ID = TERMINAL_COMMAND_ID.WORKSPACE_SHELL_DISALLOW; public static readonly LABEL = nls.localize('workbench.action.terminal.disallowWorkspaceShell', "Disallow Workspace Shell Configuration"); constructor( @@ -889,7 +889,7 @@ export class DisallowWorkspaceShellTerminalCommand extends Action { export class RenameTerminalAction extends Action { - public static readonly ID = COMMAND_ID.RENAME; + public static readonly ID = TERMINAL_COMMAND_ID.RENAME; public static readonly LABEL = nls.localize('workbench.action.terminal.rename', "Rename"); constructor( @@ -919,7 +919,7 @@ export class RenameTerminalAction extends Action { export class FocusTerminalFindWidgetAction extends Action { - public static readonly ID = COMMAND_ID.FIND_WIDGET_FOCUS; + public static readonly ID = TERMINAL_COMMAND_ID.FIND_WIDGET_FOCUS; public static readonly LABEL = nls.localize('workbench.action.terminal.focusFindWidget', "Focus Find Widget"); constructor( @@ -936,7 +936,7 @@ export class FocusTerminalFindWidgetAction extends Action { export class HideTerminalFindWidgetAction extends Action { - public static readonly ID = COMMAND_ID.FIND_WIDGET_HIDE; + public static readonly ID = TERMINAL_COMMAND_ID.FIND_WIDGET_HIDE; public static readonly LABEL = nls.localize('workbench.action.terminal.hideFindWidget', "Hide Find Widget"); constructor( @@ -975,7 +975,7 @@ export class QuickOpenActionTermContributor extends ActionBarContributor { export class QuickOpenTermAction extends Action { - public static readonly ID = COMMAND_ID.QUICK_OPEN_TERM; + public static readonly ID = TERMINAL_COMMAND_ID.QUICK_OPEN_TERM; public static readonly LABEL = nls.localize('quickOpenTerm', "Switch Active Terminal"); constructor( @@ -1014,7 +1014,7 @@ export class RenameTerminalQuickOpenAction extends RenameTerminalAction { } export class ScrollToPreviousCommandAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_PREVIOUS_COMMAND; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToPreviousCommand', "Scroll To Previous Command"); constructor( @@ -1035,7 +1035,7 @@ export class ScrollToPreviousCommandAction extends Action { } export class ScrollToNextCommandAction extends Action { - public static readonly ID = COMMAND_ID.SCROLL_TO_NEXT_COMMAND; + public static readonly ID = TERMINAL_COMMAND_ID.SCROLL_TO_NEXT_COMMAND; public static readonly LABEL = nls.localize('workbench.action.terminal.scrollToNextCommand', "Scroll To Next Command"); constructor( @@ -1056,7 +1056,7 @@ export class ScrollToNextCommandAction extends Action { } export class SelectToPreviousCommandAction extends Action { - public static readonly ID = COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND; + public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_COMMAND; public static readonly LABEL = nls.localize('workbench.action.terminal.selectToPreviousCommand', "Select To Previous Command"); constructor( @@ -1077,7 +1077,7 @@ export class SelectToPreviousCommandAction extends Action { } export class SelectToNextCommandAction extends Action { - public static readonly ID = COMMAND_ID.SELECT_TO_NEXT_COMMAND; + public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_NEXT_COMMAND; public static readonly LABEL = nls.localize('workbench.action.terminal.selectToNextCommand', "Select To Next Command"); constructor( @@ -1098,7 +1098,7 @@ export class SelectToNextCommandAction extends Action { } export class SelectToPreviousLineAction extends Action { - public static readonly ID = COMMAND_ID.SELECT_TO_PREVIOUS_LINE; + public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_PREVIOUS_LINE; public static readonly LABEL = nls.localize('workbench.action.terminal.selectToPreviousLine', "Select To Previous Line"); constructor( @@ -1119,7 +1119,7 @@ export class SelectToPreviousLineAction extends Action { } export class SelectToNextLineAction extends Action { - public static readonly ID = COMMAND_ID.SELECT_TO_NEXT_LINE; + public static readonly ID = TERMINAL_COMMAND_ID.SELECT_TO_NEXT_LINE; public static readonly LABEL = nls.localize('workbench.action.terminal.selectToNextLine', "Select To Next Line"); constructor( diff --git a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts index a1d1f280b4aba44b23d803468b162e79bfaf6aed..0c2214ba8ef3f342dae6a03da98479142a16c97a 100644 --- a/src/vs/workbench/parts/watermark/electron-browser/watermark.ts +++ b/src/vs/workbench/parts/watermark/electron-browser/watermark.ts @@ -26,7 +26,7 @@ import { StartAction } from 'vs/workbench/parts/debug/browser/debugActions'; import { FindInFilesActionId } from 'vs/workbench/parts/search/common/constants'; import { escape } from 'vs/base/common/strings'; import { QUICKOPEN_ACTION_ID } from 'vs/workbench/browser/parts/quickopen/quickopen'; -import { COMMAND_ID as TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; +import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands'; interface WatermarkEntry { text: string;