Skip to content

Commit

Permalink
Fix split editor inactive group action (#212837)
Browse files Browse the repository at this point in the history 
* Fix split editor inactive group action

* fix getCommandsContext
  • Loading branch information
@benibenj
benibenj authored May 16, 2024
1 parent 652c948 commit c72bcda
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 27 deletions.
6 changes: 3 additions & 3 deletions src/vs/workbench/browser/parts/editor/editorActions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ abstract class AbstractSplitEditorAction extends Action2 {
return preferredSideBySideGroupDirection(configurationService);
}

override async run(accessor: ServicesAccessor, context?: IEditorIdentifier): Promise<void> {
override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
const editorGroupService = accessor.get(IEditorGroupsService);
const configurationService = accessor.get(IConfigurationService);

splitEditor(editorGroupService, this.getDirection(configurationService), [context]);
splitEditor(editorGroupService, this.getDirection(configurationService), [getCommandsContext(accessor, resourceOrContext, context)]);
}
}

Expand Down Expand Up @@ -1146,7 +1146,7 @@ export class ToggleMaximizeEditorGroupAction extends Action2 {
override async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
const editorGroupsService = accessor.get(IEditorGroupsService);

const { group } = resolveCommandsContext(editorGroupsService, getCommandsContext(resourceOrContext, context));
const { group } = resolveCommandsContext(editorGroupsService, getCommandsContext(accessor, resourceOrContext, context));
editorGroupsService.toggleMaximizeGroup(group);
}
}
Expand Down
62 changes: 38 additions & 24 deletions src/vs/workbench/browser/parts/editor/editorCommands.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { coalesce, distinct } from 'vs/base/common/arrays';
import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { Schemas, matchesScheme } from 'vs/base/common/network';
import { extname } from 'vs/base/common/resources';
import { extname, isEqual } from 'vs/base/common/resources';
import { isNumber, isObject, isString, isUndefined } from 'vs/base/common/types';
import { URI, UriComponents } from 'vs/base/common/uri';
import { isDiffEditor } from 'vs/editor/browser/editorBrowser';
Expand All @@ -31,7 +31,7 @@ import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from 'vs/workbench/br
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
import { ActiveEditorCanSplitInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, MultipleEditorGroupsContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext } from 'vs/workbench/common/contextkeys';
import { CloseDirection, EditorInputCapabilities, EditorsOrder, IEditorCommandsContext, IEditorIdentifier, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, IVisibleEditorPane, isEditorIdentifier, isEditorInputWithOptionsAndGroup } from 'vs/workbench/common/editor';
import { CloseDirection, EditorInputCapabilities, EditorsOrder, IEditorCommandsContext, IEditorIdentifier, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, IVisibleEditorPane, isEditorCommandsContext, isEditorIdentifier, isEditorInputWithOptionsAndGroup } from 'vs/workbench/common/editor';
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditorInput';
Expand Down Expand Up @@ -656,13 +656,24 @@ function registerFocusEditorGroupAtIndexCommands(): void {
}
}

