fix comments and conventions

Author: eronnen

lldb/tools/lldb-dap/Breakpoint.cpp

@@ -78,7 +78,7 @@ protocol::Breakpoint Breakpoint::ToProtocolBreakpoint() {
         breakpoint.column = column;
       breakpoint.source = CreateSource(line_entry);
     } else {
-      // Breakpoint made by assembly
+      // Assembly breakpoint.
       auto symbol = bp_addr.GetSymbol();
       if (symbol.IsValid()) {
         breakpoint.line =

lldb/tools/lldb-dap/DAP.cpp

@@ -1625,13 +1625,13 @@ std::vector<protocol::Breakpoint> DAP::SetSourceBreakpoints(
     const std::optional<std::vector<protocol::SourceBreakpoint>> &breakpoints) {
   std::vector<protocol::Breakpoint> response_breakpoints;
   if (source.sourceReference) {
-    // breakpoint set by assembly source.
+    // Breakpoint set by assembly source.
     auto &existing_breakpoints =
         m_source_assembly_breakpoints[*source.sourceReference];
     response_breakpoints =
         SetSourceBreakpoints(source, breakpoints, existing_breakpoints);
   } else {
-    // breakpoint set by a regular source file.
+    // Breakpoint set by a regular source file.
     const auto path = source.path.value_or("");
     auto &existing_breakpoints = m_source_breakpoints[path];
     response_breakpoints =
@@ -1659,16 +1659,17 @@ std::vector<protocol::Breakpoint> DAP::SetSourceBreakpoints(
           existing_breakpoints.try_emplace(bp_pos, src_bp);
       // We check if this breakpoint already exists to update it.
       if (inserted) {
-        if (auto error = iv->second.SetBreakpoint(source)) {
+        if (llvm::Error error = iv->second.SetBreakpoint(source)) {
           protocol::Breakpoint invalid_breakpoint;
           invalid_breakpoint.message = llvm::toString(std::move(error));
           invalid_breakpoint.verified = false;
           response_breakpoints.push_back(std::move(invalid_breakpoint));
           existing_breakpoints.erase(iv);
           continue;
         }
-      } else
+      } else {
         iv->second.UpdateBreakpoint(src_bp);
+      }
 
       protocol::Breakpoint response_breakpoint =
           iv->second.ToProtocolBreakpoint();

lldb/tools/lldb-dap/DAP.h

@@ -219,7 +219,7 @@ struct DAP {
   /// @}
 
   /// Number of lines of assembly code to show when no debug info is available.
-  static constexpr uint32_t number_of_assembly_lines_for_nodebug = 32;
+  static constexpr uint32_t k_number_of_assembly_lines_for_nodebug = 32;
 
   /// Creates a new DAP sessions.
   ///

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

@@ -27,9 +27,10 @@ BreakpointLocationsRequestHandler::Run(
 
   // Find all relevant lines & columns.
   std::vector<std::pair<uint32_t, uint32_t>> locations;
-  if (args.source.sourceReference)
+  if (args.source.sourceReference) {
     locations = GetAssemblyBreakpointLocations(*args.source.sourceReference,
                                                start_line, end_line);
+  }
   else {
     std::string path = args.source.path.value_or("");
     locations = GetSourceBreakpointLocations(
@@ -114,7 +115,7 @@ BreakpointLocationsRequestHandler::GetAssemblyBreakpointLocations(
   if (!symbol.IsValid())
     return locations;
 
-  // start_line is relative to the symbol's start address
+  // start_line is relative to the symbol's start address.
   lldb::SBInstructionList insts = symbol.GetInstructions(dap.target);
   if (insts.GetSize() > (start_line - 1))
     locations.reserve(insts.GetSize() - (start_line - 1));

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

@@ -51,7 +51,7 @@ SourceRequestHandler::Run(const protocol::SourceArguments &args) const {
   } else {
     // No valid symbol, just return the disassembly.
     lldb::SBInstructionList insts = dap.target.ReadInstructions(
-        address, dap.number_of_assembly_lines_for_nodebug);
+        address, dap.k_number_of_assembly_lines_for_nodebug);
     insts.GetDescription(stream, exe_ctx);
   }
 

lldb/tools/lldb-dap/SourceBreakpoint.cpp

@@ -45,15 +45,15 @@ llvm::Error SourceBreakpoint::SetBreakpoint(const protocol::Source &source) {
                                    "Invalid line number.");
 
   if (source.sourceReference) {
-    // breakpoint set by assembly source.
+    // Breakpoint set by assembly source.
     lldb::SBAddress source_address(*source.sourceReference, m_dap.target);
     if (!source_address.IsValid())
       return llvm::createStringError(llvm::inconvertibleErrorCode(),
                                      "Invalid sourceReference.");
 
     lldb::SBSymbol symbol = source_address.GetSymbol();
     if (!symbol.IsValid()) {
-      // Not yet supporting breakpoints in assembly without a valid symbol.
+      // FIXME: Support assembly breakpoints without a valid symbol.
       return llvm::createStringError(llvm::inconvertibleErrorCode(),
                                      "Breakpoints in assembly without a valid "
                                      "symbol are not supported yet.");
@@ -70,7 +70,7 @@ llvm::Error SourceBreakpoint::SetBreakpoint(const protocol::Source &source) {
 
     m_bp = m_dap.target.BreakpointCreateBySBAddress(address);
   } else {
-    // breakpoint set by a regular source file.
+    // Breakpoint set by a regular source file.
     const auto source_path = source.path.value_or("");
     lldb::SBFileSpecList module_list;
     m_bp = m_dap.target.BreakpointCreateByLocation(source_path.c_str(), m_line,