Skip to content

Commit 5401800

Browse files
benibenjbenibenj
authored
Remove un/maximize editor group commands (microsoft#196732)
Refactor editor commands and actions
1 parent e837c3b commit 5401800

File tree

3 files changed

+20
-57
lines changed

3 files changed

+20
-57
lines changed

‎src/vs/workbench/browser/parts/editor/editor.contribution.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
2727
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
2828
import {
2929
CloseEditorsInOtherGroupsAction, CloseAllEditorsAction, MoveGroupLeftAction, MoveGroupRightAction, SplitEditorAction, JoinTwoGroupsAction, RevertAndCloseEditorAction,
30-
NavigateBetweenGroupsAction, FocusActiveGroupAction, FocusFirstGroupAction, ResetGroupSizesAction, MaximizeGroupAction, MinimizeOtherGroupsAction, FocusPreviousGroup, FocusNextGroup,
30+
NavigateBetweenGroupsAction, FocusActiveGroupAction, FocusFirstGroupAction, ResetGroupSizesAction, MinimizeOtherGroupsAction, FocusPreviousGroup, FocusNextGroup,
3131
CloseLeftEditorsInGroupAction, OpenNextEditor, OpenPreviousEditor, NavigateBackwardsAction, NavigateForwardAction, NavigatePreviousAction, ReopenClosedEditorAction,
3232
QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, ShowAllEditorsByAppearanceAction, ClearEditorHistoryAction, MoveEditorRightInGroupAction, OpenNextEditorInGroup,
3333
OpenPreviousEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, MoveEditorToPreviousGroupAction,
@@ -41,13 +41,13 @@ import {
4141
ReOpenInTextEditorAction, DuplicateGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, ToggleEditorTypeAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction,
4242
SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToNextGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToRightGroupAction, NavigateForwardInEditsAction,
4343
NavigateBackwardsInEditsAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigatePreviousInEditsAction, NavigateToLastNavigationLocationAction,
44-
MaximizeGroupHideSidebarAction, UnmaximizeEditorGroupAction, ExperimentalMoveEditorIntoNewWindowAction, ToggleMaximizeEditorGroupAction
44+
MaximizeGroupHideSidebarAction, ExperimentalMoveEditorIntoNewWindowAction, ToggleMaximizeEditorGroupAction
4545
} from 'vs/workbench/browser/parts/editor/editorActions';
4646
import {
4747
CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
4848
CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT,
4949
SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, TOGGLE_KEEP_EDITORS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, setup as registerEditorCommands, REOPEN_WITH_COMMAND_ID,
50-
TOGGLE_LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, SPLIT_EDITOR, MAXIMIZE_EDITOR_GROUP, UNMAXIMIZE_EDITOR_GROUP
50+
TOGGLE_LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP,
5151
} from 'vs/workbench/browser/parts/editor/editorCommands';
5252
import { inQuickPickContext, getQuickNavigateHandler } from 'vs/workbench/browser/quickaccess';
5353
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -214,9 +214,7 @@ registerAction2(NavigateBetweenGroupsAction);
214214

215215
registerAction2(ResetGroupSizesAction);
216216
registerAction2(ToggleGroupSizesAction);
217-
registerAction2(MaximizeGroupAction);
218217
registerAction2(MaximizeGroupHideSidebarAction);
219-
registerAction2(UnmaximizeEditorGroupAction);
220218
registerAction2(ToggleMaximizeEditorGroupAction);
221219
registerAction2(MinimizeOtherGroupsAction);
222220

@@ -386,8 +384,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: SHOW_EDITORS_IN
386384
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: localize('closeAll', "Close All") }, group: '5_close', order: 10 });
387385
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: localize('closeAllSaved', "Close Saved") }, group: '5_close', order: 20 });
388386
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_KEEP_EDITORS_COMMAND_ID, title: localize('togglePreviewMode', "Enable Preview Editors"), toggled: ContextKeyExpr.has('config.workbench.editor.enablePreview') }, group: '7_settings', order: 10 });
389-
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: MAXIMIZE_EDITOR_GROUP, title: localize('maximizeGroup', "Maximize Group") }, group: '8_group_operations', order: 5, when: ContextKeyExpr.and(MaximizedEditorGroupContext.negate(), MultipleEditorGroupsContext) });
390-
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: UNMAXIMIZE_EDITOR_GROUP, title: localize('unmaximizeGroup', "Unmaximize Group") }, group: '8_group_operations', order: 5, when: MaximizedEditorGroupContext });
387+
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_MAXIMIZE_EDITOR_GROUP, title: localize('maximizeGroup', "Maximize Group") }, group: '8_group_operations', order: 5, when: ContextKeyExpr.and(MaximizedEditorGroupContext.negate(), MultipleEditorGroupsContext) });
388+
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_MAXIMIZE_EDITOR_GROUP, title: localize('unmaximizeGroup', "Unmaximize Group") }, group: '8_group_operations', order: 5, when: MaximizedEditorGroupContext });
391389
MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_LOCK_GROUP_COMMAND_ID, title: localize('lockGroup', "Lock Group"), toggled: ActiveEditorGroupLockedContext }, group: '8_group_operations', order: 10, when: MultipleEditorGroupsContext });
392390

