Return the bound node names

Author: Febbe

clang-tools-extra/clangd/ClangdLSPServer.cpp

@@ -856,7 +856,7 @@ void ClangdLSPServer::onCommandApplyRename(const RenameParams &R,
 void ClangdLSPServer::onMethodSearchAST(const SearchASTArgs &Args,
                                         Callback<llvm::json::Value> Reply) {
   Server->findAST(Args, [Reply = std::move(Reply)](
-                            llvm::Expected<std::vector<std::vector<ASTNode>>>
+                            llvm::Expected<BoundASTNodes>
                                 BoundNodes) mutable {
     if (!BoundNodes)
       return Reply(BoundNodes.takeError());

clang-tools-extra/clangd/ClangdServer.cpp

@@ -811,7 +811,7 @@ void ClangdServer::locateSymbolAt(PathRef File, Position Pos,
 }
 
 void ClangdServer::findAST(SearchASTArgs const &Args,
-                           Callback<std::vector<std::vector<ASTNode>>> CB) {
+                           Callback<BoundASTNodes> CB) {
   auto Action =
       [Args, CB = std::move(CB)](llvm::Expected<InputsAndAST> InpAST) mutable {
         if (!InpAST)
@@ -824,19 +824,17 @@ void ClangdServer::findAST(SearchASTArgs const &Args,
 
         auto &&AST = InpAST->AST;
         // Convert BoundNodes to a vector of vectors to ASTNode's.
-        std::vector<std::vector<ASTNode>> Result;
+        BoundASTNodes Result;
         Result.reserve(BoundNodes->size());
         for (auto &&BN : *BoundNodes) {
           auto &&Map = BN.getMap();
-          std::vector<ASTNode> Nodes;
-          Nodes.reserve(Map.size());
+          BoundASTNodes::value_type BAN;
           for (const auto &[Key, Value] : Map) {
-            auto Node = dumpAST(Value, AST.getTokens(), AST.getASTContext());
-            Nodes.push_back(std::move(Node));
+            BAN.emplace(Key, dumpAST(Value, AST.getTokens(), AST.getASTContext()));
           }
-          if (Nodes.empty())
+          if (BAN.empty())
             continue;
-          Result.push_back(std::move(Nodes));
+          Result.push_back(std::move(BAN));
         }
         if (Result.empty()) {
           return CB(error("No AST nodes found for the query"));

clang-tools-extra/clangd/ClangdServer.h

@@ -37,6 +37,7 @@
 #include "llvm/ADT/FunctionExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include <functional>
+#include <map>
 #include <memory>
 #include <optional>
 #include <string>
@@ -263,7 +264,7 @@ class ClangdServer {
                       Callback<std::vector<LocatedSymbol>> CB);
 
   void findAST(const SearchASTArgs &Args,
-               Callback<std::vector<std::vector<ASTNode>>> CB);
+               Callback<BoundASTNodes> CB);
 
   /// Switch to a corresponding source file when given a header file, and vice
   /// versa.

clang-tools-extra/clangd/Protocol.h

@@ -1463,6 +1463,7 @@ struct SearchASTArgs {
   static auto constexpr Tk = TraversalKind::TK_IgnoreUnlessSpelledInSource;
 };
 bool fromJSON(const llvm::json::Value &, SearchASTArgs &, llvm::json::Path);
+using BoundASTNodes = std::vector<std::map<std::string, struct ASTNode>>;
 
 struct PrepareRenameResult {
   /// Range of the string to rename.

llvm/include/llvm/Support/JSON.h

@@ -111,6 +111,10 @@ class Object {
   // (using std::pair forces extra copies).
   struct KV;
   explicit Object(std::initializer_list<KV> Properties);
+  template <typename Collection> explicit Object(Collection &&C) {
+    for (auto &&P : C)
+      M.insert(P);
+  }
 
   iterator begin() { return M.begin(); }
   const_iterator begin() const { return M.begin(); }