From b4cd0382051f804ab52938b4f984c9fd4866dcfc Mon Sep 17 00:00:00 2001
From: Jeremy Wootten <jeremywootten@gmail.com>
Date: Fri, 5 Jul 2024 14:46:47 +0000
Subject: [PATCH] Limit selection highlighting to single line

---
 .../highlight-word-selection.vala             | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/plugins/highlight-word-selection/highlight-word-selection.vala b/plugins/highlight-word-selection/highlight-word-selection.vala
index 5896b5d43..e038ea685 100644
--- a/plugins/highlight-word-selection/highlight-word-selection.vala
+++ b/plugins/highlight-word-selection/highlight-word-selection.vala
@@ -53,17 +53,24 @@ public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Peas.A
     public void on_selection_changed (ref Gtk.TextIter start, ref Gtk.TextIter end) {
         var window_search_context = main_window != null ? main_window.search_bar.search_context : null;
 
+        if (current_search_context != null) {
+            // Cancel existing search
+            current_search_context.set_highlight (false);
+            current_search_context = null;
+        }
+
+
+        // Perform plugin selection highlighting only when there is no ongoing and successful search in the window search bar
         if (window_search_context == null ||
             window_search_context.settings.search_text == "" ||
             window_search_context.get_occurrences_count () == 0) {
-            // Perform plugin selection when there is no ongoing and successful search 
-            current_search_context = new Gtk.SourceSearchContext (
-                (Gtk.SourceBuffer)current_source.buffer,
-                null
-            );
-            current_search_context.settings.search_text = "";
-            current_search_context.set_highlight (false);
 
+            // Only highlight if selection is over a single line
+            if (start.get_line () != end.get_line ()) {
+                return;
+            }
+
+            // Determine word(s) to be highlighted
             var original_start = start.copy ();
 
             // Ignore leading space
@@ -124,12 +131,13 @@ public class Scratch.Plugins.HighlightSelectedWords : Peas.ExtensionBase, Peas.A
                 return;
             }
 
+            current_search_context = new Gtk.SourceSearchContext (
+                (Gtk.SourceBuffer)current_source.buffer,
+                null
+            );
+
             current_search_context.settings.search_text = selected_text;
             current_search_context.set_highlight (true);
-        } else if (current_search_context != null) {
-            // Cancel existing search
-            current_search_context.set_highlight (false);
-            current_search_context = null;
         }
     }