rename to ModuleSymbolsRequestHandler

Author: eronnen

lldb/tools/lldb-dap/CMakeLists.txt

@@ -36,7 +36,6 @@ add_lldb_library(lldbDAP
   Handler/CompletionsHandler.cpp
   Handler/ConfigurationDoneRequestHandler.cpp
   Handler/ContinueRequestHandler.cpp
-  Handler/DAPGetModuleSymbolsRequestHandler.cpp
   Handler/DataBreakpointInfoRequestHandler.cpp
   Handler/DisassembleRequestHandler.cpp
   Handler/DisconnectRequestHandler.cpp
@@ -46,6 +45,7 @@ add_lldb_library(lldbDAP
   Handler/LaunchRequestHandler.cpp
   Handler/LocationsRequestHandler.cpp
   Handler/ModulesRequestHandler.cpp
+  Handler/ModuleSymbolsRequestHandler.cpp
   Handler/NextRequestHandler.cpp
   Handler/PauseRequestHandler.cpp
   Handler/ReadMemoryRequestHandler.cpp

lldb/tools/lldb-dap/DAP.cpp

@@ -1614,7 +1614,7 @@ void DAP::RegisterRequests() {
   // Custom requests
   RegisterRequest<CompileUnitsRequestHandler>();
   RegisterRequest<ModulesRequestHandler>();
-  RegisterRequest<DAPGetModuleSymbolsRequestHandler>();
+  RegisterRequest<ModuleSymbolsRequestHandler>();
 
   // Testing requests
   RegisterRequest<TestGetTargetBreakpointsRequestHandler>();

…er/DAPGetModuleSymbolsRequestHandler.cpp …/Handler/ModuleSymbolsRequestHandler.cpplldb/tools/lldb-dap/Handler/DAPGetModuleSymbolsRequestHandler.cpp renamed to lldb/tools/lldb-dap/Handler/ModuleSymbolsRequestHandler.cpp lldb/tools/lldb-dap/Handler/DAPGetModuleSymbolsRequestHandler.cpp renamed to lldb/tools/lldb-dap/Handler/ModuleSymbolsRequestHandler.cpp

@@ -87,15 +87,9 @@ static std::string SymbolTypeToString(lldb::SymbolType symbol_type) {
   llvm_unreachable("unhandled symbol type.");
 }
 
-/// Modules can be retrieved from the debug adapter with this request which can
-/// either return all modules or a range of modules to support paging.
-///
-/// Clients should only call this request if the corresponding capability
-/// `supportsModulesRequest` is true.
-llvm::Expected<DAPGetModuleSymbolsResponseBody>
-DAPGetModuleSymbolsRequestHandler::Run(
-    const DAPGetModuleSymbolsArguments &args) const {
-  DAPGetModuleSymbolsResponseBody response;
+llvm::Expected<ModuleSymbolsResponseBody>
+ModuleSymbolsRequestHandler::Run(const ModuleSymbolsArguments &args) const {
+  ModuleSymbolsResponseBody response;
 
   lldb::SBModuleSpec module_spec;
   if (args.moduleId) {

lldb/tools/lldb-dap/Handler/RequestHandler.h

@@ -594,15 +594,15 @@ class CancelRequestHandler : public RequestHandler<protocol::CancelArguments,
   llvm::Error Run(const protocol::CancelArguments &args) const override;
 };
 
-class DAPGetModuleSymbolsRequestHandler
+class ModuleSymbolsRequestHandler
     : public RequestHandler<
-          protocol::DAPGetModuleSymbolsArguments,
-          llvm::Expected<protocol::DAPGetModuleSymbolsResponseBody>> {
+          protocol::ModuleSymbolsArguments,
+          llvm::Expected<protocol::ModuleSymbolsResponseBody>> {
 public:
   using RequestHandler::RequestHandler;
-  static llvm::StringLiteral GetCommand() { return "dapGetModuleSymbols"; }
-  llvm::Expected<protocol::DAPGetModuleSymbolsResponseBody>
-  Run(const protocol::DAPGetModuleSymbolsArguments &args) const override;
+  static llvm::StringLiteral GetCommand() { return "moduleSymbols"; }
+  llvm::Expected<protocol::ModuleSymbolsResponseBody>
+  Run(const protocol::ModuleSymbolsArguments &args) const override;
 };
 
 /// A request used in testing to get the details on all breakpoints that are

lldb/tools/lldb-dap/Protocol/ProtocolRequests.cpp

@@ -598,14 +598,14 @@ json::Value toJSON(const WriteMemoryResponseBody &WMR) {
   return result;
 }
 
-bool fromJSON(const llvm::json::Value &Params,
-              DAPGetModuleSymbolsArguments &Args, llvm::json::Path P) {
+bool fromJSON(const llvm::json::Value &Params, ModuleSymbolsArguments &Args,
+              llvm::json::Path P) {
   json::ObjectMapper O(Params, P);
   return O && O.mapOptional("moduleId", Args.moduleId) &&
          O.mapOptional("moduleName", Args.moduleName);
 }
 
-llvm::json::Value toJSON(const DAPGetModuleSymbolsResponseBody &DGMSR) {
+llvm::json::Value toJSON(const ModuleSymbolsResponseBody &DGMSR) {
   json::Object result;
   result.insert({"symbols", DGMSR.symbols});
   return result;

lldb/tools/lldb-dap/Protocol/ProtocolRequests.h

@@ -981,22 +981,22 @@ struct WriteMemoryResponseBody {
 };
 llvm::json::Value toJSON(const WriteMemoryResponseBody &);
 
-struct DAPGetModuleSymbolsArguments {
+struct ModuleSymbolsArguments {
   /// The module UUID for which to retrieve symbols.
   std::optional<std::string> moduleId;
 
   /// The module path.
   std::optional<std::string> moduleName;
 };
-bool fromJSON(const llvm::json::Value &, DAPGetModuleSymbolsArguments &,
+bool fromJSON(const llvm::json::Value &, ModuleSymbolsArguments &,
               llvm::json::Path);
 
 /// Response to `getModuleSymbols` request.
-struct DAPGetModuleSymbolsResponseBody {
+struct ModuleSymbolsResponseBody {
   /// The symbols for the specified module.
   std::vector<dap::Symbol> symbols;
 };
-llvm::json::Value toJSON(const DAPGetModuleSymbolsResponseBody &);
+llvm::json::Value toJSON(const ModuleSymbolsResponseBody &);
 
 } // namespace lldb_dap::protocol