mirror of
https://github.com/zed-industries/zed.git
synced 2025-01-12 05:15:00 +00:00
Update git diff base when synchronizing a guest's buffers
This commit is contained in:
parent
529ccbda3a
commit
95098e4f29
1 changed files with 18 additions and 11 deletions
|
@ -5189,20 +5189,27 @@ impl Project {
|
|||
|
||||
let operations = buffer.serialize_ops(Some(remote_version), cx);
|
||||
let client = this.client.clone();
|
||||
let file = buffer.file().cloned();
|
||||
if let Some(file) = buffer.file() {
|
||||
client
|
||||
.send(proto::UpdateBufferFile {
|
||||
project_id,
|
||||
buffer_id: buffer_id as u64,
|
||||
file: Some(file.to_proto()),
|
||||
})
|
||||
.log_err();
|
||||
}
|
||||
|
||||
client
|
||||
.send(proto::UpdateDiffBase {
|
||||
project_id,
|
||||
buffer_id: buffer_id as u64,
|
||||
diff_base: buffer.diff_base().map(Into::into),
|
||||
})
|
||||
.log_err();
|
||||
|
||||
cx.background()
|
||||
.spawn(
|
||||
async move {
|
||||
if let Some(file) = file {
|
||||
client
|
||||
.send(proto::UpdateBufferFile {
|
||||
project_id,
|
||||
buffer_id: buffer_id as u64,
|
||||
file: Some(file.to_proto()),
|
||||
})
|
||||
.log_err();
|
||||
}
|
||||
|
||||
let operations = operations.await;
|
||||
for chunk in split_operations(operations) {
|
||||
client
|
||||
|
|
Loading…
Reference in a new issue