move non-syntax tag highlighting out of ColorDelegator

This avoids ColorDelegator removing unrelated tags, specifically "stdin", when re-colorizing.
terryjreedy · Apr 28, 2021 · Aug 5, 2019 · Aug 23, 2019 · Aug 23, 2019 · Aug 24, 2019
commit 4040e26c4c1e2b46c731b97d6625ee35b454ccfc
diff --git a/Lib/idlelib/colorizer.py b/Lib/idlelib/colorizer.py
@@ -120,12 +120,10 @@ def LoadTagDefs(self):
             "BUILTIN": idleConf.GetHighlight(theme, "builtin"),
             "STRING": idleConf.GetHighlight(theme, "string"),
             "DEFINITION": idleConf.GetHighlight(theme, "definition"),
-            "SYNC": {'background':None,'foreground':None},
-            "TODO": {'background':None,'foreground':None},
+            "SYNC": {'background': None, 'foreground': None},
+            "TODO": {'background': None, 'foreground': None},
             "ERROR": idleConf.GetHighlight(theme, "error"),
-            # The following is used by ReplaceDialog:
-            "hit": idleConf.GetHighlight(theme, "hit"),
-            }
+        }
 
         if DEBUG: print('tagdefs',self.tagdefs)
 

diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
@@ -233,7 +233,7 @@ def activate_config_changes(self):
         """
         win_instances = self.parent.instance_dict.keys()
         for instance in win_instances:
-            instance.ResetColorizer()
+            instance.update_colors()
             instance.ResetFont()
             instance.set_notabs_indentwidth()
             instance.ApplyKeybindings()

diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
@@ -266,7 +266,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
         io.set_filename_change_hook(self.filename_change_hook)
         self.good_load = False
         self.set_indentation_params(False)
-        self.color = None # initialized below in self.ResetColorizer
+        self.color = None # initialized below in self.update_colors()
         self.code_context = None # optionally initialized later below
         self.line_numbers = None # optionally initialized later below
         if filename:
@@ -279,7 +279,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
                 io.set_filename(filename)
                 self.good_load = True
 
-        self.ResetColorizer()
+        self.update_colors()
         self.saved_change_hook()
         self.update_recent_files_list()
         self.load_extensions()
@@ -792,18 +792,40 @@ def _rmcolorizer(self):
         self.color = None
 
     def ResetColorizer(self):
-        "Update the color theme"
-        # Called from self.filename_change_hook and from configdialog.py
+        """Reset the syntax colorizer.
+
+        For example, this is called after filename changes, since the file
+        type can affect the highlighting.
+        """
         self._rmcolorizer()
         self._addcolorizer()
+
+    def update_colors(self):
+        """Update the color theme.
+
+        For example, this is called after highlighting config changes.
+        """
         EditorWindow.color_config(self.text)
 
+        tag_colors = self.get_tag_colors()
+        for tag, tag_colors_config in tag_colors.items():
+            self.text.tag_configure(tag, **tag_colors_config)
+
+        self.ResetColorizer()
+
         if self.code_context is not None:
             self.code_context.update_highlight_colors()
 
         if self.line_numbers is not None:
             self.line_numbers.update_colors()
 
+    def get_tag_colors(self):
+        theme = idleConf.CurrentTheme()
+        return {
+            # The following is used by ReplaceDialog:
+            "hit": idleConf.GetHighlight(theme, "hit"),
+        }
+
     IDENTCHARS = string.ascii_letters + string.digits + "_"
 
     def colorize_syntax_error(self, text, pos):

diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
@@ -335,26 +335,11 @@ def open_shell(self, event=None):
 
 class ModifiedColorDelegator(ColorDelegator):
     "Extend base class: colorizer for the shell window itself"
-
-    def __init__(self):
-        ColorDelegator.__init__(self)
-        self.LoadTagDefs()
-
     def recolorize_main(self):
         self.tag_remove("TODO", "1.0", "iomark")
         self.tag_add("SYNC", "1.0", "iomark")
         ColorDelegator.recolorize_main(self)
 
-    def LoadTagDefs(self):
-        ColorDelegator.LoadTagDefs(self)
-        theme = idleConf.CurrentTheme()
-        self.tagdefs.update({
-            "stdin": {'background':None,'foreground':None},
-            "stdout": idleConf.GetHighlight(theme, "stdout"),
-            "stderr": idleConf.GetHighlight(theme, "stderr"),
-            "console": idleConf.GetHighlight(theme, "console"),
-        })
-
     def removecolors(self):
         # Don't remove shell color tags before "iomark"
         for tag in self.tagdefs:
@@ -933,6 +918,18 @@ def __init__(self, flist=None):
         self.shell_sidebar = self.ShellSidebar(self)
         self.shell_sidebar.show_sidebar()
 
+    def get_tag_colors(self):
+        tag_colors = super().get_tag_colors()
+
+        theme = idleConf.CurrentTheme()
+        tag_colors.update({
+            "stdin": {'background': None, 'foreground': None},
+            "stdout": idleConf.GetHighlight(theme, "stdout"),
+            "stderr": idleConf.GetHighlight(theme, "stderr"),
+            "console": idleConf.GetHighlight(theme, "console"),
+        })
+        return tag_colors
+
     def get_standard_extension_names(self):
         return idleConf.GetExtensions(shell_only=True)