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

Switch LSP prompts to use a non-blocking toast (#8312)

Browse source 
This fixes a major degradation in usability that some users ran into.

Fixes https://github.com/zed-industries/zed/issues/8255 
Fixes https://github.com/zed-industries/zed/issues/8229

Release Notes:

- Switch from using platform prompts to toasts for LSP prompts.
([8255](https://github.com/zed-industries/zed/issues/8255),
[8229](https://github.com/zed-industries/zed/issues/8229))

<img width="583" alt="Screenshot 2024-02-23 at 2 40 05 PM"
src="https://github.com/zed-industries/zed/assets/2280405/1bfc027b-b7a8-4563-88b6-020e47869668">

Co-authored-by: Marshall <marshall@zed.dev>
This commit is contained in:
Mikayla Maki 2024-02-23 15:18:32 -08:00 • committed by GitHub
parent d993dd3b2c
commit cab8b5a9a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 145 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

107
crates/workspace/src/notifications.rs
View file

@ -1,10 +1,14 @@
use crate::{Toast, Workspace};
use collections::HashMap;
use gpui::{
AnyView, AppContext, AsyncWindowContext, DismissEvent, Entity, EntityId, EventEmitter, Global,
PromptLevel, Render, Task, View, ViewContext, VisualContext, WindowContext,
svg, AnyView, AppContext, AsyncWindowContext, DismissEvent, Entity, EntityId, EventEmitter,
Global, PromptLevel, Render, Task, View, ViewContext, VisualContext, WindowContext,
};
use language::DiagnosticSeverity;
use std::{any::TypeId, ops::DerefMut};
use ui::prelude::*;
use util::ResultExt;
pub fn init(cx: &mut AppContext) {
cx.set_global(NotificationTracker::new());
@ -168,6 +172,105 @@ impl Workspace {
}
}
pub struct LanguageServerPrompt {
request: Option<project::LanguageServerPromptRequest>,
}
impl LanguageServerPrompt {
pub fn new(request: project::LanguageServerPromptRequest) -> Self {
Self {
request: Some(request),
}
}
async fn select_option(this: View<Self>, ix: usize, mut cx: AsyncWindowContext) {
util::async_maybe!({
let potential_future = this.update(&mut cx, |this, _| {
this.request.take().map(|request| request.respond(ix))
});
potential_future? // App Closed
.ok_or_else(|| anyhow::anyhow!("Response already sent"))?
.await
.ok_or_else(|| anyhow::anyhow!("Stream already closed"))?;
this.update(&mut cx, |_, cx| cx.emit(DismissEvent))?;
anyhow::Ok(())
})
.await
.log_err();
}
}
impl Render for LanguageServerPrompt {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
let Some(request) = &self.request else {
return div().id("language_server_prompt_notification");
};
h_flex()
.id("language_server_prompt_notification")
.elevation_3(cx)
.items_start()
.p_2()
.gap_2()
.w_full()
.child(
v_flex()
.overflow_hidden()
.child(
h_flex()
.children(
match request.level {
PromptLevel::Info => None,
PromptLevel::Warning => Some(DiagnosticSeverity::WARNING),
PromptLevel::Critical => Some(DiagnosticSeverity::ERROR),
}
.map(|severity| {
svg()
.size(cx.text_style().font_size)
.flex_none()
.mr_1()
.map(|icon| {
if severity == DiagnosticSeverity::ERROR {
icon.path(IconName::ExclamationTriangle.path())
.text_color(Color::Error.color(cx))
} else {
icon.path(IconName::ExclamationTriangle.path())
.text_color(Color::Warning.color(cx))
}
})
}),
)
.child(
Label::new(format!("{}:", request.lsp_name))
.size(LabelSize::Default),
),
)
.child(Label::new(request.message.to_string()))
.children(request.actions.iter().enumerate().map(|(ix, action)| {
let this_handle = cx.view().clone();
ui::Button::new(ix, action.title.clone())
.size(ButtonSize::Large)
.on_click(move |_, cx| {
let this_handle = this_handle.clone();
cx.spawn(|cx| async move {
LanguageServerPrompt::select_option(this_handle, ix, cx).await
})
.detach()
})
})),
)
.child(
ui::IconButton::new("close", ui::IconName::Close)
.on_click(cx.listener(|_, _, cx| cx.emit(gpui::DismissEvent))),
)
}
}
impl EventEmitter<DismissEvent> for LanguageServerPrompt {}
pub mod simple_message_notification {
use gpui::{
div, DismissEvent, EventEmitter, InteractiveElement, ParentElement, Render, SharedString,

30
crates/workspace/src/workspace.rs
View file

@ -59,7 +59,10 @@ use std::{
any::TypeId,
borrow::Cow,
cell::RefCell,
cmp, env,
cmp,
collections::hash_map::DefaultHasher,
env,
hash::{Hash, Hasher},
path::{Path, PathBuf},
rc::Rc,
sync::{atomic::AtomicUsize, Arc, Weak},
@ -579,24 +582,13 @@ impl Workspace {
}),
project::Event::LanguageServerPrompt(request) => {
let request = request.clone();
let mut hasher = DefaultHasher::new();
request.message.as_str().hash(&mut hasher);
let id = hasher.finish();
cx.spawn(|_, mut cx| async move {
let messages = request
.actions
.iter()
.map(|action| action.title.as_str())
.collect::<Vec<_>>();
let index = cx
.update(|cx| {
cx.prompt(request.level, "", Some(&request.message), &messages)
})?
.await?;
request.respond(index).await;
Result::<(), anyhow::Error>::Ok(())
})
.detach()
this.show_notification(id as usize, cx, |cx| {
cx.new_view(|_| notifications::LanguageServerPrompt::new(request.clone()))
});
}
_ => {}
@ -2766,7 +2758,7 @@ impl Workspace {
.z_index(100)
.right_3()
.bottom_3()
.w_96()
.w_112()
.h_full()
.flex()
.flex_col()