andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-23 01:46:18 +04:00
Code Issues Projects Releases Wiki Activity

Fix jumplist jumps, keep the selection on vsplit.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-05-08 18:25:19 +09:00
parent caf4349925
commit ed827e993f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2167,6 +2167,7 @@ pub fn jump_forward(cx: &mut Context) {
if let Some((id, selection)) = view.jumps.forward(count) { if let Some((id, selection)) = view.jumps.forward(count) {
view.doc = *id; view.doc = *id;
let selection = selection.clone(); let selection = selection.clone();
let (view, doc) = cx.current(); // refetch doc
doc.set_selection(view.id, selection); doc.set_selection(view.id, selection);
align_view(doc, view, Align::Center); align_view(doc, view, Align::Center);
@ -2179,7 +2180,9 @@ pub fn jump_backward(cx: &mut Context) {
if let Some((id, selection)) = view.jumps.backward(count) { if let Some((id, selection)) = view.jumps.backward(count) {
view.doc = *id; view.doc = *id;
doc.set_selection(view.id, selection.clone()); let selection = selection.clone();
let (view, doc) = cx.current(); // refetch doc
doc.set_selection(view.id, selection);
align_view(doc, view, Align::Center); align_view(doc, view, Align::Center);
}; };
@ -2189,9 +2192,17 @@ pub fn jump_backward(cx: &mut Context) {
pub fn vsplit(cx: &mut Context) { pub fn vsplit(cx: &mut Context) {
use helix_view::editor::Action; use helix_view::editor::Action;
let id = cx.doc().id(); let (view, doc) = cx.current();
let id = doc.id();
let selection = doc.selection(view.id).clone();
let first_line = view.first_line;
cx.editor.switch(id, Action::VerticalSplit); cx.editor.switch(id, Action::VerticalSplit);
// match the selection in the previous view
let (view, doc) = cx.current();
view.first_line = first_line;
doc.set_selection(view.id, selection);
} }
pub fn space_mode(cx: &mut Context) { pub fn space_mode(cx: &mut Context) {