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

CppEditor: Do not highlight C++ and Qt keywords for C

Browse Source 
Task-number: QTCREATORBUG-2818
Task-number: QTCREATORBUG-18004
Change-Id: Ibca60a1711c827dd8b4c0486bff3d49b19a61d8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2017-01-16 10:51:13 +01:00
parent 5bc796094a
commit 837cb2e397
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/cppeditor/cpphighlighter.cpp
View File

@@ -70,15 +70,8 @@ void CppHighlighter::highlightBlock(const QString &text)
int braceDepth = initialBraceDepth;
// FIXME: Check defaults or get from document.
LanguageFeatures features;
features.cxx11Enabled = true;
features.cxxEnabled = true;
features.c99Enabled = true;
features.objCEnabled = true;
SimpleLexer tokenize;
tokenize.setLanguageFeatures(features);
tokenize.setLanguageFeatures(m_languageFeatures);
int initialLexerState = lexerState;
const Tokens tokens = tokenize(text, initialLexerState);
@@ -215,7 +208,8 @@ void CppHighlighter::highlightBlock(const QString &text)
}
} else if (tk.isKeyword()
|| CppTools::isQtKeyword(text.midRef(tk.utf16charsBegin(), tk.utf16chars()))
|| (m_languageFeatures.qtKeywordsEnabled
&& CppTools::isQtKeyword(text.midRef(tk.utf16charsBegin(), tk.utf16chars())))
|| tk.isObjCAtKeyword()) {
setFormat(tk.utf16charsBegin(), tk.utf16chars(), formatForCategory(CppKeywordFormat));
} else if (tk.isPrimitiveType()) {
@@ -281,6 +275,13 @@ void CppHighlighter::highlightBlock(const QString &text)
setCurrentBlockState((braceDepth << 8) | tokenize.state());
}
void CppHighlighter::setLanguageFeatures(const LanguageFeatures &languageFeatures)
{
if (languageFeatures != m_languageFeatures) {
m_languageFeatures = languageFeatures;
rehighlight();
}
}
bool CppHighlighter::isPPKeyword(const QStringRef &text) const
{