From 68cec6a7c7e8415e8430887a8a30c40b7d2255d4 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 27 May 2010 14:46:30 +0200
Subject: [PATCH] QmlJS: Fix folding information for multi-line comments after
edits.
Since the highlighter doesn't run on the whole file, only on the changed
line, we need to store the information whether a block starts in a
multi-line comment.
Reviewed-by: Erik Verbruggen
---
src/plugins/qmljseditor/qmljshighlighter.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljshighlighter.cpp b/src/plugins/qmljseditor/qmljshighlighter.cpp
index a6412fc9a98..36191c7dd9e 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -309,6 +309,7 @@ int Highlighter::onBlockStart()
m_currentBlockParentheses.clear();
m_braceDepth = 0;
m_foldingIndent = 0;
+ m_inMultilineComment = false;
if (TextEditor::TextBlockUserData *userData = TextEditor::BaseTextDocumentLayout::testUserData(currentBlock())) {
userData->setFoldingIndent(0);
userData->setFoldingStartIncluded(false);
@@ -319,7 +320,8 @@ int Highlighter::onBlockStart()
int previousState = previousBlockState();
if (previousState != -1) {
state = previousState & 0xff;
- m_braceDepth = previousState >> 8;
+ m_inMultilineComment = (previousState >> 8) & 0xff;
+ m_braceDepth = previousState >> 16;
}
m_foldingIndent = m_braceDepth;
@@ -330,7 +332,7 @@ void Highlighter::onBlockEnd(int state)
{
typedef TextEditor::TextBlockUserData TextEditorBlockData;
- setCurrentBlockState((m_braceDepth << 8) | state);
+ setCurrentBlockState((m_braceDepth << 16) | (m_inMultilineComment << 8) | state);
TextEditor::BaseTextDocumentLayout::setParentheses(currentBlock(), m_currentBlockParentheses);
TextEditor::BaseTextDocumentLayout::setFoldingIndent(currentBlock(), m_foldingIndent);
}
--
GitLab