Implement "Goto last modification" command #1067
Conversation
ath3
force-pushed
the
goto-last-mod
branch
2 times, most recently
from
9dd941a
to
9e8f277
Compare
helix-core/src/history.rs
Outdated
| @@ -133,6 +133,18 @@ impl History { | |||
| Some(&self.revisions[last_child.get()].transaction) | |||
| } | |||
|
|
|||
| pub fn last_edit_pos(&mut self) -> Option<usize> { | |||
| let current_revision = &self.revisions[self.current]; | |||
| if let Some(op) = ¤t_revision.transaction.changes().changes.first() { | |||
There was a problem hiding this comment.
Hmm so this is why I didn't implement this yet, first change is not necessarily what we want.
There was a problem hiding this comment.
Though I guess we do store the original selection for the revert. Use current_revision.inversion's primary_index to find the matching change (if current_revision.selection.len() == changes.len(), otherwise fallback onto .first)
| @@ -96,7 +96,7 @@ pub struct Document { | |||
| // It can be used as a cell where we will take it out to get some parts of the history and put | |||
| // it back as it separated from the edits. We could split out the parts manually but that will | |||
| // be more troublesome. | |||
| history: Cell<History>, | |||
| pub history: Cell<History>, | |||
There was a problem hiding this comment.
Let's instead expose a history method that derefs the cell into &History. We don't want it to be externally mutatable
There was a problem hiding this comment.
Cell can be mutated with an immutable reference.
helix-view/src/document.rs
Outdated
| @@ -782,6 +782,11 @@ impl Document { | |||
| success | |||
| } | |||
|
|
|||
| // Get reference to history | |||
| pub fn history(&self) -> Option<&History> { | |||
| unsafe { self.history.as_ptr().as_ref() } | |||
There was a problem hiding this comment.
Ah I see, it's using a Cell, not RefCell so you can't return a reference here. Yeah let's avoid unsafe and use your original version with pub history instead 👍🏻
helix-core/src/history.rs
Outdated
| if let Some(tsel) = current_revision.transaction.selection() { | ||
| if let Some(isel) = current_revision.inversion.selection() { |
There was a problem hiding this comment.
We only need the inversion here which will always have a selection (what the selection was in the document before the change was made).
pub fn last_edit_pos(&self) -> Option<usize> {
let current_revision = &self.revisions[self.current];
let primary_selection = current_revision.inversion.selection().expect("inversion always contains a selection").primary();
let (from, _to, fragment) = current_revision.transaction
.changes_iter()
.find(|range| range.overlaps(primary_selection)) // find a change that matches the primary selection
.or(current_revision.transaction.changes_iter()) // or use the first change
.unwrap();
let len = fragment.map(|text| text.chars.count()).unwrap_or(0);
Some(from + len)
}
ath3
force-pushed
the
goto-last-mod
branch
2 times, most recently
from
a4d26a4
to
d62297e
Compare
helix-core/src/history.rs
Outdated
| .transaction | ||
| .changes_iter() | ||
| // find a change that matches the primary selection | ||
| .find(|range| crate::Range::new(range.0, range.1).overlaps(&primary_selection)) |
There was a problem hiding this comment.
| .find(|range| crate::Range::new(range.0, range.1).overlaps(&primary_selection)) | |
| .find(|(from, to, _fragment)| crate::Range::new(from, to).overlaps(&primary_selection)) |
A bit clearer
helix-core/src/history.rs
Outdated
| let pos = current_revision | ||
| .transaction | ||
| .changes() | ||
| .map_pos(to, crate::Assoc::After); |
There was a problem hiding this comment.
Import Assoc at the top of the file
Another comand i use frequently: Goto last modification (Goto last buffer change in kakoune).
The key is g+; because g+. repeated last insertion.