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

CppTools: Handle erroneous statements in FindMethodDefinitionInsertPoint

Browse Source 
...at end of file.

Change-Id: Ife8142cd9cf3c5e4be2594b7cc635e5ab7b9e946
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-09-06 09:31:21 +02:00
parent 3eaf044045
commit bbdee91bc9
3 changed files with 179 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cpptools/insertionpointlocator.cpp
View File

@@ -356,7 +356,7 @@ class FindMethodDefinitionInsertPoint : protected ASTVisitor
{
QList<const Identifier *> _namespaceNames;
int _currentDepth;
HighestValue<int, int> _bestToken;
HighestValue<int, unsigned> _bestToken;
public:
FindMethodDefinitionInsertPoint(TranslationUnit *translationUnit)
@@ -366,10 +366,10 @@ public:
void operator()(Symbol *decl, unsigned *line, unsigned *column)
{
// default to end of file
_bestToken.maybeSet(-1, translationUnit()->ast()->lastToken());
if (translationUnit()->ast()->lastToken() >= 2) {
const unsigned lastToken = translationUnit()->ast()->lastToken();
_bestToken.maybeSet(-1, lastToken);
if (lastToken >= 2) {
QList<const Name *> names = LookupContext::fullyQualifiedName(decl);
foreach (const Name *name, names) {
const Identifier *id = name->asNameId();
@@ -381,7 +381,11 @@ public:
accept(translationUnit()->ast());
}
translationUnit()->getTokenEndPosition(_bestToken.get(), line, column);
if (lastToken == _bestToken.get()) // No matching namespace found
translationUnit()->getTokenStartPosition(lastToken, line, column);
else // Insert at end of matching namespace
translationUnit()->getTokenEndPosition(_bestToken.get(), line, column);
}
protected: