oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix circular reference issue around PopoverMenu again (#44084)

Browse Source 
Follow up to https://github.com/zed-industries/zed/pull/42351

Release Notes:

- N/A
This commit is contained in:
feeiyu
2025-12-03 21:34:01 +02:00
committed by GitHub
parent 4ef8433396
commit 92dcfdef76
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/language_tools/src/lsp_log_view.rs
+2 -2
View File
@@ -937,7 +937,7 @@ impl Render for LspLogToolbarItemView {
})
.collect();
let log_toolbar_view = cx.entity();
let log_toolbar_view = cx.weak_entity();
let lsp_menu = PopoverMenu::new("LspLogView")
.anchor(Corner::TopLeft)
@@ -1021,7 +1021,7 @@ impl Render for LspLogToolbarItemView {
.icon_color(Color::Muted),
)
.menu(move |window, cx| {
let log_toolbar_view = log_toolbar_view.clone();
let log_toolbar_view = log_toolbar_view.upgrade()?;
let log_view = log_view.clone();
Some(ContextMenu::build(window, cx, move |this, window, _| {
this.entry(
crates/language_tools/src/syntax_tree_view.rs
+9 -5
View File
@@ -614,13 +614,14 @@ impl SyntaxTreeToolbarItemView {
let active_layer = buffer_state.active_layer.clone()?;
let active_buffer = buffer_state.buffer.read(cx).snapshot();
let view = cx.entity();
let view = cx.weak_entity();
Some(
PopoverMenu::new("Syntax Tree")
.trigger(Self::render_header(&active_layer))
.menu(move |window, cx| {
ContextMenu::build(window, cx, |mut menu, window, _| {
ContextMenu::build(window, cx, |mut menu, _, _| {
for (layer_ix, layer) in active_buffer.syntax_layers().enumerate() {
let view = view.clone();
menu = menu.entry(
format!(
"{} {}",
@@ -628,9 +629,12 @@ impl SyntaxTreeToolbarItemView {
format_node_range(layer.node())
),
None,
window.handler_for(&view, move |view, window, cx| {
view.select_layer(layer_ix, window, cx);
}),
move |window, cx| {
view.update(cx, |view, cx| {
view.select_layer(layer_ix, window, cx);
})
.ok();
},
);
}
menu