[lldb-dap] Update with review changes

Author: da-viper

lldb/tools/lldb-dap/DAP.cpp

@@ -81,7 +81,7 @@ DAP::DAP(llvm::StringRef path, Log *log, const ReplMode default_repl_mode,
       configuration_done_sent(false), waiting_for_run_in_terminal(false),
       progress_event_reporter(
           [&](const ProgressEvent &event) { SendJSON(event.ToJSON()); }),
-      reverse_request_seq(0), repl_mode(default_repl_mode), goto_id_map() {}
+      reverse_request_seq(0), repl_mode(default_repl_mode), gotos() {}
 
 DAP::~DAP() = default;
 
@@ -850,17 +850,17 @@ std::optional<lldb::SBLineEntry> Gotos::GetLineEntry(uint64_t id) const {
 }
 
 uint64_t Gotos::InsertLineEntry(lldb::SBLineEntry line_entry) {
-  const auto spec_id = this->NewSpecId();
+  const auto spec_id = this->NewSpecID();
   line_entries.insert(std::make_pair(spec_id, line_entry));
   return spec_id;
 }
 
 void Gotos::Clear() {
-  new_id = 0UL;
+  new_id = 0;
   line_entries.clear();
 }
 
-uint64_t Gotos::NewSpecId() { return new_id++; }
+uint64_t Gotos::NewSpecID() { return new_id++; }
 
 void Variables::Clear() {
   locals.Clear();

lldb/tools/lldb-dap/DAP.h

@@ -92,10 +92,10 @@ class Gotos {
   void Clear();
 
 private:
-  uint64_t NewSpecId();
+  uint64_t NewSpecID();
 
   llvm::DenseMap<uint64_t, lldb::SBLineEntry> line_entries;
-  uint64_t new_id = 0ul;
+  uint64_t new_id = 0;
 };
 
 struct Variables {
@@ -226,7 +226,7 @@ struct DAP {
   // empty; if the previous expression was a variable expression, this string
   // will contain that expression.
   std::string last_nonempty_var_expression;
-  Gotos goto_id_map;
+  Gotos gotos;
 
   /// Creates a new DAP sessions.
   ///
@@ -391,7 +391,7 @@ struct DAP {
   /// Debuggee will continue from stopped state.
   void WillContinue() {
     variables.Clear();
-    goto_id_map.Clear();
+    gotos.Clear();
   }
 
   /// Poll the process to wait for it to reach the eStateStopped state.

lldb/tools/lldb-dap/Handler/GoToRequestHandler.cpp

@@ -12,7 +12,7 @@
 
 namespace lldb_dap {
 
-/// Creates an \p StoppedEvent with the reason \a goto
+/// Creates an \p StoppedEvent with the reason \a goto.
 static void SendThreadGotoEvent(DAP &dap, lldb::tid_t thread_id) {
   llvm::json::Object event(CreateEventObject("stopped"));
   llvm::json::Object body;
@@ -83,31 +83,27 @@ void GoToRequestHandler::operator()(const llvm::json::Object &request) const {
 
   const auto *goto_arguments = request.getObject("arguments");
   if (goto_arguments == nullptr) {
-    SendError("Arguments is empty");
-    return;
+    return SendError("Arguments is empty");
   }
 
   lldb::SBThread current_thread = dap.GetLLDBThread(*goto_arguments);
   if (!current_thread.IsValid()) {
-    SendError(llvm::formatv("Thread id `{0}` is not valid",
-                            current_thread.GetThreadID()));
-    return;
+    return SendError(llvm::formatv("Thread id `{0}` is not valid",
+                                   current_thread.GetThreadID()));
   }
 
   const auto target_id = GetInteger<uint64_t>(goto_arguments, "targetId");
-  const auto line_entry = dap.goto_id_map.GetLineEntry(target_id.value());
+  const auto line_entry = dap.gotos.GetLineEntry(target_id.value());
   if (!target_id || !line_entry) {
-    SendError(llvm::formatv("Target id `{0}` is not valid",
-                            current_thread.GetThreadID()));
-    return;
+    return SendError(llvm::formatv("Target id `{0}` is not valid",
+                                   current_thread.GetThreadID()));
   }
 
   auto file_spec = line_entry->GetFileSpec();
   const auto error =
       current_thread.JumpToLine(file_spec, line_entry->GetLine());
   if (error.Fail()) {
-    SendError(error.GetCString());
-    return;
+    return SendError(error.GetCString());
   }
 
   dap.SendJSON(llvm::json::Value(std::move(response)));

lldb/tools/lldb-dap/Handler/GoToTargetsRequestHandler.cpp

@@ -18,13 +18,13 @@ namespace lldb_dap {
 
 static llvm::SmallVector<lldb::SBLineEntry>
 GetLineValidEntry(DAP &dap, const lldb::SBFileSpec &file_spec, uint32_t line) {
-  // disable breakpoint listeners so they do not send events to the DAP client.
+  // Disable breakpoint listeners so they do not send events to the DAP client.
   lldb::SBListener listener = dap.debugger.GetListener();
   lldb::SBBroadcaster broadcaster = dap.target.GetBroadcaster();
   constexpr auto event_mask = lldb::SBTarget::eBroadcastBitBreakpointChanged;
   listener.StopListeningForEvents(broadcaster, event_mask);
 
-  // create a breakpoint to resolve the line if it is on an empty line.
+  // Create a breakpoint to resolve the line if it is on an empty line.
   lldb::SBBreakpoint goto_bp =
       dap.target.BreakpointCreateByLocation(file_spec, line);
   if (!goto_bp.IsValid())
@@ -142,7 +142,7 @@ void GoToTargetsRequestHandler::operator()(
   } else {
     llvm::json::Array response_targets;
     for (lldb::SBLineEntry &line_entry : goto_locations) {
-      const uint64_t target_id = dap.goto_id_map.InsertLineEntry(line_entry);
+      const uint64_t target_id = dap.gotos.InsertLineEntry(line_entry);
       const uint32_t target_line = line_entry.GetLine();
       auto target = llvm::json::Object();
       target.try_emplace("id", target_id);