Fixing post-merge changes.

Author: ashgti

lldb/tools/lldb-dap/DAP.cpp

@@ -258,7 +258,7 @@ void DAP::Send(const Message &message) {
     Response cancelled{/*request_seq=*/resp->request_seq,
                        /*command=*/resp->command,
                        /*success=*/false,
-                       /*message=*/Response::Message::cancelled,
+                       /*message=*/eResponseMessageCancelled,
                        /*body=*/std::nullopt};
     if (llvm::Error err = transport.Write(cancelled))
       DAP_LOG_ERROR(log, std::move(err), "({1}) write failed: {0}",

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

@@ -11,6 +11,7 @@
 #include "Handler/ResponseHandler.h"
 #include "JSONUtils.h"
 #include "LLDBUtils.h"
+#include "Protocol/ProtocolBase.h"
 #include "RunInTerminal.h"
 #include "llvm/Support/Error.h"
 
@@ -173,7 +174,7 @@ void BaseRequestHandler::Run(const Request &request) {
     Response cancelled{/*request_seq=*/request.seq,
                        /*command=*/request.command,
                        /*success=*/false,
-                       /*message=*/Response::Message::cancelled,
+                       /*message=*/eResponseMessageCancelled,
                        /*body=*/std::nullopt};
     dap.Send(cancelled);
     return;

lldb/tools/lldb-dap/Handler/RequestHandler.h

@@ -163,6 +163,15 @@ class RequestHandler : public BaseRequestHandler {
         response.body = std::move(*body);
     }
 
+    // Mark the request as 'cancelled' if the debugger was interrupted while
+    // evaluating this handler.
+    if (dap.debugger.InterruptRequested()) {
+      dap.debugger.CancelInterruptRequest();
+      response.success = false;
+      response.message = protocol::eResponseMessageCancelled;
+      response.body = std::nullopt;
+    }
+
     dap.Send(response);
   };
 
@@ -472,8 +481,8 @@ class CancelRequestHandler
 public:
   using RequestHandler::RequestHandler;
   static llvm::StringLiteral GetCommand() { return "cancel"; }
-  llvm::StringMap<bool> GetCapabilities() const override {
-    return {{"supportsCancelRequest", true}};
+  FeatureSet GetSupportedFeatures() const override {
+    return {protocol::eAdapterFeatureCancelRequest};
   }
   llvm::Expected<protocol::CancelResponseBody>
   Run(const protocol::CancelArguments &args) const override;