mirror of
https://github.com/zed-industries/zed.git
synced 2024-10-26 00:19:46 +00:00
Avoid calling edits_since in apply_diff
This commit is contained in:
parent
a890b8f3b7
commit
1deff43639
1 changed files with 4 additions and 1 deletions
|
@ -1199,7 +1199,10 @@ impl Buffer {
|
|||
|
||||
pub fn apply_diff(&mut self, diff: Diff, cx: &mut ModelContext<Self>) -> Option<TransactionId> {
|
||||
if self.version == diff.base_version {
|
||||
self.apply_non_conflicting_portion_of_diff(diff, cx)
|
||||
self.start_transaction();
|
||||
self.text.set_line_ending(diff.line_ending);
|
||||
self.edit(diff.edits, None, cx);
|
||||
self.end_transaction(cx)
|
||||
} else {
|
||||
return None;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue