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

lsp: Add support for ShowMessage notification (#14012)

Browse source 
When "one newer language" sends these messages, "one newer editor" will
display a pop-up for users to see. :)

Related to https://github.com/gleam-lang/gleam/issues/3274


![image](https://github.com/zed-industries/zed/assets/24362066/00d2c168-59f0-4033-91c8-af29c47516b3)

Release Notes:

- A certain popular language recently had to work around a missing LSP
notification. This has been fixed
This commit is contained in:
Piotr Osiewicz 2024-07-09 20:12:05 +02:00 • committed by GitHub
parent 8cfa690271
commit 09e7b481b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3676,29 +3676,26 @@ impl Project {
let this = this.clone(); let this = this.clone();
let name = name.to_string(); let name = name.to_string();
async move { async move {
if let Some(actions) = params.actions { let actions = params.actions.unwrap_or_default();
let (tx, mut rx) = smol::channel::bounded(1); let (tx, mut rx) = smol::channel::bounded(1);
let request = LanguageServerPromptRequest { let request = LanguageServerPromptRequest {
level: match params.typ { level: match params.typ {
lsp::MessageType::ERROR => PromptLevel::Critical, lsp::MessageType::ERROR => PromptLevel::Critical,
lsp::MessageType::WARNING => PromptLevel::Warning, lsp::MessageType::WARNING => PromptLevel::Warning,
_ => PromptLevel::Info, _ => PromptLevel::Info,
}, },
message: params.message, message: params.message,
actions, actions,
response_channel: tx, response_channel: tx,
lsp_name: name.clone(), lsp_name: name.clone(),
}; };
if let Ok(_) = this.update(&mut cx, |_, cx| { if let Ok(_) = this.update(&mut cx, |_, cx| {
cx.emit(Event::LanguageServerPrompt(request)); cx.emit(Event::LanguageServerPrompt(request));
}) { }) {
let response = rx.next().await; let response = rx.next().await;
Ok(response) Ok(response)
} else {
Ok(None)
}
} else { } else {
Ok(None) Ok(None)
} }
@ -3753,7 +3750,33 @@ impl Project {
} }
}) })
.detach(); .detach();
language_server
.on_notification::<lsp::notification::ShowMessage, _>({
let this = this.clone();
let name = name.to_string();
move |params, mut cx| {
let this = this.clone();
let name = name.to_string();
let (tx, _) = smol::channel::bounded(1);
let request = LanguageServerPromptRequest {
level: match params.typ {
lsp::MessageType::ERROR => PromptLevel::Critical,
lsp::MessageType::WARNING => PromptLevel::Warning,
_ => PromptLevel::Info,
},
message: params.message,
actions: vec![],
response_channel: tx,
lsp_name: name.clone(),
};
let _ = this.update(&mut cx, |_, cx| {
cx.emit(Event::LanguageServerPrompt(request));
});
}
})
.detach();
language_server language_server
.on_notification::<lsp::notification::Progress, _>(move |params, mut cx| { .on_notification::<lsp::notification::Progress, _>(move |params, mut cx| {
if let Some(this) = this.upgrade() { if let Some(this) = this.upgrade() {