From 50a900e509be2e1f448f29be126ba3b7f8173901 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 11 Jun 2013 10:22:10 +0200 Subject: 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 --- src/libs/cplusplus/LookupContext.cpp | 13 ++- src/libs/cplusplus/LookupContext.h | 4 +- src/plugins/cpptools/cppcompletion_test.cpp | 137 ++++++++++++++++++++++++++++ src/plugins/cpptools/cpptoolsplugin.h | 5 + 4 files changed, 155 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 3f0eb8ea29..167d9c692a 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -305,7 +305,8 @@ ClassOrNamespace *LookupContext::globalNamespace() const } ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, - ClassOrNamespace* enclosingTemplateInstantiation) const + ClassOrNamespace* enclosingTemplateInstantiation, + QSet typedefsBeingResolved) const { if (! scope) { return 0; @@ -324,8 +325,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(typedefsBeingResolved) + << d); + } } } } else if (UsingDeclaration *ud = m->asUsingDeclaration()) { diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index 921c605b14..37b6f339b9 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -289,7 +289,9 @@ public: QList lookup(const Name *name, Scope *scope) const; ClassOrNamespace *lookupType(const Name *name, Scope *scope, - ClassOrNamespace* enclosingTemplateInstantiation = 0) const; + ClassOrNamespace* enclosingTemplateInstantiation = 0, + QSet typedefsBeingResolved + = QSet()) 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 fd691023f8..369f520cd2 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -2326,3 +2326,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 03c06ba58b..d0dadeb2c8 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -140,6 +140,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(); -- cgit v1.2.1