git.iko.soy/helix
on master help sign in
Avoid modifying jumplist until jumping to ref (#2670)

When a goto command is cancelled, the jumplist should remain unchanged. This commit delays saving the current selection to the jumplist until jumping to a reference.

commitd24ca66dbb5e67ed609f7b2cf11abaee05beaef7 authoryzwduck <yzwduck@gmail.com> dateSun 5 Jun 2022, 18:44 (4 years ago) parent026241c
1 file changed+1−2
compare with master
unifiedsplit
helix-term/src/commands/lsp.rs+1−2
helix-term/src/commands/lsp.rs+1−2
@@ -485,8 +485,6 @@ fn goto_impl(
485485 locations: Vec<lsp::Location>,
486486 offset_encoding: OffsetEncoding,
487487) {
488− push_jump(editor);
489−
490488 let cwdir = std::env::current_dir().expect("couldn't determine current directory");
491489
492490 match locations.as_slice() {
@@ -520,6 +518,7 @@ fn goto_impl(
520518 format!("{}:{}", file, line).into()
521519 },
522520 move |cx, location, action| {
521+ push_jump(cx.editor);
523522 jump_to_location(cx.editor, location, offset_encoding, action)
524523 },
525524 move |_editor, location| Some(location_to_file_location(location)),