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

QmlJS: Don't unnecessarily store the multiline comment state.

Browse Source 
The 'state' value already holds the same information.

Reviewed-by: Erik Verbruggen
(backport of 70448b016d)
This commit is contained in:
Christian Kamm
2010-06-15 14:34:18 +02:00
parent 83dba068ce
commit 983ed48ae3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljseditor/qmljshighlighter.cpp
View File

@@ -313,9 +313,9 @@ int Highlighter::onBlockStart()
int state = 0; int state = 0;
int previousState = previousBlockState(); int previousState = previousBlockState();
if (previousState != -1) { if (previousState != -1) {
m_inMultilineComment = previousState & 0x1; state = previousState & 0xff;
state = (previousState >> 1) & 0xff; m_braceDepth = (previousState >> 8);
m_braceDepth = (previousState >> 9); m_inMultilineComment = (state == Scanner::MultiLineComment);
} }
return state; return state;
@@ -325,7 +325,7 @@ void Highlighter::onBlockEnd(int state, int firstNonSpace)
{ {
typedef TextEditor::TextBlockUserData TextEditorBlockData; typedef TextEditor::TextBlockUserData TextEditorBlockData;
setCurrentBlockState((m_braceDepth << 9) | (state << 1) | m_inMultilineComment); setCurrentBlockState((m_braceDepth << 8) | state);
// Set block data parentheses. Force creation of block data unless empty // Set block data parentheses. Force creation of block data unless empty
TextEditorBlockData *blockData = 0; TextEditorBlockData *blockData = 0;