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

Highlighter: Fix freezing highlighter for complex context switches

Browse Source 
Exclamation marks in context attributes are used to split the attribute
into a number of orders and an identifier. This identifier is the
context that have to be set after executing the orders. Ignoring this
context identifier could lead to an endless loop if used inside a
default context with a Rule that has set the lookAhead attribute.

Task-number: QTCREATORBUG-14611
Change-Id: I5992fa47ed2e353cbf7882bc772fdbee8f7f41f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2017-05-04 14:46:12 +02:00
parent 7fb81d94f4
commit 7e38b54525
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/texteditor/generichighlighter/highlighter.cpp
View File

@@ -45,6 +45,7 @@ namespace {
static const QLatin1String kPop("#pop");
static const QLatin1Char kBackSlash('\\');
static const QLatin1Char kHash('#');
static const QLatin1Char kExclamationMark('!');
}
class HighlighterCodeFormatterData : public CodeFormatterData
@@ -414,8 +415,13 @@ void Highlighter::changeContext(const QString &contextName,
const QSharedPointer<HighlightDefinition> &definition,
const bool assignCurrent)
{
if (contextName.startsWith(kPop)) {
const int count = contextName.splitRef(kHash, QString::SkipEmptyParts).size();
QString identifier = contextName;
if (identifier.startsWith(kPop)) {
const QStringList complexOrder = contextName.split(kExclamationMark);
const QString orders = complexOrder.first();
identifier = complexOrder.size() > 1 ? complexOrder[1] : QString();
const int count = orders.splitRef(kHash, QString::SkipEmptyParts).size();
for (int i = 0; i < count; ++i) {
if (m_contexts.isEmpty()) {
throw HighlighterException(
@@ -434,8 +440,9 @@ void Highlighter::changeContext(const QString &contextName,
setCurrentBlockState(
computeState(m_leadingObservableStates.value(currentSequence)));
}
} else {
const QSharedPointer<Context> &context = definition->context(contextName);
}
if (!identifier.isEmpty()) {
const QSharedPointer<Context> &context = definition->context(identifier);
if (context->isDynamic())
pushDynamicContext(context);