[clang-tools-extra] 9108715 - [clangd] Fix AddUsing tweak for out-of-line functions.
Haojian Wu via cfe-commits
cfe-commits at lists.llvm.org
Thu May 7 03:50:57 PDT 2020
Author: Adam Czachorowski
Date: 2020-05-07T12:50:04+02:00
New Revision: 91087153210132a4c2d3cf19a4526d8f395cb5a4
URL: https://github.com/llvm/llvm-project/commit/91087153210132a4c2d3cf19a4526d8f395cb5a4
DIFF: https://github.com/llvm/llvm-project/commit/91087153210132a4c2d3cf19a4526d8f395cb5a4.diff
LOG: [clangd] Fix AddUsing tweak for out-of-line functions.
Summary:
We used getEnclosingNamespaceContext(), which calls getParent() rather
than getLexicalParent(), so we would end up adding the "using" line in
places that do not affect the cursor location, or just return an error
when declaration was in another file.
Patch by Adam Czachorowski!
Reviewers: hokein
Reviewed By: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D79496
Added:
Modified:
clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
clang-tools-extra/clangd/unittests/TweakTests.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
index f5eee85193ce..af063ba273dc 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
+++ b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
@@ -141,10 +141,12 @@ findInsertionPoint(const Tweak::Selection &Inputs,
}
// No relevant "using" statements. Try the nearest namespace level.
- const auto *NS = Inputs.ASTSelection.commonAncestor()
- ->getDeclContext()
- .getEnclosingNamespaceContext();
- if (auto *ND = dyn_cast<NamespaceDecl>(NS)) {
+ const DeclContext *ParentDeclCtx =
+ &Inputs.ASTSelection.commonAncestor()->getDeclContext();
+ while (ParentDeclCtx && !ParentDeclCtx->isFileContext()) {
+ ParentDeclCtx = ParentDeclCtx->getLexicalParent();
+ }
+ if (auto *ND = llvm::dyn_cast_or_null<NamespaceDecl>(ParentDeclCtx)) {
auto Toks = Inputs.AST->getTokens().expandedTokens(ND->getSourceRange());
const auto *Tok = llvm::find_if(Toks, [](const syntax::Token &Tok) {
return Tok.kind() == tok::l_brace;
diff --git a/clang-tools-extra/clangd/unittests/TweakTests.cpp b/clang-tools-extra/clangd/unittests/TweakTests.cpp
index e85d2624d265..cda31b5f068d 100644
--- a/clang-tools-extra/clangd/unittests/TweakTests.cpp
+++ b/clang-tools-extra/clangd/unittests/TweakTests.cpp
@@ -2663,6 +2663,23 @@ using one::two::ff;
void fun() {
CALL(ff);
+})cpp"},
+ // Parent namespace != lexical parent namespace
+ {R"cpp(
+#include "test.hpp"
+namespace foo { void fun(); }
+
+void foo::fun() {
+ one::two::f^f();
+})cpp",
+ R"cpp(
+#include "test.hpp"
+using one::two::ff;
+
+namespace foo { void fun(); }
+
+void foo::fun() {
+ ff();
})cpp"}};
llvm::StringMap<std::string> EditedFiles;
for (const auto &Case : Cases) {
More information about the cfe-commits
mailing list