Author: hokein Date: Mon Dec 3 04:53:19 2018 New Revision: 348130 URL: http://llvm.org/viewvc/llvm-project?rev=348130&view=rev Log: [clangd] Get rid of AST matchers in CodeComplete, NFC
Summary: The isIndexedForCodeCompletion is called in the code patch of SymbolCollector. Reviewers: kadircet Subscribers: ilya-biryukov, ioeric, MaskRay, jkorous, arphaman, cfe-commits Differential Revision: https://reviews.llvm.org/D55206 Modified: clang-tools-extra/trunk/clangd/CodeComplete.cpp Modified: clang-tools-extra/trunk/clangd/CodeComplete.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/CodeComplete.cpp?rev=348130&r1=348129&r2=348130&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/CodeComplete.cpp (original) +++ clang-tools-extra/trunk/clangd/CodeComplete.cpp Mon Dec 3 04:53:19 2018 @@ -37,7 +37,6 @@ #include "index/Index.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclBase.h" -#include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Basic/LangOptions.h" #include "clang/Basic/SourceLocation.h" #include "clang/Format/Format.h" @@ -1645,14 +1644,24 @@ SignatureHelp signatureHelp(PathRef File } bool isIndexedForCodeCompletion(const NamedDecl &ND, ASTContext &ASTCtx) { - using namespace clang::ast_matchers; - auto InTopLevelScope = hasDeclContext( - anyOf(namespaceDecl(), translationUnitDecl(), linkageSpecDecl())); - return !match(decl(anyOf(InTopLevelScope, - hasDeclContext( - enumDecl(InTopLevelScope, unless(isScoped()))))), - ND, ASTCtx) - .empty(); + auto InTopLevelScope = [](const NamedDecl &ND) { + switch (ND.getDeclContext()->getDeclKind()) { + case Decl::TranslationUnit: + case Decl::Namespace: + case Decl::LinkageSpec: + return true; + default: + break; + }; + return false; + }; + if (InTopLevelScope(ND)) + return true; + + if (const auto *EnumDecl = dyn_cast<clang::EnumDecl>(ND.getDeclContext())) + return InTopLevelScope(*EnumDecl) && !EnumDecl->isScoped(); + + return false; } CompletionItem CodeCompletion::render(const CodeCompleteOptions &Opts) const { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
