diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-07 13:19:38 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-07 13:19:38 +0200 |
| commit | df97d40a0d03d4073f45437e9ca60a8bbd70852b (patch) | |
| tree | 4bbf9838a1c8a7567e2787861c7abc35cdbd24a3 /src/plugins/git/githighlighters.cpp | |
| parent | f1806621f8ac12b690b94a1e93274ff0c4d37bc8 (diff) | |
| parent | b0cad9e9c7aad209756fb2409520c0d048614dd9 (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Iab93dc48b4a38fb4c698481bbf02a5a65e08206b
Diffstat (limited to 'src/plugins/git/githighlighters.cpp')
| -rw-r--r-- | src/plugins/git/githighlighters.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/git/githighlighters.cpp b/src/plugins/git/githighlighters.cpp index 4f88183391..37c9af8699 100644 --- a/src/plugins/git/githighlighters.cpp +++ b/src/plugins/git/githighlighters.cpp @@ -104,6 +104,11 @@ static TextEditor::TextStyle styleForFormat(int format) case Format_Squash: return C_ENUMERATION; case Format_Fixup: return C_NUMBER; case Format_Exec: return C_LABEL; + case Format_Break: return C_PREPROCESSOR; + case Format_Drop: return C_REMOVED_LINE; + case Format_Label: return C_LABEL; + case Format_Reset: return C_LABEL; + case Format_Merge: return C_LABEL; case Format_Count: QTC_CHECK(false); // should never get here return C_TEXT; @@ -125,6 +130,11 @@ GitRebaseHighlighter::GitRebaseHighlighter(QTextDocument *parent) : m_actions << RebaseAction("^(s|squash)\\b", Format_Squash); m_actions << RebaseAction("^(f|fixup)\\b", Format_Fixup); m_actions << RebaseAction("^(x|exec)\\b", Format_Exec); + m_actions << RebaseAction("^(b|break)\\b", Format_Break); + m_actions << RebaseAction("^(d|drop)\\b", Format_Drop); + m_actions << RebaseAction("^(l|label)\\b", Format_Label); + m_actions << RebaseAction("^(t|reset)\\b", Format_Reset); + m_actions << RebaseAction("^(m|merge)\\b", Format_Merge); } void GitRebaseHighlighter::highlightBlock(const QString &text) |