conventions

Author: eronnen

lldb/tools/lldb-dap/Breakpoint.cpp

@@ -37,7 +37,7 @@ GetPersistenceDataForAddress(lldb::SBAddress &addr) {
     return std::nullopt;
 
   persistence_data.module = GetSBFileSpecPath(file_spec);
-  persistence_data.file_addr = addr.GetFileAddress();
+  persistence_data.fileAddress = addr.GetFileAddress();
   return persistence_data;
 }
 

lldb/tools/lldb-dap/DAP.cpp

@@ -1497,8 +1497,9 @@ std::vector<protocol::Breakpoint> DAP::SetSourceBreakpoints(
 
       protocol::Breakpoint response_breakpoint =
           iv->second.ToProtocolBreakpoint();
-      response_breakpoint.source = source;
 
+      if (!response_breakpoint.source)
+        response_breakpoint.source = source;
       if (!response_breakpoint.line &&
           src_bp.GetLine() != LLDB_INVALID_LINE_NUMBER)
         response_breakpoint.line = src_bp.GetLine();

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

@@ -9,13 +9,13 @@ bool fromJSON(const llvm::json::Value &Params, PersistenceData &PD,
               llvm::json::Path P) {
   json::ObjectMapper O(Params, P);
   return O && O.mapOptional("module", PD.module) &&
-         O.mapOptional("file_addr", PD.file_addr);
+         O.mapOptional("fileAddress", PD.fileAddress);
 }
 
 llvm::json::Value toJSON(const PersistenceData &PD) {
   json::Object result{
       {"module", PD.module},
-      {"file_addr", PD.file_addr},
+      {"fileAddress", PD.fileAddress},
   };
 
   return result;
@@ -24,13 +24,13 @@ llvm::json::Value toJSON(const PersistenceData &PD) {
 bool fromJSON(const llvm::json::Value &Params, SourceLLDBData &SLD,
               llvm::json::Path P) {
   json::ObjectMapper O(Params, P);
-  return O && O.mapOptional("persistence_data", SLD.persistence_data);
+  return O && O.mapOptional("persistenceData", SLD.persistenceData);
 }
 
 llvm::json::Value toJSON(const SourceLLDBData &SLD) {
   json::Object result;
-  if (SLD.persistence_data)
-    result.insert({"persistence_data", SLD.persistence_data});
+  if (SLD.persistenceData)
+    result.insert({"persistenceData", SLD.persistenceData});
   return result;
 }
 

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

@@ -32,7 +32,7 @@ struct PersistenceData {
   std::string module;
 
   /// The file address of the function.
-  lldb::addr_t file_addr;
+  lldb::addr_t fileAddress;
 };
 bool fromJSON(const llvm::json::Value &, PersistenceData &, llvm::json::Path);
 llvm::json::Value toJSON(const PersistenceData &);
@@ -43,7 +43,7 @@ llvm::json::Value toJSON(const PersistenceData &);
 struct SourceLLDBData {
   /// Data that helps lldb resolve this source persistently across different
   /// sessions.
-  std::optional<PersistenceData> persistence_data;
+  std::optional<PersistenceData> persistenceData;
 };
 bool fromJSON(const llvm::json::Value &, SourceLLDBData &, llvm::json::Path);
 llvm::json::Value toJSON(const SourceLLDBData &);

lldb/tools/lldb-dap/SourceBreakpoint.cpp

@@ -48,12 +48,12 @@ llvm::Error SourceBreakpoint::SetBreakpoint(const protocol::Source &source) {
 
   if (source.sourceReference) {
     // Breakpoint set by assembly source.
-    if (source.adapterData && source.adapterData->persistence_data) {
+    if (source.adapterData && source.adapterData->persistenceData) {
       // Prefer use the adapter persitence data, because this could be a
       // breakpoint from a previous session where the `sourceReference` is not
       // valid anymore.
       if (llvm::Error error = CreateAssemblyBreakpointWithPersistenceData(
-              *source.adapterData->persistence_data))
+              *source.adapterData->persistenceData))
         return error;
     } else {
       if (llvm::Error error = CreateAssemblyBreakpointWithSourceReference(
@@ -123,7 +123,7 @@ llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithPersistenceData(
     const protocol::PersistenceData &persistence_data) {
   lldb::SBFileSpec file_spec(persistence_data.module.c_str());
   m_bp = m_dap.target.BreakpointCreateByFileAddress(
-      file_spec, persistence_data.file_addr, 0, m_line - 1);
+      file_spec, persistence_data.fileAddress, 0, m_line - 1);
   return llvm::Error::success();
 }