suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix repeat last motion for goto next/prev diagnostic (#9966)

pull/9973/head
Jaakko Paju 2024-03-23 08:25:08 +02:00 committed by GitHub
parent be307a4204
commit d5c2973cd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
book/src/keymap.md
View File

@ -49,7 +49,7 @@ Normal mode is the default mode when you launch helix. You can return to it from
| `T` | Find 'till previous char | `till_prev_char` | | `T` | Find 'till previous char | `till_prev_char` |
| `F` | Find previous char | `find_prev_char` | | `F` | Find previous char | `find_prev_char` |
| `G` | Go to line number `<n>` | `goto_line` | | `G` | Go to line number `<n>` | `goto_line` |
| `Alt-.` | Repeat last motion (`f`, `t` or `m`) | `repeat_last_motion` | | `Alt-.` | Repeat last motion (`f`, `t`, `m`, `[` or `]`) | `repeat_last_motion` |
| `Home` | Move to the start of the line | `goto_line_start` | | `Home` | Move to the start of the line | `goto_line_start` |
| `End` | Move to the end of the line | `goto_line_end` | | `End` | Move to the end of the line | `goto_line_end` |
| `Ctrl-b`, `PageUp` | Move page up | `page_up` | | `Ctrl-b`, `PageUp` | Move page up | `page_up` |

69
helix-term/src/commands.rs
View File

@ -3439,48 +3439,55 @@ fn goto_last_diag(cx: &mut Context) {
} }
fn goto_next_diag(cx: &mut Context) { fn goto_next_diag(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let motion = move |editor: &mut Editor| {
let (view, doc) = current!(editor);
let cursor_pos = doc let cursor_pos = doc
.selection(view.id) .selection(view.id)
.primary() .primary()
.cursor(doc.text().slice(..)); .cursor(doc.text().slice(..));
let diag = doc let diag = doc
.diagnostics() .diagnostics()
.iter() .iter()
.find(|diag| diag.range.start > cursor_pos) .find(|diag| diag.range.start > cursor_pos)
.or_else(|| doc.diagnostics().first()); .or_else(|| doc.diagnostics().first());
let selection = match diag { let selection = match diag {
Some(diag) => Selection::single(diag.range.start, diag.range.end), Some(diag) => Selection::single(diag.range.start, diag.range.end),
None => return, None => return,
};
doc.set_selection(view.id, selection);
}; };
doc.set_selection(view.id, selection);
cx.editor.apply_motion(motion);
} }
fn goto_prev_diag(cx: &mut Context) { fn goto_prev_diag(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let motion = move |editor: &mut Editor| {
let (view, doc) = current!(editor);
let cursor_pos = doc let cursor_pos = doc
.selection(view.id) .selection(view.id)
.primary() .primary()
.cursor(doc.text().slice(..)); .cursor(doc.text().slice(..));
let diag = doc let diag = doc
.diagnostics() .diagnostics()
.iter() .iter()
.rev() .rev()
.find(|diag| diag.range.start < cursor_pos) .find(|diag| diag.range.start < cursor_pos)
.or_else(|| doc.diagnostics().last()); .or_else(|| doc.diagnostics().last());
let selection = match diag { let selection = match diag {
// NOTE: the selection is reversed because we're jumping to the // NOTE: the selection is reversed because we're jumping to the
// previous diagnostic. // previous diagnostic.
Some(diag) => Selection::single(diag.range.end, diag.range.start), Some(diag) => Selection::single(diag.range.end, diag.range.start),
None => return, None => return,
};
doc.set_selection(view.id, selection);
}; };
doc.set_selection(view.id, selection); cx.editor.apply_motion(motion)
} }
fn goto_first_change(cx: &mut Context) { fn goto_first_change(cx: &mut Context) {