Signature completion overlap

helix-term/src/compositor.rs

@@ -71,6 +71,15 @@ pub trait Component: Any + AnyComponent {
     fn id(&self) -> Option<&'static str> {
         None
     }
+
+    fn area(&self) -> Option<Rect> {
+        None
+    }
+
+    /// If multiple components share the same level, then only the most recent one is rendered.
+    fn level(&self) -> Option<usize> {
+        None
+    }
 }
 
 pub struct Compositor {
@@ -137,7 +146,24 @@ impl Compositor {
 
         // propagate events through the layers until we either find a layer that consumes it or we
         // run out of layers (event bubbling)
-        for layer in self.layers.iter_mut().rev() {
+        let components_by_level: Vec<(usize, Rect)> = self
+            .layers
+            .iter()
+            .filter_map(|component| Some((component.level()?, component.area()?)))
+            .collect();
+        let layers = self.layers.iter_mut().rev().filter(|component| {
+            match (component.level(), component.area()) {
+                (Some(level), Some(area)) => components_by_level
+                    .iter()
+                    .rev()
+                    .find(|(other_level, other_area)| {
+                        *other_level == level && other_area.intersects(area)
+                    })
+                    .is_none(),
+                _ => false,
+            }
+        });
+        for layer in layers {
             match layer.handle_event(event, cx) {
                 EventResult::Consumed(Some(callback)) => {
                     callbacks.push(callback);
@@ -163,7 +189,27 @@ impl Compositor {
     }
 
     pub fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
-        for layer in &mut self.layers {
+        let components_by_level: Vec<(usize, Rect)> = self
+            .layers
+            .iter()
+            .filter_map(|component| Some((component.level()?, component.area()?)))
+            .collect();
+        let layers = self
+            .layers
+            .iter_mut()
+            .rev()
+            .filter(|component| match (component.level(), component.area()) {
+                (Some(level), Some(area)) => components_by_level
+                    .iter()
+                    .rev()
+                    .find(|(other_level, other_area)| {
+                        *other_level == level && other_area.intersects(area)
+                    })
+                    .is_none(),
+                _ => false,
+            })
+            .rev();
+        for layer in layers {
             layer.render(area, surface, cx);
         }
     }

helix-term/src/ui/completion.rs

@@ -484,4 +484,8 @@ impl Component for Completion {
             markdown_doc.render(area, surface, cx);
         }
     }
+
+    fn level(&self) -> Option<usize> {
+        Some(0)
+    }
 }

helix-term/src/ui/popup.rs

@@ -23,6 +23,8 @@ pub struct Popup<T: Component> {
     ignore_escape_key: bool,
     id: &'static str,
     has_scrollbar: bool,
+    level: Option<usize>,
+    area: Rect,
 }
 
 impl<T: Component> Popup<T> {
@@ -39,9 +41,15 @@ impl<T: Component> Popup<T> {
             ignore_escape_key: false,
             id,
             has_scrollbar: true,
+            level: None,
+            area: Rect::default(),
         }
     }
 
+    pub fn set_level(mut self, level: usize) {
+        self.level = Some(level);
+    }
+
     pub fn position(mut self, pos: Option<Position>) -> Self {
         self.position = pos;
         self
@@ -231,7 +239,7 @@ impl<T: Component> Component for Popup<T> {
 
         // clip to viewport
         let area = viewport.intersection(Rect::new(rel_x, rel_y, self.size.0, self.size.1));
-
+        self.area = area;
         // clear area
         let background = cx.editor.theme.get("ui.popup");
         surface.clear_with(area, background);
@@ -274,6 +282,10 @@ impl<T: Component> Component for Popup<T> {
         }
     }
 
+    fn area(&self) -> Option<Rect> {
+        Some(self.area)
+    }
+
     fn id(&self) -> Option<&'static str> {
         Some(self.id)
     }