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

Improve the LSP log UI

Browse source
This commit is contained in:
Max Brunsfeld 2023-04-21 17:03:37 -07:00
parent 6ed7f1281f
commit e7cb996044
1 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

67
crates/lsp_log/src/lsp_log.rs
View file

@ -123,7 +123,7 @@ impl LogStore {
hash_map::Entry::Occupied(entry) => entry.into_mut(), hash_map::Entry::Occupied(entry) => entry.into_mut(),
hash_map::Entry::Vacant(entry) => entry.insert(LogStoreProject { hash_map::Entry::Vacant(entry) => entry.insert(LogStoreProject {
servers: HashMap::default(), servers: HashMap::default(),
_subscription: cx.observe_release(&project, move |this, _, cx| { _subscription: cx.observe_release(&project, move |this, _, _| {
this.projects.remove(&weak_project); this.projects.remove(&weak_project);
}), }),
}), }),
@ -161,7 +161,7 @@ impl LogStore {
&mut self, &mut self,
project: &ModelHandle<Project>, project: &ModelHandle<Project>,
server_id: LanguageServerId, server_id: LanguageServerId,
cx: &mut ModelContext<Self>, _: &mut ModelContext<Self>,
) { ) {
let project = project.downgrade(); let project = project.downgrade();
if let Some(store) = self.projects.get_mut(&project) { if let Some(store) = self.projects.get_mut(&project) {
@ -333,6 +333,8 @@ impl View for LspLogToolbarItemView {
} }
}); });
enum Menu {}
Stack::new() Stack::new()
.with_child(Self::render_language_server_menu_header( .with_child(Self::render_language_server_menu_header(
current_server, current_server,
@ -343,26 +345,32 @@ impl View for LspLogToolbarItemView {
.with_children(if self.menu_open { .with_children(if self.menu_open {
Some( Some(
Overlay::new( Overlay::new(
Flex::column() MouseEventHandler::<Menu, _>::new(0, cx, move |_, cx| {
.with_children(language_servers.into_iter().filter_map( Flex::column()
|(id, name, worktree_id, logging_enabled)| { .with_children(language_servers.into_iter().filter_map(
Self::render_language_server_menu_item( |(id, name, worktree_id, logging_enabled)| {
id, Self::render_language_server_menu_item(
name, id,
worktree_id, name,
logging_enabled, worktree_id,
Some(id) == current_server_id, logging_enabled,
&self.project, Some(id) == current_server_id,
&theme, &self.project,
cx, &theme,
) cx,
}, )
)) },
.contained() ))
.with_style(theme.contacts_popover.container) .contained()
.constrained() .with_style(theme.context_menu.container)
.with_width(400.) .constrained()
.with_height(400.), .with_width(400.)
.with_height(400.)
})
.on_down_out(MouseButton::Left, |_, this, cx| {
this.menu_open = false;
cx.notify()
}),
) )
.with_fit_mode(OverlayFitMode::SwitchAnchor) .with_fit_mode(OverlayFitMode::SwitchAnchor)
.with_anchor_corner(AnchorCorner::TopLeft) .with_anchor_corner(AnchorCorner::TopLeft)
@ -406,10 +414,10 @@ impl LspLogToolbarItemView {
log_view.toggle_logging_for_server(id, enabled, cx); log_view.toggle_logging_for_server(id, enabled, cx);
if !enabled && Some(id) == log_view.current_server_id { if !enabled && Some(id) == log_view.current_server_id {
log_view.current_server_id = None; log_view.current_server_id = None;
log_view.editor = None;
cx.notify(); cx.notify();
} }
}); });
self.menu_open = false;
} }
cx.notify(); cx.notify();
} }
@ -440,7 +448,15 @@ impl LspLogToolbarItemView {
Some(format!("{} - ({})", server_name.0, worktree.root_name()).into()) Some(format!("{} - ({})", server_name.0, worktree.root_name()).into())
}) })
.unwrap_or_else(|| "No server selected".into()); .unwrap_or_else(|| "No server selected".into());
Label::new(label, theme.context_menu.item.default.label.clone()) Label::new(
label,
theme
.context_menu
.item
.style_for(state, false)
.label
.clone(),
)
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, view, cx| { .on_click(MouseButton::Left, move |_, view, cx| {
@ -481,7 +497,8 @@ impl LspLogToolbarItemView {
this.toggle_logging_for_server(id, enabled, cx); this.toggle_logging_for_server(id, enabled, cx);
}, },
)) ))
.with_child(Label::new(label, item_style.label.clone())) .with_child(Label::new(label, item_style.label.clone()).aligned().left())
.align_children_center()
.contained() .contained()
.with_style(item_style.container) .with_style(item_style.container)
}) })