diff --git a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp --- a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp @@ -90,12 +90,19 @@ if (SM.getFileID(Loc) != SM.getMainFileID()) { return true; } - if (D->getDeclContext()->Encloses(SelectionDeclContext)) { - Results.push_back(D); - } + Results.push_back(D); return true; } + bool TraverseNamespaceDecl(NamespaceDecl *D) { + for (auto *Decl : D->decls()) { + if (auto *Node = dyn_cast(Decl)) { + VisitUsingDecl(Node); + } + } + return RecursiveASTVisitor::TraverseNamespaceDecl(D); + } + bool TraverseDecl(Decl *Node) { if (!Node) return true; diff --git a/clang-tools-extra/clangd/unittests/tweaks/AddUsingTests.cpp b/clang-tools-extra/clangd/unittests/tweaks/AddUsingTests.cpp --- a/clang-tools-extra/clangd/unittests/tweaks/AddUsingTests.cpp +++ b/clang-tools-extra/clangd/unittests/tweaks/AddUsingTests.cpp @@ -395,6 +395,28 @@ cc C; })cpp"}, + // Should drop the qualifier in anon namespaces + {R"cpp( +namespace ns { struct Foo; struct Bar; } +namespace { using ns::Foo; } +void foo() { ns::^Foo *f; ns::Bar *b; +})cpp", + R"cpp( +namespace ns { struct Foo; struct Bar; } +namespace { using ns::Foo; } +void foo() { Foo *f; ns::Bar *b; +})cpp"}, + // Should insert the using decl into the anon namespace + {R"cpp( +namespace ns { struct Foo; struct Bar; } +namespace { using ns::Foo; } +void foo() { ns::Foo *f; ns::^Bar *b; } +)cpp", + R"cpp( +namespace ns { struct Foo; struct Bar; } +namespace { using ns::Bar;using ns::Foo; } +void foo() { ns::Foo *f; Bar *b; } +)cpp"}, // Type defined in main file, make sure using is after that. {R"cpp( namespace xx {