mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Don't increment clock for initial insertion

Browse source
This commit is contained in:
Antonio Scandurra 2021-06-02 12:13:08 +02:00
parent 5f28fdb8f7
commit 11a3b8c5ce
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zed/src/editor/buffer.rs
View file

@ -462,12 +462,10 @@ impl Buffer {
let mut fragments = SumTree::new(); let mut fragments = SumTree::new();
let visible_text = Rope::from(history.base_text.as_ref()); let visible_text = Rope::from(history.base_text.as_ref());
let mut local_clock = time::Local::new(replica_id);
if visible_text.len() > 0 { if visible_text.len() > 0 {
fragments.push( fragments.push(
Fragment { Fragment {
insertion_id: local_clock.tick(), insertion_id: Default::default(),
len: visible_text.len(), len: visible_text.len(),
deletions: Default::default(), deletions: Default::default(),
max_undos: Default::default(), max_undos: Default::default(),
@ -496,7 +494,7 @@ impl Buffer {
deferred_ops: OperationQueue::new(), deferred_ops: OperationQueue::new(),
deferred_replicas: HashSet::default(), deferred_replicas: HashSet::default(),
replica_id, replica_id,
local_clock, local_clock: time::Local::new(replica_id),
lamport_clock: time::Lamport::new(replica_id), lamport_clock: time::Lamport::new(replica_id),
}; };
result.reparse(cx); result.reparse(cx);