format

Author: eronnen

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

@@ -23,26 +23,26 @@
 
 namespace lldb_dap::protocol {
 
-/// Data used to help lldb-dap resolve breakpoints persistently across different sessions.
-/// This information is especially useful for assembly breakpoints, because `sourceReference`
-/// can change across sessions. For regular source breakpoints the path and line are the same
-/// For each session.
+/// Data used to help lldb-dap resolve breakpoints persistently across different
+/// sessions. This information is especially useful for assembly breakpoints,
+/// because `sourceReference` can change across sessions. For regular source
+/// breakpoints the path and line are the same For each session.
 struct PersistenceData {
   /// The source module path.
   std::string module;
 
   /// The file address of the function.
   lldb::addr_t file_addr;
 };
-bool fromJSON(const llvm::json::Value &, PersistenceData &,
-              llvm::json::Path);
+bool fromJSON(const llvm::json::Value &, PersistenceData &, llvm::json::Path);
 llvm::json::Value toJSON(const PersistenceData &);
 
 /// Custom source data used by lldb-dap.
 /// This data should help lldb-dap identify sources correctly across different
 /// sessions.
 struct SourceLLDBData {
-  /// Data that helps lldb resolve this source persistently across different sessions.
+  /// Data that helps lldb resolve this source persistently across different
+  /// sessions.
   std::optional<PersistenceData> persistence_data;
 };
 bool fromJSON(const llvm::json::Value &, SourceLLDBData &, llvm::json::Path);

lldb/tools/lldb-dap/SourceBreakpoint.cpp

@@ -49,12 +49,15 @@ llvm::Error SourceBreakpoint::SetBreakpoint(const protocol::Source &source) {
   if (IsAssemblySource(source)) {
     // Breakpoint set by assembly source.
     if (source.adapterData && source.adapterData->persistence_data) {
-      // 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))
+      // 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))
         return error;
     } else {
-      if (llvm::Error error = CreateAssemblyBreakpointWithSourceReference(*source.sourceReference))
+      if (llvm::Error error = CreateAssemblyBreakpointWithSourceReference(
+              *source.sourceReference))
         return error;
     }
   } else {
@@ -77,36 +80,37 @@ void SourceBreakpoint::UpdateBreakpoint(const SourceBreakpoint &request_bp) {
 
 void SourceBreakpoint::CreatePathBreakpoint(const protocol::Source &source) {
   const auto source_path = source.path.value_or("");
-    lldb::SBFileSpecList module_list;
-    m_bp = m_dap.target.BreakpointCreateByLocation(source_path.c_str(), m_line,
-                                                   m_column, 0, module_list);
+  lldb::SBFileSpecList module_list;
+  m_bp = m_dap.target.BreakpointCreateByLocation(source_path.c_str(), m_line,
+                                                 m_column, 0, module_list);
 }
 
-llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithSourceReference(int64_t source_reference) {
+llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithSourceReference(
+    int64_t source_reference) {
   std::optional<lldb::addr_t> raw_addr =
       m_dap.GetSourceReferenceAddress(source_reference);
   if (!raw_addr)
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
-                                    "Invalid sourceReference.");
+                                   "Invalid sourceReference.");
 
   lldb::SBAddress source_address(*raw_addr, m_dap.target);
   if (!source_address.IsValid())
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
-                                    "Invalid sourceReference.");
+                                   "Invalid sourceReference.");
 
   lldb::SBSymbol symbol = source_address.GetSymbol();
   if (!symbol.IsValid()) {
     // FIXME: Support assembly breakpoints without a valid symbol.
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
-                                    "Breakpoints in assembly without a valid "
-                                    "symbol are not supported yet.");
+                                   "Breakpoints in assembly without a valid "
+                                   "symbol are not supported yet.");
   }
 
   lldb::SBInstructionList inst_list =
       m_dap.target.ReadInstructions(symbol.GetStartAddress(), m_line);
   if (inst_list.GetSize() < m_line)
     return llvm::createStringError(llvm::inconvertibleErrorCode(),
-                                    "Invalid instruction list size.");
+                                   "Invalid instruction list size.");
 
   lldb::SBAddress address =
       inst_list.GetInstructionAtIndex(m_line - 1).GetAddress();
@@ -115,7 +119,8 @@ llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithSourceReference(int64_
   return llvm::Error::success();
 }
 
-llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithPersistenceData(const protocol::PersistenceData &persistence_data) {
+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);

lldb/tools/lldb-dap/SourceBreakpoint.h

@@ -52,8 +52,10 @@ class SourceBreakpoint : public Breakpoint {
 
 protected:
   void CreatePathBreakpoint(const protocol::Source &source);
-  llvm::Error CreateAssemblyBreakpointWithSourceReference(int64_t source_reference);
-  llvm::Error CreateAssemblyBreakpointWithPersistenceData(const protocol::PersistenceData &persistence_data);
+  llvm::Error
+  CreateAssemblyBreakpointWithSourceReference(int64_t source_reference);
+  llvm::Error CreateAssemblyBreakpointWithPersistenceData(
+      const protocol::PersistenceData &persistence_data);
 
   // logMessage part can be either a raw text or an expression.
   struct LogMessagePart {