Skip to content

refactor: Simplify WorkspaceMovement shortcuts #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cpcallen merged 2 commits into from
Mar 11, 2025
Merged

refactor: Simplify WorkspaceMovement shortcuts #310

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c12aede
refactor: Simplify WorkspaceMovement shortcuts
cpcallen Mar 11, 2025
153acc2
refactor: Make guard clauses more succinct
cpcallen Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 41 additions & 57 deletions src/actions/ws_movement.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,65 +33,54 @@ export class WorkspaceMovement {
this.canCurrentlyEdit = canEdit;
}

private shortcuts: ShortcutRegistry.KeyboardShortcut[] = [
/** Move the cursor on the workspace to the left. */
{
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_LEFT,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, -1, 0),
keyCodes: [createSerializedKey(KeyCodes.A, [KeyCodes.SHIFT])],
},
/** Move the cursor on the workspace to the right. */
{
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_RIGHT,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, 1, 0),
keyCodes: [createSerializedKey(KeyCodes.D, [KeyCodes.SHIFT])],
},
/** Move the cursor on the workspace up. */
{
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_UP,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, 0, -1),
keyCodes: [createSerializedKey(KeyCodes.W, [KeyCodes.SHIFT])],
},

/** Move the cursor on the workspace down. */
{
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_DOWN,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, 0, 1),
keyCodes: [createSerializedKey(KeyCodes.S, [KeyCodes.SHIFT])],
},
];

/**
* Install these actions as both keyboard shortcuts and context menu items.
* Install the shortcuts.
*/
install() {
const shortcutList: {
[name: string]: ShortcutRegistry.KeyboardShortcut;
} = {
/** Move the cursor on the workspace to the left. */
wsMoveLeft: {
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_LEFT,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, -1, 0),
keyCodes: [createSerializedKey(KeyCodes.A, [KeyCodes.SHIFT])],
},
/** Move the cursor on the workspace to the right. */
wsMoveRight: {
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_RIGHT,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, 1, 0),
keyCodes: [createSerializedKey(KeyCodes.D, [KeyCodes.SHIFT])],
},

/** Move the cursor on the workspace up. */
wsMoveUp: {
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_UP,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, 0, -1),
keyCodes: [createSerializedKey(KeyCodes.W, [KeyCodes.SHIFT])],
},

/** Move the cursor on the workspace down. */
wsMoveDown: {
name: Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_DOWN,
preconditionFn: (workspace) => this.canCurrentlyEdit(workspace),
callback: (workspace) => this.moveWSCursor(workspace, 0, 1),
keyCodes: [createSerializedKey(KeyCodes.S, [KeyCodes.SHIFT])],
},
};
for (const shortcut of Object.values(shortcutList)) {
for (const shortcut of this.shortcuts) {
ShortcutRegistry.registry.register(shortcut);
}
}

/**
* Uninstall these actions.
* Uninstall the shortcuts.
*/
uninstall() {
ShortcutRegistry.registry.unregister(
Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_LEFT,
);
ShortcutRegistry.registry.unregister(
Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_RIGHT,
);
ShortcutRegistry.registry.unregister(
Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_UP,
);
ShortcutRegistry.registry.unregister(
Constants.SHORTCUT_NAMES.MOVE_WS_CURSOR_DOWN,
);
for (const shortcut of this.shortcuts) {
ShortcutRegistry.registry.unregister(shortcut.name);
}
}

/**
Expand All @@ -109,14 +98,9 @@ export class WorkspaceMovement {
yDirection: number,
): boolean {
const cursor = workspace.getCursor();
if (!cursor) {
return false;
}
const curNode = cursor.getCurNode();

if (curNode.getType() !== ASTNode.types.WORKSPACE) {
return false;
}
if (!cursor) return false;
const curNode = cursor?.getCurNode();
if (curNode.getType() !== ASTNode.types.WORKSPACE) return false;

const wsCoord = curNode.getWsCoordinate();
const newX = xDirection * this.WS_MOVE_DISTANCE + wsCoord.x;
Expand Down