--- a/eric6/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py Sat Aug 31 12:58:11 2019 +0200
@@ -9,158 +9,9 @@
from __future__ import unicode_literals
-import re
-
-from PyQt5.QtGui import QSyntaxHighlighter, QColor, QTextCharFormat, QFont
-
-import Preferences
-
-try:
- from E5Gui.E5GenericDiffHighlighter import TERMINAL, \
- E5GenericDiffHighlighter
-except ImportError:
- def TERMINAL(pattern):
- """
- Function to mark a pattern as the final one to search for.
-
- @param pattern pattern to be marked (string)
- @return marked pattern (string)
- """
- return "__TERMINAL__:{0}".format(pattern)
-
- # Cache the results of re.compile for performance reasons
- _REGEX_CACHE = {}
+from PyQt5.QtGui import QColor
- class E5GenericDiffHighlighter(QSyntaxHighlighter):
- """
- Class implementing a generic diff highlighter.
- """
- def __init__(self, doc):
- """
- Constructor
-
- @param doc reference to the text document (QTextDocument)
- """
- super(E5GenericDiffHighlighter, self).__init__(doc)
-
- self.textColor = QColor(0, 0, 0)
- self.addedColor = QColor(190, 237, 190)
- self.removedColor = QColor(237, 190, 190)
- self.replacedColor = QColor(190, 190, 237)
- self.contextColor = QColor(255, 220, 168)
- self.headerColor = QColor(237, 237, 190)
-
- self.normalFormat = self.makeFormat()
-
- self._rules = []
- self.generateRules()
-
- def generateRules(self):
- """
- Public method to generate the rule set.
-
- Note: This method must me implemented by derived syntax
- highlighters.
- """
- pass
-
- def createRules(self, *rules):
- """
- Public method to create the highlighting rules.
-
- @param rules set of highlighting rules (list of tuples of rule
- pattern (string) and highlighting format (QTextCharFormat))
- """
- for ruleFormat in rules:
- rule, formats = ruleFormat
- terminal = rule.startswith(TERMINAL(''))
- if terminal:
- rule = rule[len(TERMINAL('')):]
- try:
- regex = _REGEX_CACHE[rule]
- except KeyError:
- regex = _REGEX_CACHE[rule] = re.compile(rule)
- self._rules.append((regex, formats, terminal))
-
- def formats(self, line):
- """
- Public method to determine the highlighting formats for a line of
- text.
-
- @param line text line to be highlighted (string)
- @return list of matched highlighting rules (list of tuples of match
- object and format (QTextCharFormat))
- """
- matched = []
- for rx, formats, terminal in self._rules:
- match = rx.match(line)
- if not match:
- continue
- matched.append([match, formats])
- if terminal:
- return matched
-
- return matched
-
- def makeFormat(self, fg=None, bg=None, bold=False):
- """
- Public method to generate a format definition.
-
- @param fg foreground color (QColor)
- @param bg background color (QColor)
- @param bold flag indicating bold text (boolean)
- @return format definiton (QTextCharFormat)
- """
- font = Preferences.getEditorOtherFonts("MonospacedFont")
- charFormat = QTextCharFormat()
- charFormat.setFontFamily(font.family())
- charFormat.setFontPointSize(font.pointSize())
-
- if fg:
- charFormat.setForeground(fg)
-
- if bg:
- charFormat.setBackground(bg)
-
- if bold:
- charFormat.setFontWeight(QFont.Bold)
-
- return charFormat
-
- def highlightBlock(self, text):
- """
- Public method to highlight a block of text.
-
- @param text text to be highlighted (string)
- """
- formats = self.formats(text)
- if not formats:
- # nothing matched
- self.setFormat(0, len(text), self.normalFormat)
- return
-
- for match, charFormat in formats:
- start = match.start()
- groups = match.groups()
-
- # No groups in the regex, assume this is a single rule
- # that spans the entire line
- if not groups:
- self.setFormat(0, len(text), charFormat)
- continue
-
- # Groups exist, rule is a tuple corresponding to group
- for groupIndex, group in enumerate(groups):
- if not group:
- # empty match
- continue
-
- # allow None as a no-op format
- length = len(group)
- if charFormat[groupIndex]:
- self.setFormat(start, start + length,
- charFormat[groupIndex])
- start += length
+from E5Gui.E5GenericDiffHighlighter import TERMINAL, E5GenericDiffHighlighter
class GitDiffHighlighter(E5GenericDiffHighlighter):
