From f3bbb9c7e7cf09903e2ab3b4783a765dcb3d3a0f Mon Sep 17 00:00:00 2001
From: Dan Lowe <dan@tangledhelix.com>
Date: Wed, 6 Nov 2024 23:12:31 -0500
Subject: [PATCH] Class refactor needed to prepare for #42

In order for enum.auto() to work here using StrEnum, the class
can only contain these auto-string variables; the dicts for
color definitions have to be separated.
---
 src/guiguts/highlight.py | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/guiguts/highlight.py b/src/guiguts/highlight.py
index 710cb528..e75f557e 100644
--- a/src/guiguts/highlight.py
+++ b/src/guiguts/highlight.py
@@ -1,16 +1,21 @@
 """Highlight functionality."""
 
-from enum import auto
+from enum import auto, StrEnum
 
 from guiguts.maintext import maintext
 from guiguts.preferences import preferences, PrefKey
 from guiguts.utilities import IndexRange
 
 
-class Highlight:
-    """Global highlight settings."""
+class HighlightTag(StrEnum):
+    """Global highlight tag settings."""
 
-    TAG_QUOTEMARK = str(auto())
+    QUOTEMARK = auto()
+    SPOTLIGHT = auto()
+
+
+class HighlightColors:
+    """Global highlight color settings."""
 
     # Possible future enhancement:
     #
@@ -22,15 +27,13 @@ class Highlight:
     # Unclear what we should/will do in GG2 with themes & dark mode support.
 
     # Must be a definition for each available theme
-    COLORS_QUOTEMARK = {
+    QUOTEMARK = {
         "Light": {"bg": "#a08dfc", "fg": "black"},
         "Dark": {"bg": "#a08dfc", "fg": "white"},
         "Default": {"bg": "#a08dfc", "fg": "black"},
     }
 
-    TAG_SPOTLIGHT = str(auto())
-
-    COLORS_SPOTLIGHT = {
+    SPOTLIGHT = {
         "Light": {"bg": "orange", "fg": "black"},
         "Dark": {"bg": "orange", "fg": "white"},
         "Default": {"bg": "orange", "fg": "black"},
@@ -65,14 +68,14 @@ def highlight_selection(
 
 def remove_highlights() -> None:
     """Remove active highlights."""
-    maintext().tag_delete(Highlight.TAG_QUOTEMARK)
+    maintext().tag_delete(HighlightTag.QUOTEMARK)
 
 
 def highlight_quotemarks(pat: str) -> None:
     """Highlight quote marks in current selection which match a pattern."""
     remove_highlights()
-    _highlight_configure_tag(Highlight.TAG_QUOTEMARK, Highlight.COLORS_QUOTEMARK)
-    highlight_selection(pat, Highlight.TAG_QUOTEMARK, regexp=True)
+    _highlight_configure_tag(HighlightTag.QUOTEMARK, HighlightColors.QUOTEMARK)
+    highlight_selection(pat, HighlightTag.QUOTEMARK, regexp=True)
 
 
 def highlight_single_quotes() -> None:
@@ -104,15 +107,15 @@ def spotlight_range(spot_range: IndexRange) -> None:
         spot_range: The range to be spotlighted.
     """
     remove_spotlights()
-    _highlight_configure_tag(Highlight.TAG_SPOTLIGHT, Highlight.COLORS_SPOTLIGHT)
+    _highlight_configure_tag(HighlightTag.SPOTLIGHT, HighlightColors.SPOTLIGHT)
     maintext().tag_add(
-        Highlight.TAG_SPOTLIGHT, spot_range.start.index(), spot_range.end.index()
+        HighlightTag.SPOTLIGHT, spot_range.start.index(), spot_range.end.index()
     )
 
 
 def remove_spotlights() -> None:
     """Remove active spotlights"""
-    maintext().tag_delete(Highlight.TAG_SPOTLIGHT)
+    maintext().tag_delete(HighlightTag.SPOTLIGHT)
 
 
 def _highlight_configure_tag(