393391
function appendEditorToolItem(primary: ICommandAction, when: ContextKeyExpression | undefined, order: number, alternative?: ICommandAction, precondition?: ContextKeyExpression | undefined): void {

‎src/vs/workbench/browser/parts/editor/editorActions.ts

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/bro
1313
import { GoFilter, IHistoryService } from 'vs/workbench/services/history/common/history';
1414
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
1515
import { ICommandService } from 'vs/platform/commands/common/commands';
16-
import { CLOSE_EDITOR_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, ActiveEditorMoveCopyArguments, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, splitEditor, LAYOUT_EDITOR_GROUPS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, SPLIT_EDITOR, UNMAXIMIZE_EDITOR_GROUP, MAXIMIZE_EDITOR_GROUP, resolveCommandsContext, getCommandsContext, TOGGLE_MAXIMIZE_EDITOR_GROUP } from 'vs/workbench/browser/parts/editor/editorCommands';
16+
import { CLOSE_EDITOR_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, ActiveEditorMoveCopyArguments, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, splitEditor, LAYOUT_EDITOR_GROUPS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, SPLIT_EDITOR, resolveCommandsContext, getCommandsContext, TOGGLE_MAXIMIZE_EDITOR_GROUP } from 'vs/workbench/browser/parts/editor/editorCommands';
1717
import { IEditorGroupsService, IEditorGroup, GroupsArrangement, GroupLocation, GroupDirection, preferredSideBySideGroupDirection, IFindGroupScope, GroupOrientation, EditorGroupLayout, GroupsOrder } from 'vs/workbench/services/editor/common/editorGroupsService';
1818
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
1919
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -1064,23 +1064,6 @@ export class ToggleGroupSizesAction extends Action2 {
10641064
}
10651065
}
10661066

1067-
export class MaximizeGroupAction extends Action2 {
1068-
1069-
constructor() {
1070-
super({
1071-
id: MAXIMIZE_EDITOR_GROUP,
1072-
title: { value: localize('maximizeEditor', "Maximize Editor Group"), original: 'Maximize Editor Group' },
1073-
category: Categories.View,
1074-
precondition: ContextKeyExpr.and(MaximizedEditorGroupContext.negate(), MultipleEditorGroupsContext)
1075-
});
1076-
}
1077-
1078-
override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
1079-
const editorsGroupService = accessor.get(IEditorGroupsService);
1080-
const { group } = resolveCommandsContext(editorsGroupService, getCommandsContext(resourceOrContext, context));
1081-
editorsGroupService.arrangeGroups(GroupsArrangement.MAXIMIZE, group);
1082-
}
1083-
}
10841067

10851068
export class MaximizeGroupHideSidebarAction extends Action2 {
10861069

@@ -1107,14 +1090,19 @@ export class MaximizeGroupHideSidebarAction extends Action2 {
11071090
}
11081091
}
11091092

