move DAPTypes to a namespace

Author: eronnen

lldb/tools/lldb-dap/Breakpoint.cpp

@@ -25,9 +25,9 @@
 
 using namespace lldb_dap;
 
-static std::optional<protocol::PersistenceData>
+static std::optional<protocol::dap::PersistenceData>
 GetPersistenceDataForSymbol(lldb::SBSymbol &symbol) {
-  protocol::PersistenceData persistence_data;
+  protocol::dap::PersistenceData persistence_data;
   lldb::SBModule module = symbol.GetStartAddress().GetModule();
   if (!module.IsValid())
     return std::nullopt;
@@ -105,11 +105,11 @@ protocol::Breakpoint Breakpoint::ToProtocolBreakpoint() {
 
         // Add persistent data so that the breakpoint can be resolved
         // in future sessions.
-        std::optional<protocol::PersistenceData> persistence_data =
+        std::optional<protocol::dap::PersistenceData> persistence_data =
             GetPersistenceDataForSymbol(symbol);
         if (persistence_data) {
           source->adapterData =
-              protocol::SourceLLDBData{std::move(persistence_data)};
+              protocol::dap::SourceLLDBData{std::move(persistence_data)};
         }
       }
     }

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

@@ -120,7 +120,7 @@ DAPGetModuleSymbolsRequestHandler::Run(
   if (!module_spec.IsValid())
     return response;
 
-  std::vector<DAPSymbol> &symbols = response.symbols;
+  std::vector<dap::Symbol> &symbols = response.symbols;
   lldb::SBModule module = dap.target.FindModule(module_spec);
   if (!module.IsValid())
     return llvm::make_error<DAPError>("Module not found");
@@ -131,7 +131,7 @@ DAPGetModuleSymbolsRequestHandler::Run(
     if (!symbol.IsValid())
       continue;
 
-    DAPSymbol dap_symbol;
+    dap::Symbol dap_symbol;
     dap_symbol.userId = symbol.GetID();
     dap_symbol.type = SymbolTypeToString(symbol.GetType());
     dap_symbol.isDebug = symbol.IsDebug();

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

@@ -2,7 +2,7 @@
 
 using namespace llvm;
 
-namespace lldb_dap::protocol {
+namespace lldb_dap::protocol::dap {
 
 bool fromJSON(const llvm::json::Value &Params, PersistenceData &PD,
               llvm::json::Path P) {
@@ -33,7 +33,7 @@ llvm::json::Value toJSON(const SourceLLDBData &SLD) {
   return result;
 }
 
-bool fromJSON(const llvm::json::Value &Params, DAPSymbol &DS,
+bool fromJSON(const llvm::json::Value &Params, Symbol &DS,
               llvm::json::Path P) {
   json::ObjectMapper O(Params, P);
   return O && O.map("userId", DS.userId) && O.map("isDebug", DS.isDebug) &&
@@ -44,7 +44,7 @@ bool fromJSON(const llvm::json::Value &Params, DAPSymbol &DS,
          O.map("size", DS.size) && O.map("name", DS.name);
 }
 
-llvm::json::Value toJSON(const DAPSymbol &DS) {
+llvm::json::Value toJSON(const Symbol &DS) {
   json::Object result{
       {"userId", DS.userId},
       {"isDebug", DS.isDebug},
@@ -60,4 +60,4 @@ llvm::json::Value toJSON(const DAPSymbol &DS) {
   return result;
 }
 
-} // namespace lldb_dap::protocol
+} // namespace lldb_dap::protocol::dap

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

@@ -21,7 +21,7 @@
 #include <optional>
 #include <string>
 
-namespace lldb_dap::protocol {
+namespace lldb_dap::protocol::dap {
 
 /// Data used to help lldb-dap resolve breakpoints persistently across different
 /// sessions. This information is especially useful for assembly breakpoints,
@@ -48,7 +48,7 @@ struct SourceLLDBData {
 bool fromJSON(const llvm::json::Value &, SourceLLDBData &, llvm::json::Path);
 llvm::json::Value toJSON(const SourceLLDBData &);
 
-struct DAPSymbol {
+struct Symbol {
   /// The symbol uid.
   uint32_t userId;
 
@@ -77,9 +77,9 @@ struct DAPSymbol {
   /// The symbol name.
   std::string name;
 };
-bool fromJSON(const llvm::json::Value &, DAPSymbol &, llvm::json::Path);
-llvm::json::Value toJSON(const DAPSymbol &);
+bool fromJSON(const llvm::json::Value &, Symbol &, llvm::json::Path);
+llvm::json::Value toJSON(const Symbol &);
 
-} // namespace lldb_dap::protocol
+} // namespace lldb_dap::protocol::dap
 
 #endif

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

@@ -994,7 +994,7 @@ bool fromJSON(const llvm::json::Value &, DAPGetModuleSymbolsArguments &,
 /// Response to `getModuleSymbols` request.
 struct DAPGetModuleSymbolsResponseBody {
   /// The symbols for the specified module.
-  std::vector<DAPSymbol> symbols;
+  std::vector<dap::Symbol> symbols;
 };
 llvm::json::Value toJSON(const DAPGetModuleSymbolsResponseBody &);
 

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

@@ -340,7 +340,7 @@ struct Source {
   /// Additional data that a debug adapter might want to loop through the
   /// client. The client should leave the data intact and persist it across
   /// sessions. The client should not interpret the data.
-  std::optional<SourceLLDBData> adapterData;
+  std::optional<dap::SourceLLDBData> adapterData;
 
   // unsupported keys: origin, sources, checksums
 };

lldb/tools/lldb-dap/SourceBreakpoint.cpp

@@ -120,7 +120,7 @@ llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithSourceReference(
 }
 
 llvm::Error SourceBreakpoint::CreateAssemblyBreakpointWithPersistenceData(
-    const protocol::PersistenceData &persistence_data) {
+    const protocol::dap::PersistenceData &persistence_data) {
   lldb::SBFileSpec file_spec(persistence_data.module_path.c_str());
   lldb::SBFileSpecList comp_unit_list;
   lldb::SBFileSpecList file_spec_list;

lldb/tools/lldb-dap/SourceBreakpoint.h

@@ -55,7 +55,7 @@ class SourceBreakpoint : public Breakpoint {
   llvm::Error
   CreateAssemblyBreakpointWithSourceReference(int64_t source_reference);
   llvm::Error CreateAssemblyBreakpointWithPersistenceData(
-      const protocol::PersistenceData &persistence_data);
+      const protocol::dap::PersistenceData &persistence_data);
 
   // logMessage part can be either a raw text or an expression.
   struct LogMessagePart {

lldb/unittests/DAP/DAPTypesTest.cpp

@@ -8,17 +8,14 @@
 
 #include "Protocol/DAPTypes.h"
 #include "TestingSupport/TestUtilities.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/JSON.h"
 #include "llvm/Testing/Support/Error.h"
-#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include <optional>
 
 using namespace llvm;
 using namespace lldb;
 using namespace lldb_dap;
-using namespace lldb_dap::protocol;
+using namespace lldb_dap::protocol::dap;
 using lldb_private::roundtripJSON;
 
 TEST(DAPTypesTest, SourceLLDBData) {
@@ -36,7 +33,7 @@ TEST(DAPTypesTest, SourceLLDBData) {
 }
 
 TEST(DAPTypesTest, DAPSymbol) {
-  DAPSymbol symbol;
+  Symbol symbol;
   symbol.userId = 42;
   symbol.isDebug = true;
   symbol.isExternal = false;
@@ -47,7 +44,7 @@ TEST(DAPTypesTest, DAPSymbol) {
   symbol.size = 64;
   symbol.name = "testSymbol";
 
-  llvm::Expected<DAPSymbol> deserialized_symbol = roundtripJSON(symbol);
+  llvm::Expected<Symbol> deserialized_symbol = roundtripJSON(symbol);
   ASSERT_THAT_EXPECTED(deserialized_symbol, llvm::Succeeded());
 
   EXPECT_EQ(symbol.userId, deserialized_symbol->userId);