diff --git a/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp b/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp --- a/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.cpp @@ -24,13 +24,37 @@ return ND.isAnonymousNamespace() || ND.isInlineNamespace(); } -static bool singleNamedNamespaceChild(const NamespaceDecl &ND) { +static bool hasPPDirective(SourceRange Range, const SourceManager &SM, + const LangOptions &LangOpts) { + CharSourceRange CharRange = + Lexer::makeFileCharRange({Range, true}, SM, LangOpts); + StringRef BetweenText = Lexer::getSourceText(CharRange, SM, LangOpts); + std::string Buffer{BetweenText}; + Lexer Lex(Range.getBegin(), LangOpts, Buffer.c_str(), Buffer.c_str(), + Buffer.c_str() + Buffer.size()); + Token Tok; + while (!Lex.LexFromRawLexer(Tok)) { + if (Tok.getKind() == tok::hash) + return true; + } + return false; +} + +static bool singleNamedNamespaceChild(const NamespaceDecl &ND, + const SourceManager &SM, + const LangOptions &LangOpts) { NamespaceDecl::decl_range Decls = ND.decls(); if (std::distance(Decls.begin(), Decls.end()) != 1) return false; const auto *ChildNamespace = dyn_cast(*Decls.begin()); - return ChildNamespace && !anonymousOrInlineNamespace(*ChildNamespace); + if (!ChildNamespace || anonymousOrInlineNamespace(*ChildNamespace)) + return false; + + return !hasPPDirective({ND.getBeginLoc(), ChildNamespace->getBeginLoc()}, SM, + LangOpts) && + !hasPPDirective({ChildNamespace->getRBraceLoc(), ND.getRBraceLoc()}, + SM, LangOpts); } static bool alreadyConcatenated(std::size_t NumCandidates, @@ -76,6 +100,7 @@ const ast_matchers::MatchFinder::MatchResult &Result) { const NamespaceDecl &ND = *Result.Nodes.getNodeAs("namespace"); const SourceManager &Sources = *Result.SourceManager; + const LangOptions &LangOpts = getLangOpts(); if (!locationsInSameFile(Sources, ND.getBeginLoc(), ND.getRBraceLoc())) return; @@ -85,7 +110,7 @@ Namespaces.push_back(&ND); - if (singleNamedNamespaceChild(ND)) + if (singleNamedNamespaceChild(ND, Sources, LangOpts)) return; SourceRange FrontReplacement(Namespaces.front()->getBeginLoc(), @@ -94,7 +119,7 @@ Namespaces.front()->getRBraceLoc()); if (!alreadyConcatenated(Namespaces.size(), FrontReplacement, Sources, - getLangOpts())) + LangOpts)) reportDiagnostic(FrontReplacement, BackReplacement); Namespaces.clear(); diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/modernize/concat-nested-namespaces.cpp @@ -156,6 +156,18 @@ } // namespace n41 // CHECK-FIXES: } +namespace n43 { +#define FOO +namespace n44 { +} // namespace n44 +} // namespace n43 + +namespace n45 { +namespace n46 { +} // namespace n46 +#define BAR +} // namespace n45 + int main() { n26::n27::n28::n29::n30::t(); #ifdef IEXIST