1110-
export class UnmaximizeEditorGroupAction extends Action2 {
1093+
export class ToggleMaximizeEditorGroupAction extends Action2 {
11111094

11121095
constructor() {
11131096
super({
1114-
id: UNMAXIMIZE_EDITOR_GROUP,
1115-
title: { value: localize('UnmaximizeEditorGroup', "Unmaximize Editor Group"), original: 'Unmaximize Editor Group' },
1097+
id: TOGGLE_MAXIMIZE_EDITOR_GROUP,
1098+
title: { value: localize('toggleMaximizeEditorGroup', "Toggle Maximize Editor Group"), original: 'Toggle Maximize Editor Group' },
1099+
f1: true,
11161100
category: Categories.View,
1117-
precondition: MaximizedEditorGroupContext,
1101+
precondition: ContextKeyExpr.or(MultipleEditorGroupsContext, MaximizedEditorGroupContext),
1102+
keybinding: {
1103+
weight: KeybindingWeight.WorkbenchContrib,
1104+
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyM),
1105+
},
11181106
menu: [{
11191107
id: MenuId.EditorTitle,
11201108
order: -10000, // towards the front
@@ -1132,31 +1120,10 @@ export class UnmaximizeEditorGroupAction extends Action2 {
11321120
});
11331121
}
11341122

1135-
override async run(accessor: ServicesAccessor): Promise<void> {
1136-
const editorGroupService = accessor.get(IEditorGroupsService);
1137-
editorGroupService.toggleMaximizeGroup();
1138-
}
1139-
}
1140-
1141-
export class ToggleMaximizeEditorGroupAction extends Action2 {
1142-
1143-
constructor() {
1144-
super({
1145-
id: TOGGLE_MAXIMIZE_EDITOR_GROUP,
1146-
title: { value: localize('toggleMaximizeEditorGroup', "Toggle Maximize Editor Group"), original: 'Toggle Maximize Editor Group' },
1147-
f1: true,
1148-
category: Categories.View,
1149-
precondition: ContextKeyExpr.or(MultipleEditorGroupsContext, MaximizedEditorGroupContext),
1150-
keybinding: {
1151-
weight: KeybindingWeight.WorkbenchContrib,
1152-
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyM),
1153-
}
1154-
});
1155-
}
1156-
1157-
override async run(accessor: ServicesAccessor): Promise<void> {
1158-
const editorGroupService = accessor.get(IEditorGroupsService);
1159-
editorGroupService.toggleMaximizeGroup();
1123+
override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
1124+
const editorGroupsService = accessor.get(IEditorGroupsService);
1125+
const { group } = resolveCommandsContext(editorGroupsService, getCommandsContext(resourceOrContext, context));
1126+
editorGroupsService.toggleMaximizeGroup(group);
11601127
}
11611128
}
11621129

‎src/vs/workbench/browser/parts/editor/editorCommands.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ export const SPLIT_EDITOR_DOWN = 'workbench.action.splitEditorDown';
8080
export const SPLIT_EDITOR_LEFT = 'workbench.action.splitEditorLeft';
8181
export const SPLIT_EDITOR_RIGHT = 'workbench.action.splitEditorRight';
8282

83-
export const MAXIMIZE_EDITOR_GROUP = 'workbench.action.maximizeEditorGroup';
84-
export const UNMAXIMIZE_EDITOR_GROUP = 'workbench.action.unmaximizeEditorGroup';
8583
export const TOGGLE_MAXIMIZE_EDITOR_GROUP = 'workbench.action.toggleMaximizeEditorGroup';
8684

8785
export const SPLIT_EDITOR_IN_GROUP = 'workbench.action.splitEditorInGroup';
@@ -109,7 +107,7 @@ export const EDITOR_CORE_NAVIGATION_COMMANDS = [
109107
CLOSE_EDITOR_COMMAND_ID,
110108
UNPIN_EDITOR_COMMAND_ID,
111109
UNLOCK_GROUP_COMMAND_ID,
112-
UNMAXIMIZE_EDITOR_GROUP
110+
TOGGLE_MAXIMIZE_EDITOR_GROUP
113111
];
114112

115113
export interface ActiveEditorMoveCopyArguments {

0 commit comments

Comments
 (0)