aboutsummaryrefslogtreecommitdiff
path: root/helix-view/src
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-03-24 09:01:26 +0000
committerBlaž Hrastnik2021-03-24 09:01:26 +0000
commit8657c57cf2d56b9a89e2f780675426f4c78df48b (patch)
treecbcda261837dc2bcd3be1e060a6452186fd0acc9 /helix-view/src
parent4b176cadedfe47fe542e9c6e2defd34b3af984df (diff)
Trivial jumplist implementation.
Diffstat (limited to 'helix-view/src')
-rw-r--r--helix-view/src/editor.rs4
-rw-r--r--helix-view/src/view.rs42
2 files changed, 45 insertions, 1 deletions
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 33e380a0..08dd4d00 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -90,7 +90,11 @@ impl Editor {
use crate::tree::Layout;
match action {
Action::Replace => {
+ let view = self.view();
+ let jump = (view.doc, self.documents[view.doc].selection().clone());
+
let view = self.view_mut();
+ view.jumps.push(jump);
view.doc = id;
view.first_line = 0;
return Ok(id);
diff --git a/helix-view/src/view.rs b/helix-view/src/view.rs
index 5f6a0456..7a239d4a 100644
--- a/helix-view/src/view.rs
+++ b/helix-view/src/view.rs
@@ -5,17 +5,56 @@ use std::borrow::Cow;
use crate::{Document, DocumentId, ViewId};
use helix_core::{
graphemes::{grapheme_width, RopeGraphemes},
- Position, RopeSlice,
+ Position, RopeSlice, Selection,
};
use tui::layout::Rect;
pub const PADDING: usize = 5;
+type Jump = (DocumentId, Selection);
+
+pub struct JumpList {
+ jumps: Vec<Jump>,
+ current: usize,
+}
+
+impl JumpList {
+ pub fn new(initial: Jump) -> Self {
+ Self {
+ jumps: vec![initial],
+ current: 0,
+ }
+ }
+
+ pub fn push(&mut self, jump: Jump) {
+ self.jumps.truncate(self.current + 1);
+ self.jumps.push(jump);
+ self.current += 1;
+ }
+
+ pub fn forward(&mut self, count: usize) -> Option<&Jump> {
+ if self.current + count < self.jumps.len() {
+ self.current += count;
+ return self.jumps.get(self.current);
+ }
+ None
+ }
+
+ pub fn backward(&mut self, count: usize) -> Option<&Jump> {
+ if self.current.checked_sub(count).is_some() {
+ self.current -= count;
+ return self.jumps.get(self.current);
+ }
+ None
+ }
+}
+
pub struct View {
pub id: ViewId,
pub doc: DocumentId,
pub first_line: usize,
pub area: Rect,
+ pub jumps: JumpList,
}
impl View {
@@ -25,6 +64,7 @@ impl View {
doc,
first_line: 0,
area: Rect::default(), // will get calculated upon inserting into tree
+ jumps: JumpList::new((doc, Selection::point(0))), // TODO: use actual sel
};
Ok(view)