mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 10:59:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Move DidSaveTextDocument notification from Buffer to Project

Browse source
This commit is contained in:
Antonio Scandurra 2022-03-08 11:34:16 +01:00
parent 51d5ed48f0
commit 6662ba62a3
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/language/src/buffer.rs
View file

@ -691,26 +691,6 @@ impl Buffer {
self.file = Some(new_file);
self.file_update_count += 1;
}
if let Some((state, local_file)) = &self
.language_server
.as_ref()
.zip(self.file.as_ref().and_then(|f| f.as_local()))
{
cx.background()
.spawn(
state
.server
.notify::<lsp::notification::DidSaveTextDocument>(
lsp::DidSaveTextDocumentParams {
text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(local_file.abs_path(cx)).unwrap(),
},
text: None,
},
),
)
.detach()
}
cx.emit(Event::Saved);
cx.notify();
}

36
crates/project/src/project.rs
View file

@ -964,11 +964,37 @@ impl Project {
buffer_id: buffer.read(cx).remote_id(),
operations: vec![language::proto::serialize_operation(&operation)],
});
cx.foreground()
.spawn(async move {
request.await.log_err();
})
.detach();
cx.background().spawn(request).detach_and_log_err(cx);
}
}
BufferEvent::Saved => {
if let Some(file) = File::from_dyn(buffer.read(cx).file()) {
let worktree_id = file.worktree_id(cx);
if let Some(abs_path) = file.as_local().map(|file| file.abs_path(cx)) {
let text_document = lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(abs_path).unwrap(),
};
let mut notifications = Vec::new();
for ((lang_server_worktree_id, _), lang_server) in &self.language_servers {
if *lang_server_worktree_id != worktree_id {
continue;
}
notifications.push(
lang_server.notify::<lsp::notification::DidSaveTextDocument>(
lsp::DidSaveTextDocumentParams {
text_document: text_document.clone(),
text: None,
},
),
);
}
cx.background()
.spawn(futures::future::try_join_all(notifications))
.detach_and_log_err(cx);
}
}
}
_ => {}