export function splitEditor(editorGroupService: IEditorGroupsService, direction: GroupDirection, contexts?: (IEditorCommandsContext | undefined)[]): void {
export function splitEditor(editorGroupService: IEditorGroupsService, direction: GroupDirection, contexts?: (IEditorCommandsContext | URI | undefined)[]): void {
let newGroup: IEditorGroup | undefined;

for (const context of contexts ?? [undefined]) {
let sourceGroup: IEditorGroup | undefined;
if (context && typeof context.groupId === 'number') {

const isEditorCommand = context && isEditorCommandsContext(context);
const isURI = context && URI.isUri(context);

if (isEditorCommand) {
sourceGroup = editorGroupService.getGroup(context.groupId);
} else if (isURI) {
for (const group of editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE)) {
if (isEqual(group.activeEditor?.resource, context)) {
sourceGroup = group;
break;
}
}
} else {
sourceGroup = editorGroupService.activeGroup;
}
Expand All @@ -678,15 +689,15 @@ export function splitEditor(editorGroupService: IEditorGroupsService, direction:

// Split editor (if it can be split)
let editorToCopy: EditorInput | undefined;
if (context && typeof context.editorIndex === 'number') {
if (isEditorCommand && typeof context.editorIndex === 'number') {
editorToCopy = sourceGroup.getEditorByIndex(context.editorIndex);
} else {
editorToCopy = sourceGroup.activeEditor ?? undefined;
}

// Copy the editor to the new group, else create an empty group
if (editorToCopy && !editorToCopy.hasCapability(EditorInputCapabilities.Singleton)) {
sourceGroup.copyEditor(editorToCopy, newGroup, { preserveFocus: context?.preserveFocus });
sourceGroup.copyEditor(editorToCopy, newGroup, { preserveFocus: isEditorCommand && context?.preserveFocus });
}
}

Expand Down Expand Up @@ -800,7 +811,7 @@ function registerCloseEditorCommands() {
win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KeyW] },
handler: (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
const editorGroupService = accessor.get(IEditorGroupsService);
const commandsContext = getCommandsContext(resourceOrContext, context);
const commandsContext = getCommandsContext(accessor, resourceOrContext, context);

let group: IEditorGroup | undefined;
if (commandsContext && typeof commandsContext.groupId === 'number') {
Expand Down Expand Up @@ -865,7 +876,7 @@ function registerCloseEditorCommands() {
handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
const editorGroupService = accessor.get(IEditorGroupsService);

const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
if (group && editor) {
if (group.activeEditor) {
group.pinEditor(group.activeEditor);
Expand Down Expand Up @@ -957,7 +968,7 @@ function registerCloseEditorCommands() {
CommandsRegistry.registerCommand(CLOSE_EDITORS_AND_GROUP_COMMAND_ID, async (accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
const editorGroupService = accessor.get(IEditorGroupsService);

const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
if (group) {
await group.closeAllEditors();

Expand Down Expand Up @@ -1005,7 +1016,7 @@ function registerSplitEditorInGroupCommands(): void {
const editorGroupService = accessor.get(IEditorGroupsService);
const instantiationService = accessor.get(IInstantiationService);

const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
if (!editor) {
return;
}
Expand Down Expand Up @@ -1040,7 +1051,7 @@ function registerSplitEditorInGroupCommands(): void {
async function joinEditorInGroup(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
const editorGroupService = accessor.get(IEditorGroupsService);

const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
if (!(editor instanceof SideBySideEditorInput)) {
return;
}
Expand Down Expand Up @@ -1096,7 +1107,7 @@ function registerSplitEditorInGroupCommands(): void {
async run(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): Promise<void> {
const editorGroupService = accessor.get(IEditorGroupsService);

const { editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
if (editor instanceof SideBySideEditorInput) {
await joinEditorInGroup(accessor, resourceOrContext, context);
} else if (editor) {
Expand Down Expand Up @@ -1217,7 +1228,7 @@ function registerOtherEditorCommands(): void {
handler: async (accessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext) => {
const editorGroupService = accessor.get(IEditorGroupsService);

const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { group, editor } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
if (group && editor) {
return group.pinEditor(editor);
}
Expand All @@ -1238,7 +1249,7 @@ function registerOtherEditorCommands(): void {
function setEditorGroupLock(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext, locked?: boolean): void {
const editorGroupService = accessor.get(IEditorGroupsService);

const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(resourceOrContext, context));
const { group } = resolveCommandsContext(editorGroupService, getCommandsContext(accessor, resourceOrContext, context));
group?.lock(locked ?? !group.isLocked);
}

Expand Down Expand Up @@ -1346,7 +1357,7 @@ function registerOtherEditorCommands(): void {
const editorGroupService = accessor.get(IEditorGroupsService);
const quickInputService = accessor.get(IQuickInputService);

const commandsContext = getCommandsContext(resourceOrContext, context);
const commandsContext = getCommandsContext(accessor, resourceOrContext, context);
if (commandsContext && typeof commandsContext.groupId === 'number') {
const group = editorGroupService.getGroup(commandsContext.groupId);
if (group) {
Expand All @@ -1363,7 +1374,7 @@ function getEditorsContext(accessor: ServicesAccessor, resourceOrContext?: URI |
const editorGroupService = accessor.get(IEditorGroupsService);
const listService = accessor.get(IListService);

const editorContext = getMultiSelectedEditorContexts(getCommandsContext(resourceOrContext, context), listService, editorGroupService);
const editorContext = getMultiSelectedEditorContexts(getCommandsContext(accessor, resourceOrContext, context), listService, editorGroupService);

const activeGroup = editorGroupService.activeGroup;
if (editorContext.length === 0 && activeGroup.activeEditor) {
Expand Down Expand Up @@ -1398,17 +1409,20 @@ export function getEditorsFromContext(accessor: ServicesAccessor, resourceOrCont
return editorsAndGroup.filter(group => !!group);
}

export function getCommandsContext(resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): IEditorCommandsContext | undefined {
if (URI.isUri(resourceOrContext)) {
return context;
}
export function getCommandsContext(accessor: ServicesAccessor, resourceOrContext?: URI | IEditorCommandsContext, context?: IEditorCommandsContext): IEditorCommandsContext | undefined {
const isUri = URI.isUri(resourceOrContext);

if (resourceOrContext && typeof resourceOrContext.groupId === 'number') {
return resourceOrContext;
const editorCommandsContext = isUri ? context : resourceOrContext;
if (editorCommandsContext && typeof editorCommandsContext.groupId === 'number') {
return editorCommandsContext;
}

if (context && typeof context.groupId === 'number') {
return context;
if (isUri) {
const editorGroupService = accessor.get(IEditorGroupsService);
const editorGroup = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE).find(group => isEqual(group.activeEditor?.resource, resourceOrContext));
if (editorGroup) {
return { groupId: editorGroup.index, editorIndex: editorGroup.getIndexOfEditor(editorGroup.activeEditor!) };
}
}

return undefined;
Expand Down
6 changes: 6 additions & 0 deletions src/vs/workbench/common/editor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1079,6 +1079,12 @@ export interface IEditorCommandsContext {
preserveFocus?: boolean;
}

export function isEditorCommandsContext(context: unknown): context is IEditorCommandsContext {
const candidate = context as IEditorCommandsContext | undefined;

return typeof candidate?.groupId === 'number';
}

/**
* More information around why an editor was closed in the model.
*/
Expand Down

0 comments on commit c72bcda

Please sign in to comment.