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

Revert "Editor: Highlight background for whitespaces in strings and comments"

Browse Source 
The change brokes the Lexer.
This reverts commit e46a5579d3.

Change-Id: I3363c6eff74b53a7f2d9f417941cde07aaa92619
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
David Schulz
2012-02-03 11:46:13 +01:00
committed by Leandro Melo
parent b4eec17317
commit 6d85b53f9c
3 changed files with 9 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/3rdparty/cplusplus/Lexer.cpp vendored
View File

@@ -157,15 +157,10 @@ void Lexer::scan(Token *tok)
void Lexer::scan_helper(Token *tok)
{
_Lagain:
_tokenStart = _currentChar;
tok->offset = _currentChar - _firstChar;
while (_yychar && std::isspace(_yychar)) {
if (_yychar == '\n') {
tok->f.joined = false;
tok->f.newline = true;
if (_state == State_MultiLineComment || _state == State_MultiLineDoxyComment)
break;
} else {
tok->f.whitespace = true;
}
@@ -175,10 +170,12 @@ void Lexer::scan_helper(Token *tok)
if (! _translationUnit)
tok->lineno = _currentLine;
_tokenStart = _currentChar;
tok->offset = _currentChar - _firstChar;
if (_state == State_MultiLineComment || _state == State_MultiLineDoxyComment) {
const int originalState = _state;
if (! _yychar) {
tok->f.kind = T_EOF_SYMBOL;
return;
@@ -207,9 +204,6 @@ void Lexer::scan_helper(Token *tok)
return; // done
}
_tokenStart = _currentChar;
tok->offset = _currentChar - _firstChar;
if (! _yychar) {
tok->f.kind = T_EOF_SYMBOL;
return;