ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fixed issues in syntax highlighter

Browse Source 
* single line comment broken
* don't highlight keyword within quotation
This commit is contained in:
Eberhard Graether
2017-09-14 02:39:32 +02:00
parent 687bfad4a6
commit 84305c155c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/utility/QtHighlighter.cpp
+6 -6
View File
@@ -120,16 +120,16 @@ QtHighlighter::QtHighlighter(QTextDocument *document, LanguageType language)
createHighlightingRules();
}
m_highlightingRules = s_highlightingRules;
if (m_language == LANGUAGE_JAVA)
{
m_highlightingRules.append(s_highlightingRulesJava);
m_highlightingRules = s_highlightingRulesJava;
}
else
{
m_highlightingRules.append(s_highlightingRulesCpp);
m_highlightingRules = s_highlightingRulesCpp;
}
m_highlightingRules.append(s_highlightingRules);
}
void QtHighlighter::highlightDocument()
@@ -360,14 +360,14 @@ void QtHighlighter::formatBlock(
{
int length = expression.matchedLength();
if (!isInRange(pos + index, *ranges) && !isInRange(pos + index + length, *ranges))
if (!isInRange(pos + index, *ranges))
{
applyFormat(pos + index, pos + index + length, rule.format);
}
if (saveRange)
{
newRanges.push_back(std::pair<int, int>(pos + index, pos + index + length));
newRanges.push_back(std::pair<int, int>(pos + index, pos + index + length - 1));
}
index = expression.indexIn(block.text(), index + length);