mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Report SelectionSet deletion operations correctly

Browse source
This commit is contained in:
Antonio Scandurra 2021-07-01 12:54:16 +02:00
parent c881c7f30f
commit da7bd8439b
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zed-rpc/proto/zed.proto
View file

@ -117,6 +117,10 @@ message Buffer {
repeated Operation.Edit history = 3;
}
message SelectionSet {
repeated Selection selections = 1;
}
message Selection {
uint64 id = 1;
Anchor start = 2;
@ -170,7 +174,7 @@ message Operation {
uint32 replica_id = 1;
uint32 local_timestamp = 2;
uint32 lamport_timestamp = 3;
repeated Selection selections = 4;
SelectionSet set = 4;
}
message SetActiveSelections {

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

@ -2427,8 +2427,8 @@ impl<'a> Into<proto::Operation> for &'a Operation {
replica_id: set_id.replica_id as u32,
local_timestamp: set_id.value,
lamport_timestamp: lamport_timestamp.value,
selections: selections.as_ref().map_or(Vec::new(), |selections| {
selections
set: selections.as_ref().map(|selections| proto::SelectionSet {
selections: selections
.iter()
.map(|selection| proto::Selection {
id: selection.id as u64,
@ -2436,7 +2436,7 @@ impl<'a> Into<proto::Operation> for &'a Operation {
end: Some((&selection.end).into()),
reversed: selection.reversed,
})
.collect()
.collect(),
}),
},
),
@ -2538,18 +2538,9 @@ impl TryFrom<proto::Operation> for Operation {
},
},
proto::operation::Variant::UpdateSelections(message) => {
Operation::UpdateSelections {
set_id: time::Lamport {
replica_id: message.replica_id as ReplicaId,
value: message.local_timestamp,
},
lamport_timestamp: time::Lamport {
replica_id: message.replica_id as ReplicaId,
value: message.lamport_timestamp,
},
selections: Some(
message
.selections
let selections = if let Some(set) = message.set {
Some(
set.selections
.into_iter()
.map(|selection| {
Ok(Selection {
@ -2566,9 +2557,21 @@ impl TryFrom<proto::Operation> for Operation {
goal: SelectionGoal::None,
})
})
.collect::<Result<Vec<_>, anyhow::Error>>()?
.into(),
),
.collect::<Result<Vec<_>, anyhow::Error>>()?,
)
} else {
None
};
Operation::UpdateSelections {
set_id: time::Lamport {
replica_id: message.replica_id as ReplicaId,
value: message.local_timestamp,
},
lamport_timestamp: time::Lamport {
replica_id: message.replica_id as ReplicaId,
value: message.lamport_timestamp,
},
selections: selections.map(Arc::from),
}
}
proto::operation::Variant::SetActiveSelections(message) => {