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

GenericHighlighter: Display exceptions

Browse Source 
Enables tracking of syntax/logic errors in highlighters.

Change-Id: Ia9c314d0a314ab49ca2045327e2d34c9e9d275c3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-01-11 14:33:09 +02:00
committed by Orgad Shaneh
parent b9597d402d
commit dc86025879
4 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,8 +38,9 @@
#include "reuse.h"
#include "tabsettings.h"
#include <QLatin1String>
#include <QLatin1Char>
#include <coreplugin/messagemanager.h>
#include <QCoreApplication>
using namespace TextEditor;
using namespace Internal;
@@ -205,7 +206,11 @@ void Highlighter::highlightBlock(const QString &text)
}
TextDocumentLayout::setParentheses(currentBlock(), parentheses);
} catch (const HighlighterException &) {
} catch (const HighlighterException &e) {
Core::MessageManager::write(
QCoreApplication::translate("GenericHighlighter",
"Generic highlighter error: ") + e.message(),
Core::MessageManager::WithFocus);
m_isBroken = true;
}
}
@@ -388,8 +393,10 @@ void Highlighter::changeContext(const QString &contextName,
if (contextName.startsWith(kPop)) {
QStringList list = contextName.split(kHash, QString::SkipEmptyParts);
for (int i = 0; i < list.size(); ++i) {
if (m_contexts.isEmpty())
throw HighlighterException();
if (m_contexts.isEmpty()) {
throw HighlighterException(
QCoreApplication::translate("GenericHighlighter", "Reached empty context"));
}
m_contexts.pop_back();
}