--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffHighlighter.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffHighlighter.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 SvnDiffHighlighter(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,35 +27,32 @@ """ Public method to generate the rule set. """ - diffHeader = self.makeFormat(fg=self.textColor, - bg=self.headerColor) - diffHeaderBold = self.makeFormat(fg=self.textColor, - bg=self.headerColor, - bold=True) - diffContext = self.makeFormat(fg=self.textColor, - bg=self.contextColor) + diffHeader = self.makeFormat(fg=self.textColor, bg=self.headerColor) + 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) - - diffBarRegex = TERMINAL(r'^=+$') + diffAdded = self.makeFormat(fg=self.textColor, bg=self.addedColor) + diffRemoved = self.makeFormat(fg=self.textColor, bg=self.removedColor) + + diffBarRegex = TERMINAL(r"^=+$") + + diffHeaderRegex = TERMINAL(r"^[iI]ndex: \S+") - diffHeaderRegex = TERMINAL(r'^[iI]ndex: \S+') - - diffOldRegex = TERMINAL(r'^--- ') - diffNewRegex = TERMINAL(r'^\+\+\+') - diffContextRegex = TERMINAL(r'^@@ ') - - diffAddedRegex = TERMINAL(r'^[+>]|^A ') - diffRemovedRegex = TERMINAL(r'^[-<]|^D ') - - self.createRules((diffOldRegex, diffRemoved), - (diffNewRegex, diffAdded), - (diffContextRegex, diffContext), - (diffHeaderRegex, diffHeader), - (diffBarRegex, diffHeaderBold), - (diffAddedRegex, diffAdded), - (diffRemovedRegex, diffRemoved), - ) + diffOldRegex = TERMINAL(r"^--- ") + diffNewRegex = TERMINAL(r"^\+\+\+") + diffContextRegex = TERMINAL(r"^@@ ") + + diffAddedRegex = TERMINAL(r"^[+>]|^A ") + diffRemovedRegex = TERMINAL(r"^[-<]|^D ") + + self.createRules( + (diffOldRegex, diffRemoved), + (diffNewRegex, diffAdded), + (diffContextRegex, diffContext), + (diffHeaderRegex, diffHeader), + (diffBarRegex, diffHeaderBold), + (diffAddedRegex, diffAdded), + (diffRemovedRegex, diffRemoved), + )