Mercurial Repositories > eric / file diff

--- a/src/eric7/UI/DiffHighlighter.py	Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/UI/DiffHighlighter.py	Wed Jul 13 14:55:47 2022 +0200
@@ -7,19 +7,18 @@
 Module implementing a syntax highlighter for unified and context diff outputs.
 """
 
-from EricGui.EricGenericDiffHighlighter import (
-    TERMINAL, EricGenericDiffHighlighter
-)
+from EricGui.EricGenericDiffHighlighter import TERMINAL, EricGenericDiffHighlighter
 
 
 class DiffHighlighter(EricGenericDiffHighlighter):
     """
     Class implementing a diff highlighter for Git.
     """
+
     def __init__(self, doc):
         """
         Constructor
-        
+
         @param doc reference to the text document (QTextDocument)
         """
         super().__init__(doc)
@@ -28,34 +27,31 @@
         """
         Public method to generate the rule set.
         """
-        diffHeaderBold = self.makeFormat(fg=self.textColor,
-                                         bg=self.headerColor,
-                                         bold=True)
-        diffContext = self.makeFormat(fg=self.textColor,
-                                      bg=self.contextColor)
+        diffHeaderBold = self.makeFormat(
+            fg=self.textColor, bg=self.headerColor, bold=True
+        )
+        diffContext = self.makeFormat(fg=self.textColor, bg=self.contextColor)
 
-        diffAdded = self.makeFormat(fg=self.textColor,
-                                    bg=self.addedColor)
-        diffRemoved = self.makeFormat(fg=self.textColor,
-                                      bg=self.removedColor)
-        diffReplaced = self.makeFormat(fg=self.textColor,
-                                       bg=self.replacedColor)
-        
-        diffBarRegex = TERMINAL(r'^\*+$')
+        diffAdded = self.makeFormat(fg=self.textColor, bg=self.addedColor)
+        diffRemoved = self.makeFormat(fg=self.textColor, bg=self.removedColor)
+        diffReplaced = self.makeFormat(fg=self.textColor, bg=self.replacedColor)
+
+        diffBarRegex = TERMINAL(r"^\*+$")
 
-        diffOldRegex = TERMINAL(r'^--- ')
-        diffNewRegex = TERMINAL(r'^\+\+\+ |^\*\*\*')
-        diffContextRegex = TERMINAL(r'^@@ ')
-        
-        diffAddedRegex = TERMINAL(r'^[+>]')
-        diffRemovedRegex = TERMINAL(r'^[-<]')
-        diffReplacedRegex = TERMINAL(r'^!')
-        
-        self.createRules((diffBarRegex, diffHeaderBold),
-                         (diffOldRegex, diffRemoved),
-                         (diffNewRegex, diffAdded),
-                         (diffContextRegex, diffContext),
-                         (diffAddedRegex, diffAdded),
-                         (diffRemovedRegex, diffRemoved),
-                         (diffReplacedRegex, diffReplaced),
-                         )
+        diffOldRegex = TERMINAL(r"^--- ")
+        diffNewRegex = TERMINAL(r"^\+\+\+ |^\*\*\*")
+        diffContextRegex = TERMINAL(r"^@@ ")
+
+        diffAddedRegex = TERMINAL(r"^[+>]")
+        diffRemovedRegex = TERMINAL(r"^[-<]")
+        diffReplacedRegex = TERMINAL(r"^!")
+
+        self.createRules(
+            (diffBarRegex, diffHeaderBold),
+            (diffOldRegex, diffRemoved),
+            (diffNewRegex, diffAdded),
+            (diffContextRegex, diffContext),
+            (diffAddedRegex, diffAdded),
+            (diffRemovedRegex, diffRemoved),
+            (diffReplacedRegex, diffReplaced),
+        )