diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffHighlighter.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffHighlighter.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffHighlighter.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 HgDiffHighlighter(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,29 +27,26 @@
"""
Public method to generate the rule set.
"""
- diffHeader = self.makeFormat(fg=self.textColor,
- bg=self.headerColor)
- diffContext = self.makeFormat(fg=self.textColor,
- bg=self.contextColor)
+ diffHeader = self.makeFormat(fg=self.textColor, bg=self.headerColor)
+ 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)
- diffAdded = self.makeFormat(fg=self.textColor,
- bg=self.addedColor)
- diffRemoved = self.makeFormat(fg=self.textColor,
- bg=self.removedColor)
-
- diffHeaderRegex = TERMINAL(r'^diff -r ')
+ diffHeaderRegex = TERMINAL(r"^diff -r ")
+
+ diffOldRegex = TERMINAL(r"^--- ")
+ diffNewRegex = TERMINAL(r"^\+\+\+ ")
+ diffContextRegex = TERMINAL(r"^@@ ")
- diffOldRegex = TERMINAL(r'^--- ')
- diffNewRegex = TERMINAL(r'^\+\+\+ ')
- diffContextRegex = TERMINAL(r'^@@ ')
-
- diffAddedRegex = TERMINAL(r'^\+')
- diffRemovedRegex = TERMINAL(r'^-')
-
- self.createRules((diffOldRegex, diffRemoved),
- (diffNewRegex, diffAdded),
- (diffContextRegex, diffContext),
- (diffHeaderRegex, diffHeader),
- (diffAddedRegex, diffAdded),
- (diffRemovedRegex, diffRemoved),
- )
+ diffAddedRegex = TERMINAL(r"^\+")
+ diffRemovedRegex = TERMINAL(r"^-")
+
+ self.createRules(
+ (diffOldRegex, diffRemoved),
+ (diffNewRegex, diffAdded),
+ (diffContextRegex, diffContext),
+ (diffHeaderRegex, diffHeader),
+ (diffAddedRegex, diffAdded),
+ (diffRemovedRegex, diffRemoved),
+ )
