Address review feedback

Author: JDevlieghere

lldb/tools/lldb-dap/CMakeLists.txt

@@ -36,8 +36,8 @@ add_lldb_tool(lldb-dap
   SourceBreakpoint.cpp
   Watchpoint.cpp
 
-  Request/Request.cpp
-  Request/AttachRequest.cpp
+  Handler/RequestHandler.cpp
+  Handler/AttachHandler.cpp
 
   LINK_LIBS
     liblldb

lldb/tools/lldb-dap/DAP.h

@@ -12,11 +12,11 @@
 #include "DAPForward.h"
 #include "ExceptionBreakpoint.h"
 #include "FunctionBreakpoint.h"
+#include "Handler/RequestHandler.h"
 #include "IOStream.h"
 #include "InstructionBreakpoint.h"
 #include "OutputRedirector.h"
 #include "ProgressEvent.h"
-#include "Request/Request.h"
 #include "SourceBreakpoint.h"
 #include "lldb/API/SBBroadcaster.h"
 #include "lldb/API/SBCommandInterpreter.h"
@@ -186,7 +186,7 @@ struct DAP {
   lldb::pid_t restarting_process_id;
   bool configuration_done_sent;
   std::map<std::string, RequestCallback, std::less<>> request_handlers;
-  llvm::StringMap<std::unique_ptr<Request>> new_request_handlers;
+  llvm::StringMap<std::unique_ptr<RequestHandler>> new_request_handlers;
   bool waiting_for_run_in_terminal;
   ProgressEventReporter progress_event_reporter;
   // Keep track of the last stop thread index IDs as threads won't go away
@@ -334,8 +334,9 @@ struct DAP {
   void RegisterRequestCallback(std::string request, RequestCallback callback);
 
   /// Registers a request handler.
-  template <typename Request> void RegisterRequest() {
-    new_request_handlers[Request::getName()] = std::make_unique<Request>(*this);
+  template <typename Handler> void RegisterRequest() {
+    new_request_handlers[Handler::getCommand()] =
+        std::make_unique<Handler>(*this);
   }
 
   /// Debuggee will continue from stopped state.

lldb/tools/lldb-dap/Request/AttachRequest.cpp renamed to lldb/tools/lldb-dap/Handler/AttachHandler.cpp

@@ -1,4 +1,4 @@
-//===-- AttachRequest.cpp -------------------------------------------------===//
+//===-- AttachHandler.cpp -------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -8,7 +8,7 @@
 
 #include "DAP.h"
 #include "JSONUtils.h"
-#include "Request.h"
+#include "RequestHandler.h"
 #include "lldb/API/SBListener.h"
 #include "llvm/Support/FileSystem.h"
 
@@ -50,7 +50,7 @@ static void PrintWelcomeMessage(DAP &dap) {
 //   }]
 // }
 
-void AttachRequest::operator()(const llvm::json::Object &request) {
+void AttachRequestHandler::operator()(const llvm::json::Object &request) {
   dap.is_attach = true;
   dap.last_launch_or_attach_request = request;
   llvm::json::Object response;

lldb/tools/lldb-dap/Request/Request.cpp renamed to lldb/tools/lldb-dap/Handler/RequestHandler.cpp

@@ -1,19 +1,20 @@
-//===-- Request.cpp -------------------------------------------------------===//
+//===-- Handler.cpp -------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "Request.h"
+#include "RequestHandler.h"
 #include "DAP.h"
 #include "JSONUtils.h"
 #include "lldb/API/SBFileSpec.h"
 
 namespace lldb_dap {
 
-void Request::SendProcessEvent(Request::LaunchMethod launch_method) {
+void RequestHandler::SendProcessEvent(
+    RequestHandler::LaunchMethod launch_method) {
   lldb::SBFileSpec exe_fspec = dap.target.GetExecutable();
   char exe_path[PATH_MAX];
   exe_fspec.GetPath(exe_path, sizeof(exe_path));
@@ -42,7 +43,8 @@ void Request::SendProcessEvent(Request::LaunchMethod launch_method) {
 
 // Both attach and launch take a either a sourcePath or sourceMap
 // argument (or neither), from which we need to set the target.source-map.
-void Request::SetSourceMapFromArguments(const llvm::json::Object &arguments) {
+void RequestHandler::SetSourceMapFromArguments(
+    const llvm::json::Object &arguments) {
   const char *sourceMapHelp =
       "source must be be an array of two-element arrays, "
       "each containing a source and replacement path string.\n";

lldb/tools/lldb-dap/Request/Request.h renamed to lldb/tools/lldb-dap/Handler/RequestHandler.h

@@ -6,37 +6,38 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLDB_TOOLS_LLDB_DAP_REQUEST_REQUEST_H
-#define LLDB_TOOLS_LLDB_DAP_REQUEST_REQUEST_H
+#ifndef LLDB_TOOLS_LLDB_DAP_HANDLER_HANDLER_H
+#define LLDB_TOOLS_LLDB_DAP_HANDLER_HANDLER_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/JSON.h"
 
 namespace lldb_dap {
 struct DAP;
 
-class Request {
+class RequestHandler {
 public:
-  Request(DAP &dap) : dap(dap) {}
-  virtual ~Request() = default;
+  RequestHandler(DAP &dap) : dap(dap) {}
+  virtual ~RequestHandler() = default;
 
   virtual void operator()(const llvm::json::Object &request) = 0;
 
-  static llvm::StringLiteral getName() { return "invalid"; };
-
+  /// Helpers used by multiple request handlers.
+  /// FIXME: Move these into the DAP class.
+  /// @{
   enum LaunchMethod { Launch, Attach, AttachForSuspendedLaunch };
-
   void SendProcessEvent(LaunchMethod launch_method);
   void SetSourceMapFromArguments(const llvm::json::Object &arguments);
+  /// @}
 
 protected:
   DAP &dap;
 };
 
-class AttachRequest : public Request {
+class AttachRequestHandler : public RequestHandler {
 public:
-  using Request::Request;
-  static llvm::StringLiteral getName() { return "attach"; }
+  using RequestHandler::RequestHandler;
+  static llvm::StringLiteral getCommand() { return "attach"; }
   void operator()(const llvm::json::Object &request) override;
 };
 

lldb/tools/lldb-dap/lldb-dap.cpp

@@ -8,9 +8,9 @@
 
 #include "DAP.h"
 #include "FifoFiles.h"
+#include "Handler/RequestHandler.h"
 #include "JSONUtils.h"
 #include "LLDBUtils.h"
-#include "Request/Request.h"
 #include "RunInTerminal.h"
 #include "Watchpoint.h"
 #include "lldb/API/SBDeclaration.h"
@@ -4813,7 +4813,7 @@ void request_setInstructionBreakpoints(DAP &dap,
 }
 
 void RegisterRequestCallbacks(DAP &dap) {
-  dap.RegisterRequest<AttachRequest>();
+  dap.RegisterRequest<AttachRequestHandler>();
 
   dap.RegisterRequestCallback("breakpointLocations",
                               request_breakpointLocations);