Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply transactions to views lazily #4912

Merged
merged 9 commits into from
Nov 29, 2022
Merged

Apply transactions to views lazily #4912

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f91f18
Remove eager application of transactions to all views
the-mikedavis Nov 27, 2022
4a2e828
Revert "Don't apply transactions to Views in undo/redo"
the-mikedavis Nov 27, 2022
58753e6
Sync changes between doc and view on switch
the-mikedavis Nov 27, 2022
42f2ff0
Remove calls to View::apply in undo/redo/earlier/later
the-mikedavis Nov 27, 2022
97f2557
Sync changes with view in undo/redo/earlier/later
the-mikedavis Nov 27, 2022
121585b
Call View::apply within Document::append_changes_to_history
the-mikedavis Nov 27, 2022
6e9408f
Use lowest common ancestor search in History::changes_since
the-mikedavis Nov 27, 2022
0cfc5d0
Add a test case for undo/redo across splits
the-mikedavis Nov 27, 2022
dc1899e
Sync all document changes on view focus
the-mikedavis Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use lowest common ancestor search in History::changes_since
  • Loading branch information
@the-mikedavis
the-mikedavis committed Nov 27, 2022
commit 6e9408f442a67b9bfda532082d9abb23b9dd24d6
34 changes: 9 additions & 25 deletions helix-core/src/history.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,32 +122,16 @@ impl History {
/// Returns the changes since the given revision composed into a transaction.
/// Returns None if there are no changes between the current and given revisions.
pub fn changes_since(&self, revision: usize) -> Option<Transaction> {
use std::cmp::Ordering::*;
let lca = self.lowest_common_ancestor(revision, self.current);
let up = self.path_up(revision, lca);
let down = self.path_up(self.current, lca);
let up_txns = up
.iter()
.rev()
.map(|&n| self.revisions[n].inversion.clone());
let down_txns = down.iter().map(|&n| self.revisions[n].transaction.clone());

match revision.cmp(&self.current) {
Equal => None,
Less => {
let mut child = self.revisions[revision].last_child?.get();
let mut transaction = self.revisions[child].transaction.clone();
while child != self.current {
child = self.revisions[child].last_child?.get();
transaction = transaction.compose(self.revisions[child].transaction.clone());
}
Some(transaction)
}
Greater => {
let mut inversion = self.revisions[revision].inversion.clone();
let mut parent = self.revisions[revision].parent;
while parent != self.current {
parent = self.revisions[parent].parent;
if parent == 0 {
return None;
}
inversion = inversion.compose(self.revisions[parent].inversion.clone());
}
Some(inversion)
}
}
up_txns.chain(down_txns).reduce(|acc, tx| tx.compose(acc))
}

/// Undo the last edit.
Expand Down