zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 17:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

lsp: Fill in version for SnippetEdit from drive (#17360)

Browse Source 
Related to #16680 

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-09-04 19:31:32 +02:00 committed by GitHub
parent 30b2133336
commit 8d4bdd6dc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/project/src/lsp_store.rs
View File

@ -5715,11 +5715,10 @@ impl LspStore {
}
}
if !snippet_edits.is_empty() {
if let Some(buffer_version) = op.text_document.version {
let buffer_id = buffer_to_edit.read(cx).remote_id();
// Check if the edit that triggered that edit has been made by this participant.
let most_recent_edit = this
.buffer_snapshots
let buffer_id = buffer_to_edit.read(cx).remote_id();
let version = if let Some(buffer_version) = op.text_document.version
{
this.buffer_snapshots
.get(&buffer_id)
.and_then(|server_to_snapshots| {
let all_snapshots = server_to_snapshots
@ -5731,17 +5730,22 @@ impl LspStore {
.ok()
.and_then(|index| all_snapshots.get(index))
})
.and_then(|lsp_snapshot| {
let version = lsp_snapshot.snapshot.version();
version.iter().max_by_key(|timestamp| timestamp.value)
});
if let Some(most_recent_edit) = most_recent_edit {
cx.emit(LspStoreEvent::SnippetEdit {
buffer_id,
edits: snippet_edits,
most_recent_edit,
});
}
.map(|lsp_snapshot| lsp_snapshot.snapshot.version())
} else {
Some(buffer_to_edit.read(cx).saved_version())
};
let most_recent_edit = version.and_then(|version| {
version.iter().max_by_key(|timestamp| timestamp.value)
});
// Check if the edit that triggered that edit has been made by this participant.
if let Some(most_recent_edit) = most_recent_edit {
cx.emit(LspStoreEvent::SnippetEdit {
buffer_id,
edits: snippet_edits,
most_recent_edit,
});
}
}