Sending extra capabilities event together

Author: eronnen

lldb/include/lldb/API/SBSymbol.h

@@ -85,7 +85,7 @@ class LLDB_API SBSymbol {
 
   SymbolType GetType();
 
-  /// Get the ID of this symbol, usually the original symbol table index. .
+  /// Get the ID of this symbol, usually the original symbol table index.
   ///
   /// \returns
   ///   Returns the ID of this symbol.

lldb/test/API/tools/lldb-dap/moduleSymbols/TestDAP_moduleSymbols.py

@@ -8,7 +8,7 @@
 class TestDAP_moduleSymbols(lldbdap_testcase.DAPTestCaseBase):
     def test_moduleSymbols(self):
         """
-        Test that the stack frame without a module still has assembly source.
+        Test that the moduleSymbols request returns correct symbols from the module.
         """
         program = self.getBuildArtifact("a.out")
         self.build_and_launch(program)

lldb/tools/lldb-dap/EventHelper.cpp

@@ -38,33 +38,37 @@ static void SendThreadExitedEvent(DAP &dap, lldb::tid_t tid) {
   dap.SendJSON(llvm::json::Value(std::move(event)));
 }
 
-void SendTargetBasedCapabilities(DAP &dap) {
+/// Get capabilities based on the configured target.
+static llvm::DenseSet<AdapterFeature> GetTargetBasedCapabilities(DAP &dap) {
+  llvm::DenseSet<AdapterFeature> capabilities;
   if (!dap.target.IsValid())
-    return;
-
-  protocol::CapabilitiesEventBody body;
+    return capabilities;
 
   const llvm::StringRef target_triple = dap.target.GetTriple();
   if (target_triple.starts_with("x86"))
-    body.capabilities.supportedFeatures.insert(
-        protocol::eAdapterFeatureStepInTargetsRequest);
+    capabilities.insert(protocol::eAdapterFeatureStepInTargetsRequest);
 
   // We only support restarting launch requests not attach requests.
   if (dap.last_launch_request)
-    body.capabilities.supportedFeatures.insert(
-        protocol::eAdapterFeatureRestartRequest);
+    capabilities.insert(protocol::eAdapterFeatureRestartRequest);
 
-  // Only notify the client if supportedFeatures changed.
-  if (!body.capabilities.supportedFeatures.empty())
-    dap.Send(protocol::Event{"capabilities", body});
+  return capabilities;
 }
 
-void SendCustomCapabilities(DAP &dap) {
+void SendExtraCapabilities(DAP &dap) {
+  protocol::Capabilities capabilities = dap.GetCustomCapabilities();
+  llvm::DenseSet<AdapterFeature> target_capabilities =
+      GetTargetBasedCapabilities(dap);
+
+  capabilities.supportedFeatures.insert(target_capabilities.begin(),
+                                        target_capabilities.end());
+
   protocol::CapabilitiesEventBody body;
-  body.capabilities = dap.GetCustomCapabilities();
+  body.capabilities = std::move(capabilities);
 
-  // Notify the client about the custom capabilities.
-  dap.Send(protocol::Event{"capabilities", body});
+  // Only notify the client if supportedFeatures changed.
+  if (!body.capabilities.supportedFeatures.empty())
+    dap.Send(protocol::Event{"capabilities", std::move(body)});
 }
 
 // "ProcessEvent": {

lldb/tools/lldb-dap/EventHelper.h

@@ -17,11 +17,8 @@ struct DAP;
 
 enum LaunchMethod { Launch, Attach, AttachForSuspendedLaunch };
 
-/// Update capabilities based on the configured target.
-void SendTargetBasedCapabilities(DAP &dap);
-
-/// Send lldb-dap custom capabilities.
-void SendCustomCapabilities(DAP &dap);
+/// Sends target based capabilities and lldb-dap custom capabilities.
+void SendExtraCapabilities(DAP &dap);
 
 void SendProcessEvent(DAP &dap, LaunchMethod launch_method);
 

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

@@ -9,6 +9,7 @@
 #include "DAP.h"
 #include "EventHelper.h"
 #include "LLDBUtils.h"
+#include "Protocol/ProtocolEvents.h"
 #include "Protocol/ProtocolRequests.h"
 #include "ProtocolUtils.h"
 #include "RequestHandler.h"
@@ -44,11 +45,10 @@ ConfigurationDoneRequestHandler::Run(const ConfigurationDoneArguments &) const {
   // Waiting until 'configurationDone' to send target based capabilities in case
   // the launch or attach scripts adjust the target. The initial dummy target
   // may have different capabilities than the final target.
-  SendTargetBasedCapabilities(dap);
 
-  /// Send custom capabilities to the client.
-  /// This is consumed by the lldb-dap specific editor extension.
-  SendCustomCapabilities(dap);
+  /// Also send here custom capabilities to the client, which is consumed by the
+  /// lldb-dap specific editor extension.
+  SendExtraCapabilities(dap);
 
   // Clients can request a baseline of currently existing threads after
   // we acknowledge the configurationDone request.

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

@@ -1,4 +1,4 @@
-//===-- ModuleSymbolsRequestHandler.cpp -----------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.