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

CppTools: Use correct language features in createHighlighter

Browse Source 
Change-Id: Ia8971dbc9be18575a1b22d46dac5bb8c18c63c7a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-26 09:17:28 +02:00
committed by Orgad Shaneh
parent c947f1f800
commit 286f863f5d
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cpptools/builtineditordocumentprocessor.cpp
View File

@@ -78,23 +78,20 @@ CppTools::CheckSymbols *createHighlighter(const CPlusPlus::Document::Ptr &doc,
macroUses.append(use); macroUses.append(use);
} }
const LanguageFeatures features = doc->languageFeatures();
// Get macro uses // Get macro uses
foreach (const Document::MacroUse &macro, doc->macroUses()) { foreach (const Document::MacroUse &macro, doc->macroUses()) {
const QString name = macro.macro().nameToQString(); const QString name = macro.macro().nameToQString();
//Filter out QtKeywords //Filter out QtKeywords
if (isQtKeyword(QStringRef(&name))) if (features.qtKeywordsEnabled && isQtKeyword(QStringRef(&name)))
continue; continue;
// Filter out C++ keywords
// FIXME: Check default values or get from document.
LanguageFeatures features;
features.cxx11Enabled = true;
features.c99Enabled = true;
SimpleLexer tokenize; SimpleLexer tokenize;
tokenize.setLanguageFeatures(features); tokenize.setLanguageFeatures(features);
// Filter out C++ keywords
const Tokens tokens = tokenize(name); const Tokens tokens = tokenize(name);
if (tokens.length() && (tokens.at(0).isKeyword() || tokens.at(0).isObjCAtKeyword())) if (tokens.length() && (tokens.at(0).isKeyword() || tokens.at(0).isObjCAtKeyword()))
continue; continue;