Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid extra LSP log events

Browse source
This commit is contained in:
Kirill Bulatov 2023-09-20 11:27:52 +03:00
parent 7bc4f0bc11
commit 82010b68c1
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/language_tools/src/lsp_log.rs
View file

@ -190,14 +190,17 @@ impl LogStore {
.ok();
})
});
let this = cx.weak_handle();
let weak_project = project.downgrade();
server_state._lsp_logs_subscription = server.map(|server| {
let server_id = server.server_id();
server.on_notification::<lsp::notification::LogMessage, _>({
move |params, mut cx| {
if let Some(project) = weak_project.upgrade(&cx) {
project.update(&mut cx, |_, cx| {
cx.emit(project::Event::LanguageServerLog(server_id, params.message))
if let Some((project, this)) =
weak_project.upgrade(&mut cx).zip(this.upgrade(&mut cx))
{
this.update(&mut cx, |this, cx| {
this.add_language_server_log(&project, server_id, &params.message, cx);
});
}
}
@ -309,19 +312,15 @@ impl LogStore {
language_server_id: LanguageServerId,
io_kind: IoKind,
message: &str,
cx: &mut AppContext,
cx: &mut ModelContext<Self>,
) -> Option<()> {
let is_received = match io_kind {
IoKind::StdOut => true,
IoKind::StdIn => false,
IoKind::StdErr => {
let project = project.upgrade(cx)?;
project.update(cx, |_, cx| {
cx.emit(project::Event::LanguageServerLog(
language_server_id,
format!("stderr: {}\n", message.trim()),
))
});
let message = format!("stderr: {}\n", message.trim());
self.add_language_server_log(&project, language_server_id, &message, cx);
return Some(());
}
};