Skip to content

MORE MOTIONS #288

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

Open
philocalyst wants to merge 7 commits into
base: main
Choose a base branch
from
Open

MORE MOTIONS #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e7721b
Dramatically expanded motion operations
philocalyst Apr 4, 2026
615e3c0
sort of kind of refactor of the main handler
philocalyst Apr 4, 2026
657a9d3
linking for find and till
philocalyst Apr 4, 2026
f08276f
digit prefixing
philocalyst Apr 4, 2026
941047a
core logic for the new motions!
philocalyst Apr 4, 2026
a5bac2f
Fixes for lints
philocalyst Apr 5, 2026
a5f33e5
formatting
philocalyst Apr 5, 2026
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
274 changes: 158 additions & 116 deletions src/glide/browser/actors/GlideHandlerChild.sys.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,20 +325,25 @@ export class GlideHandlerChild extends JSWindowActorChild<

case "Glide::Move": {
const doc_shell = assert_present(this.docShell);
const count = message.data.count ?? 1;

const editor = this.#get_editor(this.#get_active_element());
if (editor) {
this._log.debug(`[Glide::Move]: editor available, using commands directly`);
// if we have an editor, sending the following commands should always work
switch (message.data.direction) {
case "left":
return doc_shell.doCommand("cmd_moveLeft");
for (let i = 0; i < count; i++) doc_shell.doCommand("cmd_moveLeft");
return;
case "right":
return doc_shell.doCommand("cmd_moveRight");
for (let i = 0; i < count; i++) doc_shell.doCommand("cmd_moveRight");
return;
case "up":
return doc_shell.doCommand("cmd_moveUp");
for (let i = 0; i < count; i++) doc_shell.doCommand("cmd_moveUp");
return;
case "down":
return doc_shell.doCommand("cmd_moveDown");
for (let i = 0; i < count; i++) doc_shell.doCommand("cmd_moveDown");
return;
case "endline":
return doc_shell.doCommand("cmd_endLine");
default:
Expand All @@ -355,20 +360,51 @@ export class GlideHandlerChild extends JSWindowActorChild<

switch (message.data.direction) {
case "left":
return DOM.scroll(window, { type: "pixel", x: -delta });
return DOM.scroll(window, { type: "pixel", x: -delta * count });
case "right":
return DOM.scroll(window, { type: "pixel", x: delta });
return DOM.scroll(window, { type: "pixel", x: delta * count });
case "up":
return DOM.scroll(window, { type: "pixel", y: -delta });
return DOM.scroll(window, { type: "pixel", y: -delta * count });
case "down":
return DOM.scroll(window, { type: "pixel", y: delta });
return DOM.scroll(window, { type: "pixel", y: delta * count });
case "endline":
return doc_shell.doCommand("cmd_endLine");
default:
throw assert_never(message.data.direction);
}
}

case "Glide::FindChar": {
const { find_type, character, operator, count } = message.data;
const editor = this.#expect_editor(`find-char:${find_type}${character}`);

const found = motions.select_find_char(editor, find_type, character, count ?? 1);
if (!found || editor.selection.isCollapsed) {
this.#change_mode("normal");
break;
}

switch (operator) {
case "d": {
motions.delete_selection(editor, true);
break;
}
case "c": {
motions.delete_selection(editor, false);
this.#change_mode("insert");
return;
}
case "r": {
throw new Error("The `r` operator cannot be executed with find-char");
}
default:
throw assert_never(operator);
}

this.#change_mode("normal");
break;
}

case "Glide::SelectionCollapse": {
const editor = this.#expect_editor("selection_collapse");
editor.selection.collapseToEnd();
Expand Down Expand Up @@ -469,28 +505,33 @@ export class GlideHandlerChild extends JSWindowActorChild<

const sequence = props.sequence.join("");
const editor = this.#expect_editor(`${operator}${sequence}`);
const count = props.count ?? 1;

switch (operator) {
case "d": {
const result = motions.select_motion(editor, sequence as any, this.state?.mode ?? "normal", operator);
for (let i = 0; i < count; i++) {
const result = motions.select_motion(editor, sequence as any, this.state?.mode ?? "normal", operator);

// if the motion didn't actually select anything, then there's
// nothing for us to delete
if (!editor.selection.isCollapsed) {
motions.delete_selection(editor, true);
}
// if the motion didn't actually select anything, then there's
// nothing for us to delete
if (!editor.selection.isCollapsed) {
motions.delete_selection(editor, true);
}

if (result?.fixup_deletion) {
result.fixup_deletion();
if (result?.fixup_deletion) {
result.fixup_deletion();
}
}

this.#record_repeatable_command({ ...props, operator });
this.#change_mode("normal");
break;
}
case "c": {
motions.select_motion(editor, sequence as any, this.state?.mode ?? "normal", operator);
motions.delete_selection(editor, false);
for (let i = 0; i < count; i++) {
motions.select_motion(editor, sequence as any, this.state?.mode ?? "normal", operator);
motions.delete_selection(editor, false);
}

this.#record_repeatable_command({ ...props, operator });
this.#change_mode("insert");
Expand Down Expand Up @@ -520,137 +561,138 @@ export class GlideHandlerChild extends JSWindowActorChild<
}

const editor = this.#expect_editor(keyseq);
const count = props.count ?? 1;

// Mode-changing and one-shot operations run once regardless of count.
switch (keyseq) {
case "w": {
motions.forward_word(editor, /* bigword */ false, this.state?.mode);
break;
}
case "W": {
motions.forward_word(editor, /* bigword */ true, this.state?.mode);
break;
}
case "e": {
motions.end_word(editor, this.state?.mode);
break;
}
case "b": {
motions.back_word(editor, false);
break;
}
case "B": {
motions.back_word(editor, true);
break;
}
case "{": {
motions.back_para(editor);
break;
}
case "}": {
motions.next_para(editor);
break;
}
case "I": {
motions.first_non_whitespace(editor, false);
motions.back_char(editor, false);
this.#change_mode("insert");
break;
}
case "0": {
motions.beginning_of_line(editor, false);
break;
}
case "^": {
motions.first_non_whitespace(editor, false);
break;
}
case "$": {
motions.end_of_line(editor, false);
break;
}
case "s": {
// caret is on the first line and it's empty
if (motions.is_bof(editor) && motions.next_char(editor) === "\n") {
return;
}
if (motions.is_bof(editor) && motions.next_char(editor) === "\n") return;

// `foo █ar baz` -> `foo█ar baz`
editor.deleteSelection(/* action */ editor.ePrevious!, /* stripWrappers */ editor.eStrip!);
this.#change_mode("insert");
break;
}
case "vh": {
if (editor.selection.isCollapsed) {
motions.back_char(editor, true);
}
motions.back_char(editor, true);
break;
}
case "vl": {
if (editor.selection.isCollapsed) {
editor.selectionController.characterMove(false, false);
editor.selectionController.characterMove(true, true);
}

motions.forward_char(editor, true);
break;
}
case "vd": {
// `foo ██r` -> `foo |r`
editor.deleteSelection(editor.ePrevious!, editor.eStrip!);

// `foo |r` -> `foo r|`
motions.forward_char(editor, false);

this.#change_mode("normal");
break;
}
case "vc": {
// `foo ██r` -> `foo |r`
editor.deleteSelection(editor.ePrevious!, editor.eStrip!);

this.#change_mode("insert");
break;
}
case "x": {
if (
// caret is on the first line and it's empty
(motions.is_bof(editor) && motions.next_char(editor) === "\n")
// we don't want to delete newlines
|| motions.current_char(editor) === "\n"
) {
return;
}

// `foo █ar baz` -> `foo█ar baz`
editor.deleteSelection(/* action */ editor.ePrevious!, /* stripWrappers */ editor.eStrip!);

if (motions.next_char(editor) !== "\n") {
// `foo█ar baz` -> `foo █r baz`
editor.selectionController.characterMove(/* forward */ true, /* extend */ false);
}
break;
}
case "X": {
if (
// caret is on the first line and it's empty
(motions.is_bof(editor) && motions.next_char(editor) === "\n")
// we don't want to delete newlines
|| motions.current_char(editor) === "\n"
) {
return;
}

// `foo █ar baz` -> `foo█ar baz`
editor.deleteSelection(/* action */ editor.ePrevious!, /* stripWrappers */ editor.eStrip!);
break;
}
case "o": {
editor.selectionController.intraLineMove(/* forward */ true, /* extend */ false);
editor.insertLineBreak();

this.#change_mode("insert");
break;
}
// Position-only motions: repeat count times
case "w":
case "W":
case "e":
case "b":
case "B":
case "{":
case "}":
case "0":
case "^":
case "$":
case "vh":
case "vl":
case "x":
case "X": {
for (let i = 0; i < count; i++) {
switch (keyseq) {
case "w":
motions.forward_word(editor, /* bigword */ false, this.state?.mode);
break;
case "W":
motions.forward_word(editor, /* bigword */ true, this.state?.mode);
break;
case "e":
motions.end_word(editor, this.state?.mode);
break;
case "b":
motions.back_word(editor, false);
break;
case "B":
motions.back_word(editor, true);
break;
case "{":
motions.back_para(editor);
break;
case "}":
motions.next_para(editor);
break;
case "0":
motions.beginning_of_line(editor, false);
break;
case "^":
motions.first_non_whitespace(editor, false);
break;
case "$":
motions.end_of_line(editor, false);
break;
case "vh": {
if (editor.selection.isCollapsed) motions.back_char(editor, true);
motions.back_char(editor, true);
break;
}
case "vl": {
if (editor.selection.isCollapsed) {
editor.selectionController.characterMove(false, false);
editor.selectionController.characterMove(true, true);
}
motions.forward_char(editor, true);
break;
}
case "x": {
if (
// caret is on the first line and it's empty
(motions.is_bof(editor) && motions.next_char(editor) === "\n")
// we don't want to delete newlines
|| motions.current_char(editor) === "\n"
) break;

// `foo █ar baz` -> `foo█ar baz`
editor.deleteSelection(/* action */ editor.ePrevious!, /* stripWrappers */ editor.eStrip!);
if (motions.next_char(editor) !== "\n") {
// `foo█ar baz` -> `foo █r baz`
editor.selectionController.characterMove(/* forward */ true, /* extend */ false);
}
break;
}
case "X": {
if (
// caret is on the first line and it's empty
(motions.is_bof(editor) && motions.next_char(editor) === "\n")
// we don't want to delete newlines
|| motions.current_char(editor) === "\n"
) break;

// `foo █ar baz` -> `foo█ar baz`
editor.deleteSelection(/* action */ editor.ePrevious!, /* stripWrappers */ editor.eStrip!);
break;
}
}
}
break;
}
default:
throw assert_never(keyseq);
}
Expand Down Expand Up @@ -829,9 +871,9 @@ export class GlideHandlerChild extends JSWindowActorChild<
) => Promise<ChildQueries[QueryName]["result"]> = this.sendQuery;

#change_mode(mode: GlideMode, force: boolean = true): void {
this.state ??= { mode, operator: null };
this.state.mode = mode;
this.state.operator = null;
this.state ??= { mode, operator: null, count: 0 };
this.state!.mode = mode;
this.state!.operator = null;
this.send_async_message("Glide::ChangeMode", { mode, force });
this._log.debug("new mode", this.state?.mode ?? "unset");
}
Expand Down
9 changes: 8 additions & 1 deletion src/glide/browser/actors/GlideHandlerParent.sys.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ export interface ParentMessages {
args: string;
operator: GlideOperator | null;
sequence: string[];
count: number;
};
"Glide::FindChar": {
find_type: "f" | "F" | "t" | "T";
character: string;
operator: GlideOperator;
count: number;
};
"Glide::KeyMappingExecution": {
sequence: string[];
Expand Down Expand Up @@ -59,7 +66,7 @@ export interface ParentMessages {
| GlideFunctionIPC<(target: HTMLElement) => Promise<void>>
| null;
};
"Glide::Move": { direction: "left" | "right" | "up" | "down" | "endline" };
"Glide::Move": { direction: "left" | "right" | "up" | "down" | "endline"; count?: number };
"Glide::Scroll": { to: "half_page_up" | "half_page_down" | "page_up" | "page_down" | "top" | "bottom" };
"Glide::Debug": null;
}
Expand Down
Loading