TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Inform when reaching undo/redo bounds (#981)

Browse source 
* Inform when reaching undo/redo bounds

* `Already at oldest change` when undo fails
* `Already at newest change` when redo fails

* Add missing `the`
This commit is contained in:
Omnikar 2021-11-04 21:20:06 -04:00 • committed by GitHub
parent aa4d0b4646
commit 51b4d35dce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
helix-term/src/commands.rs
View file

@ -3679,13 +3679,19 @@ pub mod insert {
fn undo(cx: &mut Context) { fn undo(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let view_id = view.id; let view_id = view.id;
doc.undo(view_id); let success = doc.undo(view_id);
if !success {
cx.editor.set_status("Already at oldest change".to_owned());
}
} }
fn redo(cx: &mut Context) { fn redo(cx: &mut Context) {
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let view_id = view.id; let view_id = view.id;
doc.redo(view_id); let success = doc.redo(view_id);
if !success {
cx.editor.set_status("Already at newest change".to_owned());
}
} }
// Yank / Paste // Yank / Paste

10
helix-view/src/document.rs
View file

@ -704,8 +704,8 @@ impl Document {
success success
} }
/// Undo the last modification to the [`Document`]. /// Undo the last modification to the [`Document`]. Returns whether the undo was successful.
pub fn undo(&mut self, view_id: ViewId) { pub fn undo(&mut self, view_id: ViewId) -> bool {
let mut history = self.history.take(); let mut history = self.history.take();
let success = if let Some(transaction) = history.undo() { let success = if let Some(transaction) = history.undo() {
self.apply_impl(transaction, view_id) self.apply_impl(transaction, view_id)
@ -718,10 +718,11 @@ impl Document {
// reset changeset to fix len // reset changeset to fix len
self.changes = ChangeSet::new(self.text()); self.changes = ChangeSet::new(self.text());
} }
success
} }
/// Redo the last modification to the [`Document`]. /// Redo the last modification to the [`Document`]. Returns whether the redo was sucessful.
pub fn redo(&mut self, view_id: ViewId) { pub fn redo(&mut self, view_id: ViewId) -> bool {
let mut history = self.history.take(); let mut history = self.history.take();
let success = if let Some(transaction) = history.redo() { let success = if let Some(transaction) = history.redo() {
self.apply_impl(transaction, view_id) self.apply_impl(transaction, view_id)
@ -734,6 +735,7 @@ impl Document {
// reset changeset to fix len // reset changeset to fix len
self.changes = ChangeSet::new(self.text()); self.changes = ChangeSet::new(self.text());
} }
success
} }
pub fn savepoint(&mut self) { pub fn savepoint(&mut self) {