Show regex error as tooltip for commit author filter

ArekPiekarz · Jun 19, 2022 · 13249bd · 13249bd
1 parent a9273ad
commit 13249bd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/src/commit_log_author_filter_entry.rs b/src/commit_log_author_filter_entry.rs
@@ -1,6 +1,7 @@
 use crate::event::{Event, handleUnknown, IEventHandler, Sender, Source};
 use crate::gui_element_provider::GuiElementProvider;
 
+use anyhow::Error;
 use gtk::EditableSignals;
 use gtk::prelude::IsA;
 use gtk::traits::CssProviderExt;
@@ -15,6 +16,7 @@ const VALID_INPUT_CSS: &[u8] = "".as_bytes();
 
 pub(crate) struct CommitLogAuthorFilterEntry
 {
+    widget: gtk::Entry,
     cssProvider: gtk::CssProvider
 }
 
@@ -23,8 +25,8 @@ impl IEventHandler for CommitLogAuthorFilterEntry
     fn handle(&mut self, source: Source, event: &Event)
     {
         match event {
-            Event::InvalidTextInputted => self.onInvalidRegexInputted(),
-            Event::ValidTextInputted => self.onValidRegexInputted(),
+            Event::InvalidTextInputted(error) => self.onInvalidRegexInputted(error),
+            Event::ValidTextInputted          => self.onValidRegexInputted(),
             _ => handleUnknown(source, event)
         }
     }
@@ -38,17 +40,19 @@ impl CommitLogAuthorFilterEntry
         let cssProvider = setupCss(&widget);
         connectWidget(&widget, sender.clone());
         setupRegexButton(guiElementProvider, sender);
-        Self{cssProvider}
+        Self{widget, cssProvider}
     }
 
-    fn onInvalidRegexInputted(&self)
+    fn onInvalidRegexInputted(&self, error: &Error)
     {
         self.cssProvider.load_from_data(INVALID_INPUT_CSS).unwrap();
+        self.widget.set_tooltip_text(Some(&error.to_string()));
     }
 
     fn onValidRegexInputted(&self)
     {
         self.cssProvider.load_from_data(VALID_INPUT_CSS).unwrap();
+        self.widget.set_tooltip_text(None);
     }
 }
 

diff --git a/src/commit_log_model_filter.rs b/src/commit_log_model_filter.rs
@@ -3,7 +3,7 @@ use crate::event::{Event, handleUnknown, IEventHandler, Sender, Source};
 use crate::gui_element_provider::GuiElementProvider;
 use crate::text_filter::TextFilter;
 
-use anyhow::Result;
+use anyhow::{Error, Result};
 use gtk::traits::TreeModelExt;
 use gtk::traits::TreeModelFilterExt;
 use std::cell::RefCell;
@@ -61,7 +61,7 @@ impl CommitLogModelFilter
     {
         match result {
             Ok(()) => self.onChangeSucceeded(),
-            Err(_) => self.onChangeFailed()
+            Err(e) => self.onChangeFailed(e)
         }
     }
 
@@ -74,11 +74,11 @@ impl CommitLogModelFilter
         self.requestRefilter();
     }
 
-    fn onChangeFailed(&mut self)
+    fn onChangeFailed(&mut self, error: Error)
     {
         if self.state == State::Success {
             self.state = State::Failure;
-            self.sendInvalidTextInputted();
+            self.sendInvalidTextInputted(error);
         }
     }
 
@@ -98,9 +98,9 @@ impl CommitLogModelFilter
         self.sender.send((Source::CommitLogModelFilter, Event::ValidTextInputted)).unwrap();
     }
 
-    fn sendInvalidTextInputted(&self)
+    fn sendInvalidTextInputted(&self, error: Error)
     {
-        self.sender.send((Source::CommitLogModelFilter, Event::InvalidTextInputted)).unwrap();
+        self.sender.send((Source::CommitLogModelFilter, Event::InvalidTextInputted(error))).unwrap();
     }
 }
 

diff --git a/src/event.rs b/src/event.rs
@@ -1,6 +1,7 @@
 use crate::commit_message::CommitMessage;
 use crate::file_change::{FileChange, FileChangeUpdate};
 
+use anyhow::Error;
 use gtk::{gdk, glib};
 
 
@@ -66,7 +67,7 @@ pub enum Event
 
     // text entry
     TextEntered(String),
-    InvalidTextInputted,
+    InvalidTextInputted(Error),
     ValidTextInputted,
 }
 

diff --git a/src/gui.rs b/src/gui.rs
@@ -167,7 +167,7 @@ fn setupDispatching(gui: GuiObjects, mut repository: Rc<RefCell<Repository>>, re
         (S::CommitLogAuthorFilterRegexButton, E::Toggled(_))              => commitLogModelFilter.handle(source, &event),
         (S::CommitLogModelFilter,             E::RefilterRequested)       => (&mut commitLogView, &mut commitLogModelFilter).handle(source, &event),
         (S::CommitLogModelFilter,             E::RefilterEnded)           => commitLogView.handle(source, &event),
-        (S::CommitLogModelFilter,             E::InvalidTextInputted)     => commitLogAuthorFilterEntry.handle(source, &event),
+        (S::CommitLogModelFilter,             E::InvalidTextInputted(_))  => commitLogAuthorFilterEntry.handle(source, &event),
         (S::CommitLogModelFilter,             E::ValidTextInputted)       => commitLogAuthorFilterEntry.handle(source, &event),
         (S::CommitLogView,                    E::CommitSelected(_))       => commitDiffView.handle(source, &event),
         (S::CommitLogView,                    E::CommitUnselected)        => commitDiffView.handle(source, &event),