From 5dbcb974b02e788f9c213a917105a4e6b6593281 Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Thu, 9 May 2013 00:34:28 +0200 Subject: [PATCH] C++: added missing cloning of AnonymousNameId When instantiate a template with anonymous class/struct/union AnonymousNameId has to be cloned. Task-number: QTCREATORBUG-9227 Change-Id: Iedca5e41589e68a94a35cd4387241052c70c50df Reviewed-by: Sergey Shambir Reviewed-by: Friedemann Kleint Reviewed-by: Nikolai Kosjar --- src/libs/3rdparty/cplusplus/Templates.cpp | 5 ++++ src/libs/3rdparty/cplusplus/Templates.h | 1 + src/plugins/cpptools/cppcompletion_test.cpp | 32 +++++++++++++++++++++ src/plugins/cpptools/cpptoolsplugin.h | 1 + 4 files changed, 39 insertions(+) diff --git a/src/libs/3rdparty/cplusplus/Templates.cpp b/src/libs/3rdparty/cplusplus/Templates.cpp index b813600143f..5edef37c7f7 100644 --- a/src/libs/3rdparty/cplusplus/Templates.cpp +++ b/src/libs/3rdparty/cplusplus/Templates.cpp @@ -408,6 +408,11 @@ void CloneName::visit(const Identifier *name) _name = _control->identifier(name->chars(), name->size()); } +void CloneName::visit(const AnonymousNameId *name) +{ + _name = _control->anonymousNameId(name->classTokenIndex()); +} + void CloneName::visit(const TemplateNameId *name) { std::vector args(name->templateArgumentCount()); diff --git a/src/libs/3rdparty/cplusplus/Templates.h b/src/libs/3rdparty/cplusplus/Templates.h index 2784f02d7f9..f2b5b9a3677 100644 --- a/src/libs/3rdparty/cplusplus/Templates.h +++ b/src/libs/3rdparty/cplusplus/Templates.h @@ -109,6 +109,7 @@ public: protected: virtual void visit(const Identifier *name); + virtual void visit(const AnonymousNameId *name); virtual void visit(const TemplateNameId *name); virtual void visit(const DestructorNameId *name); virtual void visit(const OperatorNameId *name); diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp index d231f6f3178..385777de30e 100644 --- a/src/plugins/cpptools/cppcompletion_test.cpp +++ b/src/plugins/cpptools/cppcompletion_test.cpp @@ -2015,3 +2015,35 @@ void CppToolsPlugin::test_completion_type_and_using_declaration_data() << code << completions; } + +void CppToolsPlugin::test_completion_instantiate_template_with_anonymous_class() +{ + TestData data; + data.srcText = + "template \n" + "struct S\n" + "{\n" + " union { int i; char c; };\n" + "};\n" + "void fun()\n" + "{\n" + " S s;\n" + " @\n" + " // padding so we get the scope right\n" + "}\n" + + ; + setup(&data); + + Utils::ChangeSet change; + QString txt = QLatin1String("s."); + change.insert(data.pos, txt); + QTextCursor cursor(data.doc); + change.apply(&cursor); + data.pos += txt.length(); + + QStringList completions = getCompletions(data); + + QCOMPARE(completions.size(), 1); + QVERIFY(completions.contains(QLatin1String("S"))); +} diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index 37e06524fd9..dd925121c1c 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -126,6 +126,7 @@ private slots: void test_completion_QTCREATORBUG9098(); void test_completion_type_and_using_declaration(); void test_completion_type_and_using_declaration_data(); + void test_completion_instantiate_template_with_anonymous_class(); void test_format_pointerdeclaration_in_simpledeclarations(); void test_format_pointerdeclaration_in_simpledeclarations_data();