Merge 61bd5b60af into 7ebf650029

helix-term/src/ui/editor.rs

@@ -1515,7 +1515,24 @@ impl Component for EditorView {
                 EventResult::Consumed(callback)
             }
 
-            Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
+            Event::Mouse(mouse_event) => {
+                // let completion swallow the event if necessary
+                if let Some(completion) = &mut self.completion {
+                    // use a fake context here
+                    let mut cx = Context {
+                        editor: cx.editor,
+                        jobs: cx.jobs,
+                        scroll: None,
+                    };
+
+                    if let EventResult::Consumed(callback) = completion.handle_event(event, &mut cx)
+                    {
+                        return EventResult::Consumed(callback);
+                    }
+                }
+
+                self.handle_mouse_event(mouse_event, &mut cx)
+            }
             Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
             Event::FocusGained => {
                 self.terminal_focused = true;

helix-term/src/ui/menu.rs

@@ -6,7 +6,12 @@ use tui::{buffer::Buffer as Surface, widgets::Table};
 
 pub use tui::widgets::{Cell, Row};
 
-use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
+use helix_view::{
+    editor::SmartTabConfig,
+    graphics::Rect,
+    input::{MouseEvent, MouseEventKind},
+    Editor,
+};
 use tui::layout::Constraint;
 
 pub trait Item: Sync + Send + 'static {
@@ -191,6 +196,26 @@ impl<T: Item> Menu<T> {
     pub fn len(&self) -> usize {
         self.matches.len()
     }
+
+    fn handle_mouse_event(
+        &mut self,
+        &MouseEvent { kind, .. }: &MouseEvent,
+        cx: &mut Context,
+    ) -> EventResult {
+        match kind {
+            MouseEventKind::ScrollDown => {
+                self.move_down();
+                (self.callback_fn)(cx.editor, self.selection(), MenuEvent::Update);
+                EventResult::Consumed(None)
+            }
+            MouseEventKind::ScrollUp => {
+                self.move_up();
+                (self.callback_fn)(cx.editor, self.selection(), MenuEvent::Update);
+                EventResult::Consumed(None)
+            }
+            _ => EventResult::Ignored(None),
+        }
+    }
 }
 
 impl<T: Item + PartialEq> Menu<T> {
@@ -210,6 +235,7 @@ impl<T: Item + 'static> Component for Menu<T> {
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let event = match event {
             Event::Key(event) => *event,
+            Event::Mouse(event) => return self.handle_mouse_event(event, cx),
             _ => return EventResult::Ignored(None),
         };
 

helix-term/src/ui/popup.rs

@@ -217,25 +217,17 @@ impl<T: Component> Popup<T> {
         }
     }
 
-    fn handle_mouse_event(
+    fn handle_mouse_event(&mut self, event: &MouseEvent, cx: &mut Context) -> EventResult {
-        &mut self,
+        let mouse_is_within_popup = event.column >= self.area.left()
-        &MouseEvent {
+            && event.column < self.area.right()
-            kind,
+            && event.row >= self.area.top()
-            column: x,
+            && event.row < self.area.bottom();
-            row: y,
-            ..
-        }: &MouseEvent,
-    ) -> EventResult {
-        let mouse_is_within_popup = x >= self.area.left()
-            && x < self.area.right()
-            && y >= self.area.top()
-            && y < self.area.bottom();
 
         if !mouse_is_within_popup {
             return EventResult::Ignored(None);
         }
 
-        match kind {
+        match event.kind {
             MouseEventKind::ScrollDown if self.has_scrollbar => {
                 self.scroll_half_page_down();
                 EventResult::Consumed(None)
@@ -244,7 +236,7 @@ impl<T: Component> Popup<T> {
                 self.scroll_half_page_up();
                 EventResult::Consumed(None)
             }
-            _ => EventResult::Ignored(None),
+            _ => self.contents.handle_event(&Event::Mouse(*event), cx),
         }
     }
 }
@@ -253,7 +245,7 @@ impl<T: Component> Component for Popup<T> {
     fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
         let key = match event {
             Event::Key(event) => *event,
-            Event::Mouse(event) => return self.handle_mouse_event(event),
+            Event::Mouse(mouse_event) => return self.handle_mouse_event(mouse_event, cx),
             Event::Resize(_, _) => {
                 // TODO: calculate inner area, call component's handle_event with that area
                 return EventResult::Ignored(None);