feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Change-Id: Iab93dc48b4a38fb4c698481bbf02a5a65e08206b
This commit is contained in:
Eike Ziller
2020-09-07 13:19:38 +02:00
parent f1806621f8 b0cad9e9c7
commit df97d40a0d
36 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/githighlighters.cpp
View File

@@ -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)

5
src/plugins/git/githighlighters.h
View File

@@ -42,6 +42,11 @@ enum Format {
Format_Squash,
Format_Fixup,
Format_Exec,
Format_Break,
Format_Drop,
Format_Label,
Format_Reset,
Format_Merge,
Format_Count
};