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

Mercurial: Fix highlighting

Browse Source 
* Hash is not a comment, "HG:" is.
* First line *that is not a comment* is a summary

Change-Id: If4e3428bfd4461dc105583a998be5d8185be3ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-11-04 22:45:25 +02:00
committed by Orgad Shaneh
parent f0a6345fde
commit c456968b07
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/mercurial/mercurialcommitwidget.cpp
View File

@@ -36,12 +36,10 @@
#include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h>
#include <QRegExp>
#include <QSyntaxHighlighter>
#include <QTextEdit>
#include <QDebug>
#include <QRegExp>
//see the git submit widget for details of the syntax Highlighter
namespace Mercurial {
@@ -57,16 +55,14 @@ public:
void highlightBlock(const QString &text);
private:
enum State { Header, Comment, Other };
enum State { None = -1, Header, Other };
enum Format { Format_Comment };
QRegExp m_keywordPattern;
const QChar m_hashChar;
};
MercurialSubmitHighlighter::MercurialSubmitHighlighter(QTextEdit *parent) :
TextEditor::SyntaxHighlighter(parent),
m_keywordPattern(QLatin1String("^\\w+:")),
m_hashChar(QLatin1Char('#'))
m_keywordPattern(QLatin1String("^\\w+:"))
{
static QVector<TextEditor::TextStyle> categories;
if (categories.isEmpty())
@@ -79,25 +75,35 @@ MercurialSubmitHighlighter::MercurialSubmitHighlighter(QTextEdit *parent) :
void MercurialSubmitHighlighter::highlightBlock(const QString &text)
{
// figure out current state
State state = Other;
const QTextBlock block = currentBlock();
if (block.position() == 0) {
state = Header;
} else {
if (text.startsWith(m_hashChar))
state = Comment;
State state = static_cast<State>(previousBlockState());
if (text.startsWith(QLatin1String("HG:"))) {
setFormat(0, text.size(), formatForCategory(Format_Comment));
setCurrentBlockState(state);
return;
}
if (state == None) {
if (text.isEmpty()) {
setCurrentBlockState(state);
return;
}
state = Header;
} else if (state == Header) {
state = Other;
}
setCurrentBlockState(state);
// Apply format.
switch (state) {
case None:
break;
case Header: {
QTextCharFormat charFormat = format(0);
charFormat.setFontWeight(QFont::Bold);
setFormat(0, text.size(), charFormat);
break;
}
case Comment:
setFormat(0, text.size(), formatForCategory(Format_Comment));
break;
case Other:
// Format key words ("Task:") italic
if (m_keywordPattern.indexIn(text, 0, QRegExp::CaretAtZero) == 0) {