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

Whitespace visualisation in the QML/JS editor akin to the C++ editor.

Browse Source
This commit is contained in:
Erik Verbruggen
2009-10-08 14:57:18 +02:00
parent 7cc8180089
commit 3b10701308
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/shared/qscripthighlighter/qscripthighlighter.cpp
View File

@@ -75,15 +75,15 @@ void QScriptHighlighter::highlightBlock(const QString &text)
break;
case QScriptIncrementalScanner::Token::String:
setFormat(token.offset, token.length, m_formats[StringFormat]);
highlightWhitespace(token, text, StringFormat);
break;
case QScriptIncrementalScanner::Token::Comment:
setFormat(token.offset, token.length, m_formats[CommentFormat]);
highlightWhitespace(token, text, CommentFormat);
break;
case QScriptIncrementalScanner::Token::Number:
setFormat(token.offset, token.length, m_formats[NumberFormat]);
highlightWhitespace(token, text, NumberFormat);
break;
case QScriptIncrementalScanner::Token::LeftParenthesis:
@@ -238,3 +238,23 @@ int QScriptHighlighter::onBlockStart()
void QScriptHighlighter::onOpeningParenthesis(QChar, int) {}
void QScriptHighlighter::onClosingParenthesis(QChar, int) {}
void QScriptHighlighter::onBlockEnd(int state, int) { return setCurrentBlockState(state); }
void QScriptHighlighter::highlightWhitespace(const QScriptIncrementalScanner::Token &token, const QString &text, int nonWhitespaceFormat)
{
const QTextCharFormat normalFormat = m_formats[nonWhitespaceFormat];
const QTextCharFormat visualSpaceFormat = m_formats[VisualWhitespace];
const int end = token.end();
int index = token.offset;
while (index != end) {
const bool isSpace = text.at(index).isSpace();
const int start = index;
do { ++index; }
while (index != end && text.at(index).isSpace() == isSpace);
const int tokenLength = index - start;
setFormat(start, tokenLength, isSpace ? visualSpaceFormat : normalFormat);
}
}

2
src/shared/qscripthighlighter/qscripthighlighter.h
View File

@@ -69,6 +69,8 @@ protected:
// sets the enriched user state, or simply calls setCurrentBlockState(state);
virtual void onBlockEnd(int state, int firstNonSpace);
virtual void highlightWhitespace(const QScriptIncrementalScanner::Token &token, const QString &text, int nonWhitespaceFormat);
protected:
QScriptIncrementalScanner m_scanner;