Also allowing the url and urlLabel to be configured in the DAPError.

Author: ashgti

lldb/tools/lldb-dap/DAPError.cpp

@@ -14,8 +14,11 @@ namespace lldb_dap {
 
 char DAPError::ID;
 
-DAPError::DAPError(std::string message, bool show_user)
-    : m_message(message), m_show_user(show_user) {}
+DAPError::DAPError(std::string message, std::error_code EC, bool show_user,
+                   std::optional<std::string> url,
+                   std::optional<std::string> url_label)
+    : m_message(message), m_ec(EC), m_show_user(show_user), m_url(url),
+      m_url_label(url_label) {}
 
 void DAPError::log(llvm::raw_ostream &OS) const { OS << m_message; }
 

lldb/tools/lldb-dap/DAPError.h

@@ -7,7 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Error.h"
+#include <optional>
 #include <string>
+#include <system_error>
 
 namespace lldb_dap {
 
@@ -17,17 +19,25 @@ class DAPError : public llvm::ErrorInfo<DAPError> {
 public:
   static char ID;
 
-  DAPError(std::string message, bool show_user = false);
+  DAPError(std::string message,
+           std::error_code EC = llvm::inconvertibleErrorCode(),
+           bool show_user = true, std::optional<std::string> url = std::nullopt,
+           std::optional<std::string> url_label = std::nullopt);
 
   void log(llvm::raw_ostream &OS) const override;
   std::error_code convertToErrorCode() const override;
 
   const std::string &getMessage() const { return m_message; }
   bool getShowUser() const { return m_show_user; }
+  const std::optional<std::string> &getURL() const { return m_url; }
+  const std::optional<std::string> &getURLLabel() const { return m_url; }
 
 private:
   std::string m_message;
+  std::error_code m_ec;
   bool m_show_user;
+  std::optional<std::string> m_url;
+  std::optional<std::string> m_url_label;
 };
 
 } // namespace lldb_dap

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

@@ -143,8 +143,8 @@ class RequestHandler : public BaseRequestHandler {
                 error_message.format = E.getMessage();
                 error_message.showUser = E.getShowUser();
                 error_message.id = E.convertToErrorCode().value();
-                // TODO: We could add url/urlLabel to the error message for more
-                // information for users.
+                error_message.url = E.getURL();
+                error_message.urlLabel = E.getURLLabel();
                 return llvm::Error::success();
               }))
         error_message.format = llvm::toString(std::move(unhandled));