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

Mark the trailing whitespaces.

Browse Source
This commit is contained in:
Roberto Raggi
2010-01-29 10:50:16 +01:00
parent 020e7f5739
commit 272014a5d0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljshighlighter.cpp
View File

@@ -189,11 +189,11 @@ void QScriptHighlighter::highlightBlock(const QString &text)
previousTokenEnd = token.end(); previousTokenEnd = token.end();
} }
setFormat(previousTokenEnd, text.length() - previousTokenEnd, m_formats[VisualWhitespace]);
int firstNonSpace = 0; int firstNonSpace = 0;
if (! tokens.isEmpty()) { if (! tokens.isEmpty())
const Token &tk = tokens.first(); firstNonSpace = tokens.first().offset;
firstNonSpace = tk.offset;
}
setCurrentBlockState(m_scanner.endState()); setCurrentBlockState(m_scanner.endState());
onBlockEnd(m_scanner.endState(), firstNonSpace); onBlockEnd(m_scanner.endState(), firstNonSpace);

1
src/plugins/qmljseditor/qmlhighlighter.cpp
View File

@@ -41,6 +41,7 @@ QmlHighlighter::QmlHighlighter(QTextDocument *parent) :
m_braceDepth = 0; m_braceDepth = 0;
QSet<QString> qmlKeywords(keywords()); QSet<QString> qmlKeywords(keywords());
qmlKeywords << QLatin1String("alias");
qmlKeywords << QLatin1String("property"); qmlKeywords << QLatin1String("property");
qmlKeywords << QLatin1String("signal"); qmlKeywords << QLatin1String("signal");
qmlKeywords << QLatin1String("readonly"); qmlKeywords << QLatin1String("readonly");