Highlight queries and scroll to them

Author: RJ722

rednotebook/data.py

@@ -207,9 +207,7 @@ def search(self, queries, tags):
                     # We don't want to show search results from the text matching
                     # this date.
                     queries.remove(word)
-                    results.append(
-                        get_text_with_dots(self.text, 0, TEXT_RESULT_LENGTH)
-                    )
+                    results.append(get_text_with_dots(self.text, 0, TEXT_RESULT_LENGTH))
             text_result = self.search_in_text(queries)
             if text_result:
                 results.append(text_result)

rednotebook/gui/browser.py

@@ -52,7 +52,7 @@ def load_html(self, html):
     class HtmlView(Browser):
         def __init__(self):
             Browser.__init__(self)
-            self.search_text = ""
+            self.search_queries = []
             self.connect("load-changed", self.on_load_changed)
             self.show_all()
 

rednotebook/gui/editor.py

@@ -44,7 +44,7 @@ def __init__(self, day_text_view):
 
         self._connect_undo_signals()
 
-        self.search_text = ""
+        self.search_queries = []
 
         # spell checker
         self._spell_checker = None

rednotebook/gui/main_window.py

@@ -814,17 +814,29 @@ def _get_buffer(self, key, text):
     def _get_buffer_for_day(self, day):
         return self._get_buffer(day.date, day.text)
 
+    def scroll_to_text(self, queries):
+        """
+        Finds the first non-date word in queries, and passes it on to
+        `Editor.scroll_to_text`.
+        """
+        for word in queries:
+            # If word matches date, it probably is not present in the text.
+            if word in str(self.day):
+                pass
+            else:
+                super().scroll_to_text(word)
+
     def show_day(self, new_day):
         # Show new day
         self.day = new_day
         buf = self._get_buffer_for_day(new_day)
         self.replace_buffer(buf)
         self.day_text_view.grab_focus()
 
-        if self.search_text:
+        if self.search_queries:
             # If a search is currently made, scroll to the text and return.
-            GObject.idle_add(self.scroll_to_text, self.search_text)
-            GObject.idle_add(self.highlight, self.search_text)
+            GObject.idle_add(self.scroll_to_text, self.search_queries)
+            GObject.idle_add(self.highlight, self.search_queries)
             return
 
     def show_template(self, title, text):

rednotebook/gui/search.py

@@ -65,14 +65,7 @@ def search(self, search_text):
 
         # Scroll to query.
         if queries:
-            # TODO: Decide where to scroll to?
-            # To scroll to the first match, we'd need to search for the first
-            # occurrence of each query, and scroll to the first one. But I am
-            # not sure if that is ideal performance-wise.
-            # Would it make sense to inspect the data returned by
-            # `self.journal.search` -- which will have information on what
-            # query matched fist, and it's index?
-            pass
+            self.main_window.day_text_field.scroll_to_text(tags + queries)
 
         self.main_window.search_tree_view.update_data(queries, tags)