suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent multiple code action popups

pull/1636/head
Gokul Soumya 2022-02-08 09:01:24 +05:30 committed by Blaž Hrastnik
parent 547c3ecd0c
commit 5995568c1d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
helix-term/src/commands.rs
View File

@ -2792,11 +2792,7 @@ pub mod cmd {
Box::new(move |editor: &mut Editor, compositor: &mut Compositor| { Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
let contents = ui::Markdown::new(contents, editor.syn_loader.clone()); let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
let popup = Popup::new("hover", contents); let popup = Popup::new("hover", contents);
if let Some(doc_popup) = compositor.find_id("hover") { compositor.replace_or_push("hover", Box::new(popup));
*doc_popup = popup;
} else {
compositor.push(Box::new(popup));
}
}); });
Ok(call) Ok(call)
}; };
@ -3537,7 +3533,7 @@ pub fn code_action(cx: &mut Context) {
vertical: 1, vertical: 1,
horizontal: 1, horizontal: 1,
}); });
compositor.push(Box::new(popup)) compositor.replace_or_push("code-action", Box::new(popup));
}, },
) )
} }
@ -5465,11 +5461,7 @@ fn hover(cx: &mut Context) {
let contents = let contents =
ui::Markdown::new(contents, editor.syn_loader.clone()).style_group("hover"); ui::Markdown::new(contents, editor.syn_loader.clone()).style_group("hover");
let popup = Popup::new("hover", contents); let popup = Popup::new("hover", contents);
if let Some(doc_popup) = compositor.find_id("hover") { compositor.replace_or_push("hover", Box::new(popup));
*doc_popup = popup;
} else {
compositor.push(Box::new(popup));
}
} }
}, },
); );

10
helix-term/src/compositor.rs
View File

@ -126,6 +126,16 @@ impl Compositor {
self.layers.push(layer); self.layers.push(layer);
} }
/// Replace a component that has the given `id` with the new layer and if
/// no component is found, push the layer normally.
pub fn replace_or_push(&mut self, id: &'static str, layer: Box<dyn Component>) {
if let Some(component) = self.find_id(id) {
*component = layer;
} else {
self.push(layer)
}
}
pub fn pop(&mut self) -> Option<Box<dyn Component>> { pub fn pop(&mut self) -> Option<Box<dyn Component>> {
self.layers.pop() self.layers.pop()
} }