fixed source view text highlighting

Author: lee218llnl

scripts/STATGUI.py

@@ -35,7 +35,9 @@
     from pygments.lexers import FortranLexer
     from STAThelper import STATviewFormatter
     try:
-        import pango
+        import gi
+        gi.require_version("Pango", "1.0")
+        from gi.repository import Pango
     except:
         HAVE_PANGO = False
 import STATview
@@ -1950,9 +1952,9 @@ def run_dysect_session(self):
                 text_view_buffer.create_tag("monospace", family="monospace")
                 pygments.highlight(dysect_session_file.read(), CppLexer(), STATviewFormatter())
                 if HAVE_PANGO:
-                    text_view_buffer.create_tag('bold_tag', weight=pango.WEIGHT_BOLD)
-                    text_view_buffer.create_tag('italics_tag', style=pango.STYLE_ITALIC)
-                    text_view_buffer.create_tag('underline_tag', underline=pango.UNDERLINE_SINGLE)
+                    text_view_buffer.create_tag('bold_tag', weight=Pango.Weight.BOLD)
+                    text_view_buffer.create_tag('italics_tag', style=Pango.Style.ITALIC)
+                    text_view_buffer.create_tag('underline_tag', underline=Pango.Underline.SINGLE)
                 else:
                     text_view_buffer.create_tag('bold_tag')
                     text_view_buffer.create_tag('italics_tag')

scripts/STATview.py

@@ -129,14 +129,17 @@
     from STAThelper import which, color_to_string, DecomposedNode, decompose_node, HAVE_PYGMENTS, is_mpi, escaped_label, has_source_and_not_collapsed, has_module_offset_and_not_collapsed, label_has_source, label_has_module_offset, label_collapsed, translate, expr, node_attr_to_label, edge_attr_to_label, get_truncated_edge_label, get_num_tasks
 except Exception as e:
     raise Exception('%s\nThere was a problem loading the STAThelper module.\n' % repr(e))
+HAVE_PANGO = True
 if HAVE_PYGMENTS:
     import pygments
     from pygments.lexers import CLexer
     from pygments.lexers import CppLexer
     from pygments.lexers import FortranLexer
     from STAThelper import STATviewFormatter
     try:
-        import pango
+        import gi
+        gi.require_version("Pango", "1.0")
+        from gi.repository import Pango
     except:
         HAVE_PANGO = False
 # Check for optional modules
@@ -1364,6 +1367,7 @@ def focus(self, node):
 
     def view_source(self, node, item=0):
         """Generate a window that displays the source code for the node."""
+        fore_color_tags = []
         # find the source file name and line number
         if not "source" in node.attrs.keys():
             show_error_dialog('Cannot determine source file, please run STAT with the -i option to get source file and line number information\n')
@@ -1481,9 +1485,9 @@ def view_source(self, node, item=0):
                         pygments.highlight(file.read(), CLexer(), STATviewFormatter())
                     lines = STAThelper.pygments_lines
                     if HAVE_PANGO:
-                        source_view.get_buffer().create_tag('bold_tag', weight=pango.WEIGHT_BOLD)
-                        source_view.get_buffer().create_tag('italics_tag', style=pango.STYLE_ITALIC)
-                        source_view.get_buffer().create_tag('underline_tag', underline=pango.UNDERLINE_SINGLE)
+                        source_view.get_buffer().create_tag('bold_tag', weight=Pango.Weight.BOLD)
+                        source_view.get_buffer().create_tag('italics_tag', style=Pango.Style.ITALIC)
+                        source_view.get_buffer().create_tag('underline_tag', underline=Pango.Underline.SINGLE)
                     else:
                         source_view.get_buffer().create_tag('bold_tag')
                         source_view.get_buffer().create_tag('italics_tag')
@@ -1518,10 +1522,12 @@ def view_source(self, node, item=0):
                     foreground = gtk.gdk.color_parse(font_color_string)
                     background = gtk.gdk.color_parse(fill_color_string)
                     fore_color_tag = "color_fore%d%s" % (lineNum, font_color_string)
-                    try:
-                        source_view.get_buffer().create_tag(fore_color_tag, foreground_gdk=foreground)
-                    except:
-                        pass
+                    if fore_color_tag not in fore_color_tags:
+                        fore_color_tags.append(fore_color_tag)
+                        try:
+                            source_view.get_buffer().create_tag(fore_color_tag, foreground_gdk=foreground)
+                        except:
+                            pass
                     back_color_tag = "color_back%d%s" % (lineNum, fill_color_string)
                     try:
                         source_view.get_buffer().create_tag(back_color_tag, background_gdk=background)
@@ -1538,10 +1544,12 @@ def view_source(self, node, item=0):
                     pygments_color, bold, italics, underline = format_tuple
                     foreground = gtk.gdk.color_parse(pygments_color)
                     fore_color_tag = "color_fore%d%s" % (lineNum, pygments_color)
-                    try:
-                        source_view.get_buffer().create_tag(fore_color_tag, foreground_gdk=foreground)
-                    except:
-                        pass
+                    if fore_color_tag not in fore_color_tags:
+                        fore_color_tags.append(fore_color_tag)
+                        try:
+                            source_view.get_buffer().create_tag(fore_color_tag, foreground_gdk=foreground)
+                        except:
+                            pass
                     args = [iterator, source_string, fore_color_tag, "monospace"]
                     if bold:
                         args.append('bold_tag')
@@ -4500,6 +4508,7 @@ def on_identify_num_eq_classes(self, action):
 
     def on_node_clicked(self, widget, button_clicked, event):
         """Callback to handle clicking of a node."""
+        fore_color_tags = []
         if isinstance(event, STATNode):
             node = event
         else:
@@ -4545,7 +4554,12 @@ def on_node_clicked(self, widget, button_clicked, event):
             iterator = text_view_buffer.get_iter_at_offset(0)
             fore_color_tag = "color_fore%s" % (font_color_string)
             foreground = gtk.gdk.color_parse(font_color_string)
-            text_view_buffer.create_tag(fore_color_tag, foreground_gdk=foreground)
+            if fore_color_tag not in fore_color_tags:
+                fore_color_tags.append(fore_color_tag)
+                try:
+                    text_view_buffer.create_tag(fore_color_tag, foreground_gdk=foreground)
+                except:
+                    pass
             background = gtk.gdk.color_parse(fill_color_string)
             back_color_tag = "color_back%s" % (fill_color_string)
             text_view_buffer.create_tag(back_color_tag, background_gdk=background)