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

CppEditor: Use correct language features in Follow Symbol

Browse Source 
Change-Id: If4adc4153341ac63bd5566a66ccf177ae4e536e1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-26 09:15:34 +02:00
committed by Orgad Shaneh
parent 88ee2bfb64
commit 69edf1e26d
4 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/cplusplus/SimpleLexer.cpp
View File

@@ -129,17 +129,10 @@ int SimpleLexer::tokenAt(const Tokens &tokens, unsigned utf16charsOffset)
Token SimpleLexer::tokenAt(const QString &text,
unsigned utf16charsOffset,
int state,
bool qtMocRunEnabled)
const LanguageFeatures &languageFeatures)
{
// FIXME: Check default values.
LanguageFeatures features;
features.qtMocRunEnabled = qtMocRunEnabled;
features.qtEnabled = qtMocRunEnabled;
features.qtKeywordsEnabled = qtMocRunEnabled;
features.objCEnabled = qtMocRunEnabled;
features.cxx11Enabled = qtMocRunEnabled;
SimpleLexer tokenize;
tokenize.setLanguageFeatures(features);
tokenize.setLanguageFeatures(languageFeatures);
const QVector<Token> tokens = tokenize(text, state);
const int tokenIdx = tokenAt(tokens, utf16charsOffset);
return (tokenIdx == -1) ? Token() : tokens.at(tokenIdx);