Generic highlighter: Code folding support.

2 files changed, 12 insertions, 5 deletions

diff --git a/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h b/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h
index 37320e4361..f3433db632 100644
--- a/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h
+++ b/tests/auto/generichighlighter/highlighterengine/basetextdocumentlayout.h
@@ -32,13 +32,19 @@
 
 /*
  Since the text editor plugin directory is not included in the search list of the pro file, this
- file replaces the "real" basetextdocumentlayout.h file. The objective is to simply use
- QTextBlockUserData instead of TextEditor::TextBlockUserData to avoid "external"
- dependencies or intrusive defines.
+ file replaces the "real" basetextdocumentlayout.h file. The objective is to provide a simple
+ TextBlockUserData and avoid "external" dependencies or intrusive defines.
  */
 
 #include <QtGui/QTextBlockUserData>
 
-typedef QTextBlockUserData TextBlockUserData;
+struct TextBlockUserData : QTextBlockUserData
+{
+    virtual ~TextBlockUserData(){}
+
+    void setFoldingStartIncluded(const bool) {}
+    void setFoldingEndIncluded(const bool) {}
+    void setFoldingIndent(const int) {}
+};
 
 #endif // BASETEXTDOCUMENTLAYOUT_H
diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
index d558a9eb41..7ed758a5a3 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
+++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.cpp
@@ -109,7 +109,8 @@ void HighlighterMock::highlightBlock(const QString &text)
 
     if (m_states.size() <= m_statesCounter)
         QFAIL("Expected state for current block not set.");
-    QCOMPARE(currentBlockState(), m_states.at(m_statesCounter++));
+    const int observableState = currentBlockState() & 0xFFF;
+    QCOMPARE(observableState, m_states.at(m_statesCounter++));
 
     if (m_formatSequence.size() <= m_formatsCounter)
         QFAIL("Expected highlight sequence for current block not set.");