Applying reviewer feedback.

Author: ashgti

lldb/tools/lldb-dap/DAP.cpp

@@ -701,9 +701,8 @@ bool DAP::HandleObject(const protocol::Message &M) {
     // Result should be given, use null if not.
     if (GetBoolean(object, "success").value_or(false)) {
       llvm::json::Value Result = nullptr;
-      if (auto *B = object.get("body")) {
+      if (auto *B = object.get("body"))
         Result = std::move(*B);
-      }
       (*response_handler)(Result);
     } else {
       llvm::StringRef message = GetString(object, "message");
@@ -771,9 +770,8 @@ llvm::Error DAP::Loop() {
   });
   while (!disconnecting) {
     std::optional<protocol::Message> next = transport.Read();
-    if (!next) {
+    if (!next)
       break;
-    }
 
     if (!HandleObject(*next)) {
       return llvm::createStringError(llvm::inconvertibleErrorCode(),

lldb/tools/lldb-dap/Transport.cpp

@@ -55,8 +55,8 @@ static Expected<std::string> ReadUntil(IOObject *descriptor,
 /// ```
 /// Content-Length: (?<length>\d+)\r\n\r\n(?<content>.{\k<length>})
 /// ```
-static const StringLiteral kHeaderContentLength = "Content-Length: ";
-static const StringLiteral kHeaderSeparator = "\r\n\r\n";
+static constexpr StringLiteral kHeaderContentLength = "Content-Length: ";
+static constexpr StringLiteral kHeaderSeparator = "\r\n\r\n";
 
 namespace lldb_dap {
 

lldb/tools/lldb-dap/lldb-dap.cpp

@@ -326,9 +326,9 @@ serveConnection(const Socket::SocketProtocol &protocol, const std::string &name,
     std::thread client([=, &dap_sessions_condition, &dap_sessions_mutex,
                         &dap_sessions]() {
       llvm::set_thread_name(client_name + ".runloop");
-      Transport transport{client_name, log, io, io};
-      DAP dap = DAP(program_path, log, default_repl_mode, pre_init_commands,
-                    client_name, transport);
+      Transport transport(client_name, log, io, io);
+      DAP dap(program_path, log, default_repl_mode, pre_init_commands,
+              client_name, transport);
 
       if (auto Err = dap.ConfigureIO()) {
         llvm::logAllUnhandledErrors(std::move(Err), llvm::errs(),
@@ -568,9 +568,9 @@ int main(int argc, char *argv[]) {
       stdout_fd, File::eOpenOptionWriteOnly, false);
 
   std::string client_name = "stdin/stdout";
-  Transport transport{client_name, log.get(), input, output};
-  DAP dap = DAP(program_path, log.get(), default_repl_mode, pre_init_commands,
-                client_name, transport);
+  Transport transport(client_name, log.get(), input, output);
+  DAP dap(program_path, log.get(), default_repl_mode, pre_init_commands,
+          client_name, transport);
 
   // stdout/stderr redirection to the IDE's console
   if (auto Err = dap.ConfigureIO(stdout, stderr)) {