Implement X
as extend selection to line bounds
This commit is contained in:
parent
d02bbb7bae
commit
a4e28c6927
|
@ -73,6 +73,7 @@ ### Selection manipulation
|
||||||
| `Alt-;` | Flip selection cursor and anchor |
|
| `Alt-;` | Flip selection cursor and anchor |
|
||||||
| `%` | Select entire file |
|
| `%` | Select entire file |
|
||||||
| `x` | Select current line, if already selected, extend to next line |
|
| `x` | Select current line, if already selected, extend to next line |
|
||||||
|
| `X` | Extend selection to line bounds (line-wise selection) |
|
||||||
| | Expand selection to parent syntax node TODO: pick a key |
|
| | Expand selection to parent syntax node TODO: pick a key |
|
||||||
| `J` | join lines inside selection |
|
| `J` | join lines inside selection |
|
||||||
| `K` | keep selections matching the regex TODO: overlapped by hover help |
|
| `K` | keep selections matching the regex TODO: overlapped by hover help |
|
||||||
|
|
|
@ -200,6 +200,7 @@ pub fn name(&self) -> &'static str {
|
||||||
extend_search_next,
|
extend_search_next,
|
||||||
search_selection,
|
search_selection,
|
||||||
extend_line,
|
extend_line,
|
||||||
|
extend_to_line_bounds,
|
||||||
delete_selection,
|
delete_selection,
|
||||||
change_selection,
|
change_selection,
|
||||||
collapse_selection,
|
collapse_selection,
|
||||||
|
@ -1021,6 +1022,26 @@ fn extend_line(cx: &mut Context) {
|
||||||
doc.set_selection(view.id, Selection::single(start, end));
|
doc.set_selection(view.id, Selection::single(start, end));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn extend_to_line_bounds(cx: &mut Context) {
|
||||||
|
let (view, doc) = current!(cx.editor);
|
||||||
|
|
||||||
|
let text = doc.text();
|
||||||
|
let selection = doc.selection(view.id).transform(|range| {
|
||||||
|
let start = text.line_to_char(text.char_to_line(range.from()));
|
||||||
|
let end = text
|
||||||
|
.line_to_char(text.char_to_line(range.to()) + 1)
|
||||||
|
.saturating_sub(1);
|
||||||
|
|
||||||
|
if range.anchor < range.head {
|
||||||
|
Range::new(start, end)
|
||||||
|
} else {
|
||||||
|
Range::new(end, start)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
doc.set_selection(view.id, selection);
|
||||||
|
}
|
||||||
|
|
||||||
fn delete_selection_impl(reg: &mut Register, doc: &mut Document, view_id: ViewId) {
|
fn delete_selection_impl(reg: &mut Register, doc: &mut Document, view_id: ViewId) {
|
||||||
// first yank the selection
|
// first yank the selection
|
||||||
let values: Vec<String> = doc
|
let values: Vec<String> = doc
|
||||||
|
|
|
@ -209,7 +209,9 @@ fn default() -> Keymaps {
|
||||||
alt!(';') => Command::flip_selections,
|
alt!(';') => Command::flip_selections,
|
||||||
key!('%') => Command::select_all,
|
key!('%') => Command::select_all,
|
||||||
key!('x') => Command::extend_line,
|
key!('x') => Command::extend_line,
|
||||||
// extend_to_whole_line, crop_to_whole_line
|
key!('x') => Command::extend_line,
|
||||||
|
key!('X') => Command::extend_to_line_bounds,
|
||||||
|
// crop_to_whole_line
|
||||||
|
|
||||||
|
|
||||||
key!('m') => Command::match_mode,
|
key!('m') => Command::match_mode,
|
||||||
|
|
Loading…
Reference in a new issue