development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert remaining actions not used by views/menus

Browse source
This commit is contained in:
Daniel Imms 2020-04-09 16:16:14 -07:00
parent 98f35f8a39
commit d1615c969b
2 changed files with 194 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
View file

@ -19,7 +19,7 @@ import * as panel from 'vs/workbench/browser/panel';
import { getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
import { Extensions as ActionExtensions, IWorkbenchActionRegistry } from 'vs/workbench/common/actions';
import { Extensions as ViewContainerExtensions, IViewContainersRegistry, ViewContainerLocation, IViewsRegistry } from 'vs/workbench/common/views';
import { registerTerminalActions, ClearTerminalAction, CopyTerminalSelectionAction, CreateNewInActiveWorkspaceTerminalAction, CreateNewTerminalAction, FocusActiveTerminalAction, FocusNextPaneTerminalAction, FocusNextTerminalAction, FocusPreviousPaneTerminalAction, FocusPreviousTerminalAction, KillTerminalAction, ResizePaneDownTerminalAction, ResizePaneLeftTerminalAction, ResizePaneRightTerminalAction, ResizePaneUpTerminalAction, SelectAllTerminalAction, SelectDefaultShellWindowsTerminalAction, SplitInActiveWorkspaceTerminalAction, SplitTerminalAction, TerminalPasteAction, ToggleTerminalAction, terminalSendSequenceCommand } from 'vs/workbench/contrib/terminal/browser/terminalActions';
import { registerTerminalActions, ClearTerminalAction, CopyTerminalSelectionAction, CreateNewTerminalAction, KillTerminalAction, SelectAllTerminalAction, SelectDefaultShellWindowsTerminalAction, SplitInActiveWorkspaceTerminalAction, SplitTerminalAction, TerminalPasteAction, ToggleTerminalAction, terminalSendSequenceCommand } from 'vs/workbench/contrib/terminal/browser/terminalActions';
import { TerminalViewPane } from 'vs/workbench/contrib/terminal/browser/terminalView';
import { KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE_KEY, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED, TERMINAL_VIEW_ID, TERMINAL_ACTION_CATEGORY, TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/terminal';
import { registerColors } from 'vs/workbench/contrib/terminal/common/terminalColorRegistry';
@ -84,16 +84,13 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
// Register actions
const actionRegistry = Registry.as<IWorkbenchActionRegistry>(ActionExtensions.WorkbenchActions);
registerTerminalActions();
const category = TERMINAL_ACTION_CATEGORY;
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(KillTerminalAction, KillTerminalAction.ID, KillTerminalAction.LABEL), 'Terminal: Kill the Active Terminal Instance', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(CreateNewTerminalAction, CreateNewTerminalAction.ID, CreateNewTerminalAction.LABEL, {
primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKTICK,
mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.US_BACKTICK }
}), 'Terminal: Create New Integrated Terminal', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(CreateNewInActiveWorkspaceTerminalAction, CreateNewInActiveWorkspaceTerminalAction.ID, CreateNewInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Create New Integrated Terminal (In Active Workspace)', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(FocusActiveTerminalAction, FocusActiveTerminalAction.ID, FocusActiveTerminalAction.LABEL), 'Terminal: Focus Terminal', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(FocusNextTerminalAction, FocusNextTerminalAction.ID, FocusNextTerminalAction.LABEL), 'Terminal: Focus Next Terminal', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(FocusPreviousTerminalAction, FocusPreviousTerminalAction.ID, FocusPreviousTerminalAction.LABEL), 'Terminal: Focus Previous Terminal', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(SelectAllTerminalAction, SelectAllTerminalAction.ID, SelectAllTerminalAction.LABEL, {
// Don't use ctrl+a by default as that would override the common go to start
// of prompt shell binding
@ -122,42 +119,6 @@ actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(SplitTerminal
}
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Split Terminal', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(SplitInActiveWorkspaceTerminalAction, SplitInActiveWorkspaceTerminalAction.ID, SplitInActiveWorkspaceTerminalAction.LABEL), 'Terminal: Split Terminal (In Active Workspace)', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(FocusPreviousPaneTerminalAction, FocusPreviousPaneTerminalAction.ID, FocusPreviousPaneTerminalAction.LABEL, {
primary: KeyMod.Alt | KeyCode.LeftArrow,
secondary: [KeyMod.Alt | KeyCode.UpArrow],
mac: {
primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.LeftArrow,
secondary: [KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.UpArrow]
}
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Focus Previous Pane', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(FocusNextPaneTerminalAction, FocusNextPaneTerminalAction.ID, FocusNextPaneTerminalAction.LABEL, {
primary: KeyMod.Alt | KeyCode.RightArrow,
secondary: [KeyMod.Alt | KeyCode.DownArrow],
mac: {
primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.RightArrow,
secondary: [KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.DownArrow]
}
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Focus Next Pane', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(ResizePaneLeftTerminalAction, ResizePaneLeftTerminalAction.ID, ResizePaneLeftTerminalAction.LABEL, {
primary: 0,
linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow },
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.LeftArrow }
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Left', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(ResizePaneRightTerminalAction, ResizePaneRightTerminalAction.ID, ResizePaneRightTerminalAction.LABEL, {
primary: 0,
linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow },
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.RightArrow }
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Right', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(ResizePaneUpTerminalAction, ResizePaneUpTerminalAction.ID, ResizePaneUpTerminalAction.LABEL, {
primary: 0,
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.UpArrow }
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Up', category);
actionRegistry.registerWorkbenchAction(SyncActionDescriptor.create(ResizePaneDownTerminalAction, ResizePaneDownTerminalAction.ID, ResizePaneDownTerminalAction.LABEL, {
primary: 0,
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.DownArrow }
}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Resize Pane Down', category);
registerTerminalActions();
// Commands might be affected by Web restrictons
if (BrowserFeatures.clipboard.writeText) {

368
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
View file

@ -220,28 +220,6 @@ export class CreateNewTerminalAction extends Action {
}
}
export class CreateNewInActiveWorkspaceTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE;
public static readonly LABEL = localize('workbench.action.terminal.newInActiveWorkspace', "Create New Integrated Terminal (In Active Workspace)");
constructor(
id: string, label: string,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
const instance = this._terminalService.createTerminal(undefined);
if (!instance) {
return;
}
this._terminalService.setActiveInstance(instance);
await this._terminalService.showPanel(true);
}
}
export class SplitTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.SPLIT;
public static readonly LABEL = localize('workbench.action.terminal.split', "Split Terminal");
@ -290,160 +268,6 @@ export class SplitInActiveWorkspaceTerminalAction extends Action {
}
}
export class FocusPreviousPaneTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_PREVIOUS_PANE;
public static readonly LABEL = localize('workbench.action.terminal.focusPreviousPane', "Focus Previous Pane");
constructor(
id: string, label: string,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
this._terminalService.getActiveTab()?.focusPreviousPane();
await this._terminalService.showPanel(true);
}
}
export class FocusNextPaneTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_NEXT_PANE;
public static readonly LABEL = localize('workbench.action.terminal.focusNextPane', "Focus Next Pane");
constructor(
id: string, label: string,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
this._terminalService.getActiveTab()?.focusNextPane();
await this._terminalService.showPanel(true);
}
}
export abstract class BaseFocusDirectionTerminalAction extends Action {
constructor(
id: string, label: string,
private _direction: Direction,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
this._terminalService.getActiveTab()?.resizePane(this._direction);
}
}
export class ResizePaneLeftTerminalAction extends BaseFocusDirectionTerminalAction {
public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_LEFT;
public static readonly LABEL = localize('workbench.action.terminal.resizePaneLeft', "Resize Pane Left");
constructor(
id: string, label: string,
@ITerminalService readonly terminalService: ITerminalService
) {
super(id, label, Direction.Left, terminalService);
}
}
export class ResizePaneRightTerminalAction extends BaseFocusDirectionTerminalAction {
public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_RIGHT;
public static readonly LABEL = localize('workbench.action.terminal.resizePaneRight', "Resize Pane Right");
constructor(
id: string, label: string,
@ITerminalService readonly terminalService: ITerminalService
) {
super(id, label, Direction.Right, terminalService);
}
}
export class ResizePaneUpTerminalAction extends BaseFocusDirectionTerminalAction {
public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_UP;
public static readonly LABEL = localize('workbench.action.terminal.resizePaneUp', "Resize Pane Up");
constructor(
id: string, label: string,
@ITerminalService readonly terminalService: ITerminalService
) {
super(id, label, Direction.Up, terminalService);
}
}
export class ResizePaneDownTerminalAction extends BaseFocusDirectionTerminalAction {
public static readonly ID = TERMINAL_COMMAND_ID.RESIZE_PANE_DOWN;
public static readonly LABEL = localize('workbench.action.terminal.resizePaneDown', "Resize Pane Down");
constructor(
id: string, label: string,
@ITerminalService readonly terminalService: ITerminalService
) {
super(id, label, Direction.Down, terminalService);
}
}
export class FocusActiveTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.FOCUS;
public static readonly LABEL = localize('workbench.action.terminal.focus', "Focus Terminal");
constructor(
id: string, label: string,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
const instance = this._terminalService.getActiveOrCreateInstance();
if (!instance) {
return;
}
this._terminalService.setActiveInstance(instance);
return this._terminalService.showPanel(true);
}
}
export class FocusNextTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_NEXT;
public static readonly LABEL = localize('workbench.action.terminal.focusNext', "Focus Next Terminal");
constructor(
id: string, label: string,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
this._terminalService.setActiveTabToNext();
await this._terminalService.showPanel(true);
}
}
export class FocusPreviousTerminalAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.FOCUS_PREVIOUS;
public static readonly LABEL = localize('workbench.action.terminal.focusPrevious', "Focus Previous Terminal");
constructor(
id: string, label: string,
@ITerminalService private readonly _terminalService: ITerminalService
) {
super(id, label);
}
async run() {
this._terminalService.setActiveTabToPrevious();
await this._terminalService.showPanel(true);
}
}
export class TerminalPasteAction extends Action {
public static readonly ID = TERMINAL_COMMAND_ID.PASTE;
@ -571,6 +395,198 @@ export class ClearTerminalAction extends Action {
export function registerTerminalActions() {
const category = TERMINAL_ACTION_CATEGORY;
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.NEW_IN_ACTIVE_WORKSPACE,
title: localize('workbench.action.terminal.newInActiveWorkspace', "Create New Integrated Terminal (In Active Workspace)"),
f1: true,
category
});
}
async run(accessor: ServicesAccessor) {
const terminalService = accessor.get(ITerminalService);
const instance = terminalService.createTerminal(undefined);
if (!instance) {
return;
}
terminalService.setActiveInstance(instance);
await terminalService.showPanel(true);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.FOCUS_PREVIOUS_PANE,
title: localize('workbench.action.terminal.focusPreviousPane', "Focus Previous Pane"),
f1: true,
category,
keybinding: {
primary: KeyMod.Alt | KeyCode.LeftArrow,
secondary: [KeyMod.Alt | KeyCode.UpArrow],
mac: {
primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.LeftArrow,
secondary: [KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.UpArrow]
},
when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
weight: KeybindingWeight.WorkbenchContrib
}
});
}
async run(accessor: ServicesAccessor) {
const terminalService = accessor.get(ITerminalService);
terminalService.getActiveTab()?.focusPreviousPane();
await terminalService.showPanel(true);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.FOCUS_NEXT_PANE,
title: localize('workbench.action.terminal.focusNextPane', "Focus Next Pane"),
f1: true,
category,
keybinding: {
primary: KeyMod.Alt | KeyCode.RightArrow,
secondary: [KeyMod.Alt | KeyCode.DownArrow],
mac: {
primary: KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.RightArrow,
secondary: [KeyMod.Alt | KeyMod.CtrlCmd | KeyCode.DownArrow]
},
when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
weight: KeybindingWeight.WorkbenchContrib
}
});
}
async run(accessor: ServicesAccessor) {
const terminalService = accessor.get(ITerminalService);
terminalService.getActiveTab()?.focusNextPane();
await terminalService.showPanel(true);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.RESIZE_PANE_LEFT,
title: localize('workbench.action.terminal.resizePaneLeft', "Resize Pane Left"),
f1: true,
category,
keybinding: {
linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow },
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.LeftArrow },
when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
weight: KeybindingWeight.WorkbenchContrib
}
});
}
async run(accessor: ServicesAccessor) {
accessor.get(ITerminalService).getActiveTab()?.resizePane(Direction.Left);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.RESIZE_PANE_RIGHT,
title: localize('workbench.action.terminal.resizePaneRight', "Resize Pane Right"),
f1: true,
category,
keybinding: {
linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow },
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.RightArrow },
when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
weight: KeybindingWeight.WorkbenchContrib
}
});
}
async run(accessor: ServicesAccessor) {
accessor.get(ITerminalService).getActiveTab()?.resizePane(Direction.Right);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.RESIZE_PANE_UP,
title: localize('workbench.action.terminal.resizePaneUp', "Resize Pane Up"),
f1: true,
category,
keybinding: {
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.UpArrow },
when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
weight: KeybindingWeight.WorkbenchContrib
}
});
}
async run(accessor: ServicesAccessor) {
accessor.get(ITerminalService).getActiveTab()?.resizePane(Direction.Up);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.RESIZE_PANE_DOWN,
title: localize('workbench.action.terminal.resizePaneDown', "Resize Pane Down"),
f1: true,
category,
keybinding: {
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.DownArrow },
when: KEYBINDING_CONTEXT_TERMINAL_FOCUS,
weight: KeybindingWeight.WorkbenchContrib
}
});
}
async run(accessor: ServicesAccessor) {
accessor.get(ITerminalService).getActiveTab()?.resizePane(Direction.Down);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.FOCUS,
title: localize('workbench.action.terminal.focus', "Focus Terminal"),
f1: true,
category
});
}
async run(accessor: ServicesAccessor) {
const terminalService = accessor.get(ITerminalService);
const instance = terminalService.getActiveOrCreateInstance();
if (!instance) {
return;
}
terminalService.setActiveInstance(instance);
return terminalService.showPanel(true);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.FOCUS_NEXT,
title: localize('workbench.action.terminal.focusNext', "Focus Next Terminal"),
f1: true,
category
});
}
async run(accessor: ServicesAccessor) {
const terminalService = accessor.get(ITerminalService);
terminalService.setActiveTabToNext();
await terminalService.showPanel(true);
}
});
registerAction2(class extends Action2 {
constructor() {
super({
id: TERMINAL_COMMAND_ID.FOCUS_PREVIOUS,
title: localize('workbench.action.terminal.focusPrevious', "Focus Previous Terminal"),
f1: true,
category
});
}
async run(accessor: ServicesAccessor) {
const terminalService = accessor.get(ITerminalService);
terminalService.setActiveTabToPrevious();
await terminalService.showPanel(true);
}
});
registerAction2(class extends Action2 {
constructor() {
super({