Skip to content

Add extend variants of *page* commands. #14790

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
loralb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add extend variants of *page* commands. #14790

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
16 changes: 12 additions & 4 deletions book/src/generated/static-cmd.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,22 @@
| `switch_case` | Switch (toggle) case | normal: `` ~ ``, select: `` ~ `` |
| `switch_to_uppercase` | Switch to uppercase | normal: `` <A-`> ``, select: `` <A-`> `` |
| `switch_to_lowercase` | Switch to lowercase | normal: `` ` ``, select: `` ` `` |
| `page_up` | Move page up | normal: `` <C-b> ``, `` Z<C-b> ``, `` z<C-b> ``, `` <pageup> ``, `` Z<pageup> ``, `` z<pageup> ``, select: `` <C-b> ``, `` Z<C-b> ``, `` z<C-b> ``, `` <pageup> ``, `` Z<pageup> ``, `` z<pageup> ``, insert: `` <pageup> `` |
| `page_down` | Move page down | normal: `` <C-f> ``, `` Z<C-f> ``, `` z<C-f> ``, `` <pagedown> ``, `` Z<pagedown> ``, `` z<pagedown> ``, select: `` <C-f> ``, `` Z<C-f> ``, `` z<C-f> ``, `` <pagedown> ``, `` Z<pagedown> ``, `` z<pagedown> ``, insert: `` <pagedown> `` |
| `page_up` | Move page up | normal: `` <C-b> ``, `` Z<C-b> ``, `` z<C-b> ``, `` <pageup> ``, `` Z<pageup> ``, `` z<pageup> ``, insert: `` <pageup> `` |
| `extend_page_up` | Move page up, extending the selection | select: `` <C-b> ``, `` Z<C-b> ``, `` z<C-b> ``, `` <pageup> ``, `` Z<pageup> ``, `` z<pageup> `` |
| `page_down` | Move page down | normal: `` <C-f> ``, `` Z<C-f> ``, `` z<C-f> ``, `` <pagedown> ``, `` Z<pagedown> ``, `` z<pagedown> ``, insert: `` <pagedown> `` |
| `extend_page_down` | Move page down, extending the selection | select: `` <C-f> ``, `` Z<C-f> ``, `` z<C-f> ``, `` <pagedown> ``, `` Z<pagedown> ``, `` z<pagedown> `` |
| `half_page_up` | Move half page up | |
| `extend_half_page_up` | Move half page up, extending the selection | |
| `half_page_down` | Move half page down | |
| `extend_half_page_down` | Move half page down, extending the selection | |
| `page_cursor_up` | Move page and cursor up | |
| `extend_page_cursor_up` | Move page and cursor up, extending the selection | |
| `page_cursor_down` | Move page and cursor down | |
| `page_cursor_half_up` | Move page and cursor half up | normal: `` <C-u> ``, `` Z<C-u> ``, `` z<C-u> ``, `` Z<backspace> ``, `` z<backspace> ``, select: `` <C-u> ``, `` Z<C-u> ``, `` z<C-u> ``, `` Z<backspace> ``, `` z<backspace> `` |
| `page_cursor_half_down` | Move page and cursor half down | normal: `` <C-d> ``, `` Z<C-d> ``, `` z<C-d> ``, `` Z<space> ``, `` z<space> ``, select: `` <C-d> ``, `` Z<C-d> ``, `` z<C-d> ``, `` Z<space> ``, `` z<space> `` |
| `extend_page_cursor_down` | Move page and cursor down, extending the selection | |
| `page_cursor_half_up` | Move page and cursor half up | normal: `` <C-u> ``, `` Z<C-u> ``, `` z<C-u> ``, `` Z<backspace> ``, `` z<backspace> `` |
| `extend_page_cursor_half_up` | Move page and cursor half up, extending the selection | select: `` <C-u> ``, `` Z<C-u> ``, `` z<C-u> ``, `` Z<backspace> ``, `` z<backspace> `` |
| `page_cursor_half_down` | Move page and cursor half down | normal: `` <C-d> ``, `` Z<C-d> ``, `` z<C-d> ``, `` Z<space> ``, `` z<space> `` |
| `extend_page_cursor_half_down` | Move page and cursor half down, extending the selection | select: `` <C-d> ``, `` Z<C-d> ``, `` z<C-d> ``, `` Z<space> ``, `` z<space> `` |
| `select_all` | Select whole document | normal: `` % ``, select: `` % `` |
| `select_regex` | Select all regex matches inside selections | normal: `` s ``, select: `` s `` |
| `split_selection` | Split selections on regex matches | normal: `` S ``, select: `` S `` |
Expand Down
184 changes: 155 additions & 29 deletions helix-term/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,21 @@ impl MappableCommand {
switch_to_uppercase, "Switch to uppercase",
switch_to_lowercase, "Switch to lowercase",
page_up, "Move page up",
extend_page_up, "Move page up, extending the selection",
page_down, "Move page down",
extend_page_down, "Move page down, extending the selection",
half_page_up, "Move half page up",
extend_half_page_up, "Move half page up, extending the selection",
half_page_down, "Move half page down",
extend_half_page_down, "Move half page down, extending the selection",
page_cursor_up, "Move page and cursor up",
extend_page_cursor_up, "Move page and cursor up, extending the selection",
page_cursor_down, "Move page and cursor down",
extend_page_cursor_down, "Move page and cursor down, extending the selection",
page_cursor_half_up, "Move page and cursor half up",
extend_page_cursor_half_up, "Move page and cursor half up, extending the selection",
page_cursor_half_down, "Move page and cursor half down",
extend_page_cursor_half_down, "Move page and cursor half down, extending the selection",
select_all, "Select whole document",
select_regex, "Select all regex matches inside selections",
split_selection, "Split selections on regex matches",
Expand Down Expand Up @@ -1821,6 +1829,20 @@ fn switch_to_lowercase(cx: &mut Context) {
}

pub fn scroll(cx: &mut Context, offset: usize, direction: Direction, sync_cursor: bool) {
let movement = match cx.editor.mode {
Mode::Select => Movement::Extend,
_ => Movement::Move,
};
scroll_impl(cx, offset, direction, sync_cursor, movement);
}

pub fn scroll_impl(
cx: &mut Context,
offset: usize,
direction: Direction,
sync_cursor: bool,
movement: Movement,
) {
use Direction::*;
let config = cx.editor.config();
let (view, doc) = current!(cx.editor);
Expand Down Expand Up @@ -1856,10 +1878,6 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction, sync_cursor
let mut annotations = view.text_annotations(&*doc, None);

if sync_cursor {
let movement = match cx.editor.mode {
Mode::Select => Movement::Extend,
_ => Movement::Move,
};
// TODO: When inline diagnostics gets merged- 1. move_vertically_visual removes
// line annotations/diagnostics so the cursor may jump further than the view.
// 2. If the cursor lands on a complete line of virtual text, the cursor will
Expand Down Expand Up @@ -1930,52 +1948,160 @@ pub fn scroll(cx: &mut Context, offset: usize, direction: Direction, sync_cursor
doc.set_selection(view.id, sel);
}

fn page_up(cx: &mut Context) {
fn scroll_page(cx: &mut Context, direction: Direction, sync_cursor: bool, movement: Movement) {
let view = view!(cx.editor);
let offset = view.inner_height();
scroll(cx, offset, Direction::Backward, false);
scroll_impl(cx, offset, direction, sync_cursor, movement);
}

fn page_down(cx: &mut Context) {
let view = view!(cx.editor);
let offset = view.inner_height();
scroll(cx, offset, Direction::Forward, false);
fn page_up(cx: &mut Context) {
scroll_page(
cx,
Direction::Backward,
/*sync_cursor*/ false,
Movement::Move,
);
}

fn half_page_up(cx: &mut Context) {
let view = view!(cx.editor);
let offset = view.inner_height() / 2;
scroll(cx, offset, Direction::Backward, false);
fn extend_page_up(cx: &mut Context) {
scroll_page(
cx,
Direction::Backward,
/*sync_cursor*/ false,
Movement::Extend,
);
}

fn half_page_down(cx: &mut Context) {
let view = view!(cx.editor);
let offset = view.inner_height() / 2;
scroll(cx, offset, Direction::Forward, false);
fn page_down(cx: &mut Context) {
scroll_page(
cx,
Direction::Forward,
/*sync_cursor*/ false,
Movement::Move,
);
}

fn extend_page_down(cx: &mut Context) {
scroll_page(
cx,
Direction::Forward,
/*sync_cursor*/ false,
Movement::Extend,
);
}

fn page_cursor_up(cx: &mut Context) {
let view = view!(cx.editor);
let offset = view.inner_height();
scroll(cx, offset, Direction::Backward, true);
scroll_page(
cx,
Direction::Backward,
/*sync_cursor*/ true,
Movement::Move,
);
}

fn extend_page_cursor_up(cx: &mut Context) {
scroll_page(
cx,
Direction::Backward,
/*sync_cursor*/ true,
Movement::Extend,
);
}

fn page_cursor_down(cx: &mut Context) {
let view = view!(cx.editor);
let offset = view.inner_height();
scroll(cx, offset, Direction::Forward, true);
scroll_page(
cx,
Direction::Forward,
/*sync_cursor*/ true,
Movement::Move,
);
}

fn page_cursor_half_up(cx: &mut Context) {
fn extend_page_cursor_down(cx: &mut Context) {
scroll_page(
cx,
Direction::Forward,
/*sync_cursor*/ true,
Movement::Extend,
);
}

fn scroll_half_page(cx: &mut Context, direction: Direction, sync_cursor: bool, movement: Movement) {
let view = view!(cx.editor);
let offset = view.inner_height() / 2;
scroll(cx, offset, Direction::Backward, true);
scroll_impl(cx, offset, direction, sync_cursor, movement);
}

fn half_page_up(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Backward,
/*sync_cursor*/ false,
Movement::Move,
);
}

fn extend_half_page_up(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Backward,
/*sync_cursor*/ false,
Movement::Extend,
);
}

fn half_page_down(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Forward,
/*sync_cursor*/ false,
Movement::Move,
);
}

fn extend_half_page_down(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Forward,
/*sync_cursor*/ false,
Movement::Extend,
);
}

fn page_cursor_half_up(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Backward,
/*sync_cursor*/ true,
Movement::Move,
);
}

fn extend_page_cursor_half_up(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Backward,
/*sync_cursor*/ true,
Movement::Extend,
);
}

fn page_cursor_half_down(cx: &mut Context) {
let view = view!(cx.editor);
let offset = view.inner_height() / 2;
scroll(cx, offset, Direction::Forward, true);
scroll_half_page(
cx,
Direction::Forward,
/*sync_cursor*/ true,
Movement::Move,
);
}

fn extend_page_cursor_half_down(cx: &mut Context) {
scroll_half_page(
cx,
Direction::Forward,
/*sync_cursor*/ true,
Movement::Extend,
);
}

#[allow(deprecated)]
Expand Down
17 changes: 17 additions & 0 deletions helix-term/src/keymap/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,23 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
"j" => extend_line_down,
"w" => extend_to_word,
},

"C-b" | "pageup" => extend_page_up,
"C-f" | "pagedown" => extend_page_down,
"C-u" => extend_page_cursor_half_up,
"C-d" => extend_page_cursor_half_down,
"z" => { "View"
"C-b" | "pageup" => extend_page_up,
"C-f" | "pagedown" => extend_page_down,
"C-u" | "backspace" => extend_page_cursor_half_up,
"C-d" | "space" => extend_page_cursor_half_down,
},
"Z" => { "View" sticky=true
"C-b" | "pageup" => extend_page_up,
"C-f" | "pagedown" => extend_page_down,
"C-u" | "backspace" => extend_page_cursor_half_up,
"C-d" | "space" => extend_page_cursor_half_down,
},
}));
let insert = keymap!({ "Insert mode"
"esc" => normal_mode,
Expand Down