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

Cpp{Tools,Editor}: Expect UTF-8 encoded literals

Browse Source 
Change-Id: I9843c4163aad3fa3f1bfa33060c76328fc2dc25a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-05-05 11:43:24 -04:00
parent cadc4b42ba
commit bea8fc8e6a
14 changed files with 163 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,11 +86,11 @@ protected:
continue;
if (!member->isGenerated() && (member->isDeclaration() || member->isArgument())) {
if (member->name() && member->name()->isNameId()) {
const Identifier *id = member->identifier();
const Token token = tokenAt(member->sourceLocation());
unsigned line, column;
getTokenStartPosition(member->sourceLocation(), &line, &column);
getPosition(token.utf16charsBegin(), &line, &column);
localUses[member].append(
HighlightingResult(line, column, id->size(),
HighlightingResult(line, column, token.utf16chars(),
CppHighlightingSupport::LocalUse));
}
}
@@ -101,7 +101,8 @@ protected:
bool checkLocalUse(NameAST *nameAst, unsigned firstToken)
{
if (SimpleNameAST *simpleName = nameAst->asSimpleName()) {
if (tokenAt(simpleName->identifier_token).generated())
const Token token = tokenAt(simpleName->identifier_token);
if (token.generated())
return false;
const Identifier *id = identifier(simpleName->identifier_token);
for (int i = _scopeStack.size() - 1; i != -1; --i) {
@@ -113,7 +114,7 @@ protected:
unsigned line, column;
getTokenStartPosition(simpleName->identifier_token, &line, &column);
localUses[member].append(
HighlightingResult(line, column, id->size(),
HighlightingResult(line, column, token.utf16chars(),
CppHighlightingSupport::LocalUse));
return false;
}