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

Select diagnostic range in goto_*_diag commands (#4713)

Browse Source 
This roughly matches the behavior of the diagnostic picker: when
jumping to a diagnostic with `[d`/`]d`/`[D`/`]D`, the range of the
diagnostic is selected instead of the start point.
pull/5164/head
Michael Davis 2 years ago committed by GitHub
parent 2a60de74f9
commit 42ad1a9e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File

50
helix-term/src/commands.rs
Unescape Escape View File

@ -2789,35 +2789,28 @@ fn exit_select_mode(cx: &mut Context) {
} }
} }
fn goto_pos(editor: &mut Editor, pos: usize) {
let (view, doc) = current!(editor);
push_jump(view, doc);
doc.set_selection(view.id, Selection::point(pos));
align_view(doc, view, Align::Center);
}
fn goto_first_diag(cx: &mut Context) { fn goto_first_diag(cx: &mut Context) {
let doc = doc!(cx.editor); let (view, doc) = current!(cx.editor);
let pos = match doc.diagnostics().first() { let selection = match doc.diagnostics().first() {
Some(diag) => diag.range.start, Some(diag) => Selection::single(diag.range.start, diag.range.end),
None => return, None => return,
}; };
goto_pos(cx.editor, pos); doc.set_selection(view.id, selection);
align_view(doc, view, Align::Center);
} }
fn goto_last_diag(cx: &mut Context) { fn goto_last_diag(cx: &mut Context) {
let doc = doc!(cx.editor); let (view, doc) = current!(cx.editor);
let pos = match doc.diagnostics().last() { let selection = match doc.diagnostics().last() {
Some(diag) => diag.range.start, Some(diag) => Selection::single(diag.range.start, diag.range.end),
None => return, None => return,
}; };
goto_pos(cx.editor, pos); doc.set_selection(view.id, selection);
align_view(doc, view, Align::Center);
} }
fn goto_next_diag(cx: &mut Context) { fn goto_next_diag(cx: &mut Context) {
let editor = &mut cx.editor; let (view, doc) = current!(cx.editor);
let (view, doc) = current!(editor);
let cursor_pos = doc let cursor_pos = doc
.selection(view.id) .selection(view.id)
@ -2830,17 +2823,16 @@ fn goto_next_diag(cx: &mut Context) {
.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 pos = match diag { let selection = match diag {
Some(diag) => diag.range.start, Some(diag) => Selection::single(diag.range.start, diag.range.end),
None => return, None => return,
}; };
doc.set_selection(view.id, selection);
goto_pos(editor, pos); align_view(doc, view, Align::Center);
} }
fn goto_prev_diag(cx: &mut Context) { fn goto_prev_diag(cx: &mut Context) {
let editor = &mut cx.editor; let (view, doc) = current!(cx.editor);
let (view, doc) = current!(editor);
let cursor_pos = doc let cursor_pos = doc
.selection(view.id) .selection(view.id)
@ -2854,12 +2846,14 @@ fn goto_prev_diag(cx: &mut Context) {
.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 pos = match diag { let selection = match diag {
Some(diag) => diag.range.start, // NOTE: the selection is reversed because we're jumping to the
// previous diagnostic.
Some(diag) => Selection::single(diag.range.end, diag.range.start),
None => return, None => return,
}; };
doc.set_selection(view.id, selection);
goto_pos(editor, pos); align_view(doc, view, Align::Center);
} }
fn goto_first_change(cx: &mut Context) { fn goto_first_change(cx: &mut Context) {

Write Preview
Loading…
Cancel
Save