diff options
author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-06-11 10:22:10 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-06-25 11:04:21 +0200 |
commit | a3cb35edbebf35b0bc1a89c9e274b6c5c7b428a8 (patch) | |
tree | 0ebf157405b56d695bf2f6f2e74af8ea2e99ec0f | |
parent | 8aa8f225369603e1e9ea019ca043715b08a61e82 (diff) | |
download | qt-creator-a3cb35edbebf35b0bc1a89c9e274b6c5c7b428a8.tar.gz |
C++: Handle recursive using/typedef declarations
Remember using/typedef declarations we have already looked up and
stop if we try it again.
Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit 50a900e509be2e1f448f29be126ba3b7f8173901)
-rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 13 | ||||
-rw-r--r-- | src/libs/cplusplus/LookupContext.h | 4 | ||||
-rw-r--r-- | src/plugins/cpptools/cppcompletion_test.cpp | 137 | ||||
-rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.h | 5 |
4 files changed, 155 insertions, 4 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index a8a65fd7b8..aa292ee194 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -275,7 +275,8 @@ ClassOrNamespace *LookupContext::globalNamespace() const } ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, - ClassOrNamespace* enclosingTemplateInstantiation) const + ClassOrNamespace* enclosingTemplateInstantiation, + QSet<const Declaration *> typedefsBeingResolved) const { if (! scope) { return 0; @@ -294,8 +295,14 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, Overview oo; qDebug() << "Looks like" << oo(name) << "is a typedef for" << oo(d->type()); #endif // DEBUG_LOOKUP - if (const NamedType *namedTy = d->type()->asNamedType()) - return lookupType(namedTy->name(), scope); + if (const NamedType *namedTy = d->type()->asNamedType()) { + // Stop on recursive typedef declarations + if (typedefsBeingResolved.contains(d)) + return 0; + return lookupType(namedTy->name(), scope, 0, + QSet<const Declaration *>(typedefsBeingResolved) + << d); + } } } } diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index 98ff7ffdbe..eb4349b741 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -282,7 +282,9 @@ public: QList<LookupItem> lookup(const Name *name, Scope *scope) const; ClassOrNamespace *lookupType(const Name *name, Scope *scope, - ClassOrNamespace* enclosingTemplateInstantiation = 0) const; + ClassOrNamespace* enclosingTemplateInstantiation = 0, + QSet<const Declaration *> typedefsBeingResolved + = QSet<const Declaration *>()) const; ClassOrNamespace *lookupType(Symbol *symbol, ClassOrNamespace* enclosingTemplateInstantiation = 0) const; ClassOrNamespace *lookupParent(Symbol *symbol) const; diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index 44f9178cdb..0be0fa1b53 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -1885,3 +1885,140 @@ void CppToolsPlugin::test_completion_recursive_auto_declarations2_QTCREATORBUG95 QCOMPARE(completions.size(), 0); } + +void CppToolsPlugin::test_completion_recursive_typedefs_declarations1() +{ + TestData data; + data.srcText = + "void f()\n" + "{\n" + " typedef A B;\n" + " typedef B A;\n" + " A a;\n" + " @;\n" + " // padding so we get the scope right\n" + "}\n" + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("a."); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 0); +} + +void CppToolsPlugin::test_completion_recursive_typedefs_declarations2() +{ + TestData data; + data.srcText = + "void f()\n" + "{\n" + " typedef A C;\n" + " typedef C B;\n" + " typedef B A;\n" + " A a;\n" + " @;\n" + " // padding so we get the scope right\n" + "}\n" + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("a."); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 0); +} + +void CppToolsPlugin::test_completion_recursive_using_declarations1() +{ + TestData data; + data.srcText = + "void f()\n" + "{\n" + " using B = A;\n" + " using A = B;\n" + " A a;\n" + " @;\n" + " // padding so we get the scope right\n" + "}\n" + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("a."); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 0); +} + +void CppToolsPlugin::test_completion_recursive_using_declarations2() +{ + TestData data; + data.srcText = + "void f()\n" + "{\n" + " using C = A;\n" + " using B = C;\n" + " using A = B;\n" + " A a;\n" + " @;\n" + " // padding so we get the scope right\n" + "}\n" + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("a."); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 0); +} + +void CppToolsPlugin::test_completion_recursive_using_typedef_declarations() +{ + TestData data; + data.srcText = + "void f()\n" + "{\n" + " using B = A;\n" + " typedef B A;\n" + " A a;\n" + " @;\n" + " // padding so we get the scope right\n" + "}\n" + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("a."); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 0); +} diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 0b3998c9e6..3d264f1653 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -130,6 +130,11 @@ private slots: void test_completion_crash_cloning_template_class_QTCREATORBUG9329(); void test_completion_recursive_auto_declarations1_QTCREATORBUG9503(); void test_completion_recursive_auto_declarations2_QTCREATORBUG9503(); + void test_completion_recursive_typedefs_declarations1(); + void test_completion_recursive_typedefs_declarations2(); + void test_completion_recursive_using_declarations1(); + void test_completion_recursive_using_declarations2(); + void test_completion_recursive_using_typedef_declarations(); void test_format_pointerdeclaration_in_simpledeclarations(); void test_format_pointerdeclaration_in_simpledeclarations_data(); |