Skip to content

feat(tui): add vim find and till motions [3 of 9] #24480

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

Closed
fcoury-oai wants to merge 1 commit into from
Closed

feat(tui): add vim find and till motions [3 of 9] #24480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions codex-rs/config/src/tui_keymap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,18 @@ pub struct TuiVimNormalKeymap {
pub move_line_start: Option<KeybindingsSpec>,
/// Move cursor to end of line (`$`).
pub move_line_end: Option<KeybindingsSpec>,
/// Find the next target character on the current line (`f{char}`).
pub find_forward: Option<KeybindingsSpec>,
/// Find the previous target character on the current line (`F{char}`).
pub find_backward: Option<KeybindingsSpec>,
/// Move until before the next target character on the current line (`t{char}`).
pub till_forward: Option<KeybindingsSpec>,
/// Move until after the previous target character on the current line (`T{char}`).
pub till_backward: Option<KeybindingsSpec>,
/// Repeat the most recent find/till motion (`;`).
pub repeat_find: Option<KeybindingsSpec>,
/// Repeat the most recent find/till motion in the opposite direction (`,`).
pub repeat_find_reverse: Option<KeybindingsSpec>,
/// Delete character under cursor (`x`).
pub delete_char: Option<KeybindingsSpec>,
/// Delete from cursor to end of line (`D`).
Expand Down Expand Up @@ -276,6 +288,18 @@ pub struct TuiVimOperatorKeymap {
pub motion_line_start: Option<KeybindingsSpec>,
/// Motion: to end of line (`$`).
pub motion_line_end: Option<KeybindingsSpec>,
/// Enter a forward find motion and await its literal target (`f{char}`).
pub find_forward: Option<KeybindingsSpec>,
/// Enter a backward find motion and await its literal target (`F{char}`).
pub find_backward: Option<KeybindingsSpec>,
/// Enter a forward till motion and await its literal target (`t{char}`).
pub till_forward: Option<KeybindingsSpec>,
/// Enter a backward till motion and await its literal target (`T{char}`).
pub till_backward: Option<KeybindingsSpec>,
/// Repeat the most recent find/till motion (`;`).
pub repeat_find: Option<KeybindingsSpec>,
/// Repeat the most recent find/till motion in the opposite direction (`,`).
pub repeat_find_reverse: Option<KeybindingsSpec>,
/// Select an inner text object after an operator.
pub select_inner_text_object: Option<KeybindingsSpec>,
/// Select an around text object after an operator.
Expand Down
120 changes: 120 additions & 0 deletions codex-rs/core/config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2828,6 +2828,8 @@
"delete_char": null,
"delete_to_line_end": null,
"enter_insert": null,
"find_backward": null,
"find_forward": null,
"insert_line_start": null,
"move_down": null,
"move_left": null,
Expand All @@ -2841,17 +2843,23 @@
"open_line_above": null,
"open_line_below": null,
"paste_after": null,
"repeat_find": null,
"repeat_find_reverse": null,
"start_change_operator": null,
"start_delete_operator": null,
"start_yank_operator": null,
"substitute_char": null,
"substitute_line": null,
"till_backward": null,
"till_forward": null,
"yank_line": null
},
"vim_operator": {
"cancel": null,
"change_line": null,
"delete_line": null,
"find_backward": null,
"find_forward": null,
"motion_down": null,
"motion_left": null,
"motion_line_end": null,
Expand All @@ -2861,8 +2869,12 @@
"motion_word_backward": null,
"motion_word_end": null,
"motion_word_forward": null,
"repeat_find": null,
"repeat_find_reverse": null,
"select_around_text_object": null,
"select_inner_text_object": null,
"till_backward": null,
"till_forward": null,
"yank_line": null
},
"vim_text_object": {
Expand Down Expand Up @@ -3512,6 +3524,8 @@
"delete_char": null,
"delete_to_line_end": null,
"enter_insert": null,
"find_backward": null,
"find_forward": null,
"insert_line_start": null,
"move_down": null,
"move_left": null,
Expand All @@ -3525,11 +3539,15 @@
"open_line_above": null,
"open_line_below": null,
"paste_after": null,
"repeat_find": null,
"repeat_find_reverse": null,
"start_change_operator": null,
"start_delete_operator": null,
"start_yank_operator": null,
"substitute_char": null,
"substitute_line": null,
"till_backward": null,
"till_forward": null,
"yank_line": null
}
},
Expand All @@ -3543,6 +3561,8 @@
"cancel": null,
"change_line": null,
"delete_line": null,
"find_backward": null,
"find_forward": null,
"motion_down": null,
"motion_left": null,
"motion_line_end": null,
Expand All @@ -3552,8 +3572,12 @@
"motion_word_backward": null,
"motion_word_end": null,
"motion_word_forward": null,
"repeat_find": null,
"repeat_find_reverse": null,
"select_around_text_object": null,
"select_inner_text_object": null,
"till_backward": null,
"till_forward": null,
"yank_line": null
}
},
Expand Down Expand Up @@ -3830,6 +3854,22 @@
],
"description": "Enter insert mode at cursor (`i`)."
},
"find_backward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Find the previous target character on the current line (`F{char}`)."
},
"find_forward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Find the next target character on the current line (`f{char}`)."
},
"insert_line_start": {
"allOf": [
{
Expand Down Expand Up @@ -3934,6 +3974,22 @@
],
"description": "Paste after cursor (`p`)."
},
"repeat_find": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Repeat the most recent find/till motion (`;`)."
},
"repeat_find_reverse": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Repeat the most recent find/till motion in the opposite direction (`,`)."
},
"start_change_operator": {
"allOf": [
{
Expand Down Expand Up @@ -3974,6 +4030,22 @@
],
"description": "Substitute the current line and enter insert mode (`S`)."
},
"till_backward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Move until after the previous target character on the current line (`T{char}`)."
},
"till_forward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Move until before the next target character on the current line (`t{char}`)."
},
"yank_line": {
"allOf": [
{
Expand Down Expand Up @@ -4013,6 +4085,22 @@
],
"description": "Repeat delete operator to delete the whole line (`dd`)."
},
"find_backward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Enter a backward find motion and await its literal target (`F{char}`)."
},
"find_forward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Enter a forward find motion and await its literal target (`f{char}`)."
},
"motion_down": {
"allOf": [
{
Expand Down Expand Up @@ -4085,6 +4173,22 @@
],
"description": "Motion: to start of next word (`w`)."
},
"repeat_find": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Repeat the most recent find/till motion (`;`)."
},
"repeat_find_reverse": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Repeat the most recent find/till motion in the opposite direction (`,`)."
},
"select_around_text_object": {
"allOf": [
{
Expand All @@ -4101,6 +4205,22 @@
],
"description": "Select an inner text object after an operator."
},
"till_backward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Enter a backward till motion and await its literal target (`T{char}`)."
},
"till_forward": {
"allOf": [
{
"$ref": "#/definitions/KeybindingsSpec"
}
],
"description": "Enter a forward till motion and await its literal target (`t{char}`)."
},
"yank_line": {
"allOf": [
{
Expand Down
Loading
Loading