Revert "Retry of D84974"

This reverts commit 5b2b4f3.

This caused a link error in
http://lab.llvm.org:8011/builders/lldb-x64-windows-ninja/builds/18794/steps/build/logs/stdio

Author: Walter Erquinigo

lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/lldbvscode_testcase.py

@@ -282,7 +282,7 @@ def launch(self, program=None, args=None, cwd=None, env=None,
                trace=False, initCommands=None, preRunCommands=None,
                stopCommands=None, exitCommands=None, terminateCommands=None,
                sourcePath=None, debuggerRoot=None, launchCommands=None,
-               sourceMap=None, disconnectAutomatically=True, runInTerminal=False):
+               sourceMap=None, disconnectAutomatically=True):
         '''Sending launch request to vscode
         '''
 
@@ -316,24 +316,18 @@ def cleanup():
             sourcePath=sourcePath,
             debuggerRoot=debuggerRoot,
             launchCommands=launchCommands,
-            sourceMap=sourceMap,
-            runInTerminal=runInTerminal)
+            sourceMap=sourceMap)
         if not (response and response['success']):
             self.assertTrue(response['success'],
                             'launch failed (%s)' % (response['message']))
-        # We need to trigger a request_configurationDone after we've successfully
-        # attached a runInTerminal process to finish initialization.
-        if runInTerminal:
-            self.vscode.request_configurationDone()
-
 
     def build_and_launch(self, program, args=None, cwd=None, env=None,
                          stopOnEntry=False, disableASLR=True,
                          disableSTDIO=False, shellExpandArguments=False,
                          trace=False, initCommands=None, preRunCommands=None,
                          stopCommands=None, exitCommands=None,
                          terminateCommands=None, sourcePath=None,
-                         debuggerRoot=None, runInTerminal=False):
+                         debuggerRoot=None):
         '''Build the default Makefile target, create the VSCode debug adaptor,
            and launch the process.
         '''
@@ -343,4 +337,4 @@ def build_and_launch(self, program, args=None, cwd=None, env=None,
         self.launch(program, args, cwd, env, stopOnEntry, disableASLR,
                     disableSTDIO, shellExpandArguments, trace,
                     initCommands, preRunCommands, stopCommands, exitCommands,
-                    terminateCommands, sourcePath, debuggerRoot, runInTerminal=runInTerminal)
+                    terminateCommands, sourcePath, debuggerRoot)

lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py

@@ -300,29 +300,12 @@ def send_recv(self, command):
         self.send_packet(command)
         done = False
         while not done:
-            response_or_request = self.recv_packet(filter_type=['response', 'request'])
-            if response_or_request is None:
+            response = self.recv_packet(filter_type='response')
+            if response is None:
                 desc = 'no response for "%s"' % (command['command'])
                 raise ValueError(desc)
-            if response_or_request['type'] == 'response':
-                self.validate_response(command, response_or_request)
-                return response_or_request
-            else:
-                if response_or_request['command'] == 'runInTerminal':
-                    subprocess.Popen(response_or_request['arguments']['args'], 
-                        env=response_or_request['arguments']['env'])
-                    self.send_packet({
-                        "type": "response",
-                        "seq": -1,
-                        "request_seq": response_or_request['seq'],
-                        "success": True,
-                        "command": "runInTerminal",
-                        "body": {}
-                    }, set_sequence=False)
-                else:
-                    desc = 'unkonwn reverse request "%s"' % (response_or_request['command'])
-                    raise ValueError(desc)
-            
+            self.validate_response(command, response)
+            return response
         return None
 
     def wait_for_event(self, filter=None, timeout=None):
@@ -616,8 +599,7 @@ def request_launch(self, program, args=None, cwd=None, env=None,
                        trace=False, initCommands=None, preRunCommands=None,
                        stopCommands=None, exitCommands=None,
                        terminateCommands=None ,sourcePath=None,
-                       debuggerRoot=None, launchCommands=None, sourceMap=None,
-                       runInTerminal=False):
+                       debuggerRoot=None, launchCommands=None, sourceMap=None):
         args_dict = {
             'program': program
         }
@@ -656,8 +638,6 @@ def request_launch(self, program, args=None, cwd=None, env=None,
             args_dict['launchCommands'] = launchCommands
         if sourceMap:
             args_dict['sourceMap'] = sourceMap
-        if runInTerminal:
-            args_dict['runInTerminal'] = runInTerminal
         command_dict = {
             'command': 'launch',
             'type': 'request',

lldb/test/API/tools/lldb-vscode/runInTerminal/Makefile

@@ -998,44 +998,4 @@ llvm::json::Value CreateCompileUnit(lldb::SBCompileUnit unit) {
   return llvm::json::Value(std::move(object));
 }
 
-/// See
-/// https://microsoft.github.io/debug-adapter-protocol/specification#Reverse_Requests_RunInTerminal
-llvm::json::Object
-CreateRunInTerminalReverseRequest(const llvm::json::Object &launch_request) {
-  llvm::json::Object reverse_request;
-  reverse_request.try_emplace("type", "request");
-  reverse_request.try_emplace("command", "runInTerminal");
-
-  llvm::json::Object run_in_terminal_args;
-  // This indicates the IDE to open an embedded terminal, instead of opening the
-  // terminal in a new window.
-  run_in_terminal_args.try_emplace("kind", "integrated");
-
-  auto launch_request_arguments = launch_request.getObject("arguments");
-  std::vector<std::string> args = GetStrings(launch_request_arguments, "args");
-  // The program path must be the first entry in the "args" field
-  args.insert(args.begin(),
-              GetString(launch_request_arguments, "program").str());
-  run_in_terminal_args.try_emplace("args", args);
-
-  const auto cwd = GetString(launch_request_arguments, "cwd");
-  if (!cwd.empty())
-    run_in_terminal_args.try_emplace("cwd", cwd);
-
-  // We need to convert the input list of environments variables into a
-  // dictionary
-  std::vector<std::string> envs = GetStrings(launch_request_arguments, "env");
-  llvm::json::Object environment;
-  for (const std::string &env : envs) {
-    size_t index = env.find("=");
-    environment.try_emplace(env.substr(0, index), env.substr(index + 1));
-  }
-  run_in_terminal_args.try_emplace("env",
-                                   llvm::json::Value(std::move(environment)));
-
-  reverse_request.try_emplace(
-      "arguments", llvm::json::Value(std::move(run_in_terminal_args)));
-  return reverse_request;
-}
-
 } // namespace lldb_vscode

lldb/test/API/tools/lldb-vscode/runInTerminal/TestVSCode_runInTerminal.py

@@ -443,18 +443,6 @@ llvm::json::Value CreateVariable(lldb::SBValue v, int64_t variablesReference,
 
 llvm::json::Value CreateCompileUnit(lldb::SBCompileUnit unit);
 
-/// Create a runInTerminal reverse request object
-///
-/// \param[in] launch_request
-///     The original launch_request object whose fields are used to construct
-///     the reverse request object.
-///
-/// \return
-///     A "runInTerminal" JSON object that follows the specification outlined by
-///     Microsoft.
-llvm::json::Object
-CreateRunInTerminalReverseRequest(const llvm::json::Object &launch_request);
-
 } // namespace lldb_vscode
 
 #endif

lldb/test/API/tools/lldb-vscode/runInTerminal/main.c

@@ -38,8 +38,7 @@ VSCode::VSCode()
            {"swift_catch", "Swift Catch", lldb::eLanguageTypeSwift},
            {"swift_throw", "Swift Throw", lldb::eLanguageTypeSwift}}),
       focus_tid(LLDB_INVALID_THREAD_ID), sent_terminated_event(false),
-      stop_at_entry(false), is_attach(false),
-      reverse_request_seq(0), waiting_for_run_in_terminal(false) {
+      stop_at_entry(false), is_attach(false) {
   const char *log_file_path = getenv("LLDBVSCODE_LOG");
 #if defined(_WIN32)
   // Windows opens stdout and stdin in text mode which converts \n to 13,10
@@ -363,71 +362,4 @@ void VSCode::SetTarget(const lldb::SBTarget target) {
   }
 }
 
-PacketStatus VSCode::GetObject(llvm::json::Object &object) {
-  std::string json = ReadJSON();
-  if (json.empty())
-    return PacketStatus::EndOfFile;
-
-  llvm::StringRef json_sref(json);
-  llvm::Expected<llvm::json::Value> json_value = llvm::json::parse(json_sref);
-  if (!json_value) {
-    auto error = json_value.takeError();
-    if (log) {
-      std::string error_str;
-      llvm::raw_string_ostream strm(error_str);
-      strm << error;
-      strm.flush();
-      *log << "error: failed to parse JSON: " << error_str << std::endl
-           << json << std::endl;
-    }
-    return PacketStatus::JSONMalformed;
-  }
-  object = *json_value->getAsObject();
-  if (!json_value->getAsObject()) {
-    if (log)
-      *log << "error: json packet isn't a object" << std::endl;
-    return PacketStatus::JSONNotObject;
-  }
-  return PacketStatus::Success;
-}
-
-bool VSCode::HandleObject(const llvm::json::Object &object) {
-  const auto packet_type = GetString(object, "type");
-  if (packet_type == "request") {
-    const auto command = GetString(object, "command");
-    auto handler_pos = request_handlers.find(std::string(command));
-    if (handler_pos != request_handlers.end()) {
-      handler_pos->second(object);
-      return true; // Success
-    } else {
-      if (log)
-        *log << "error: unhandled command \"" << command.data() << std::endl;
-      return false; // Fail
-    }
-  }
-  return false;
-}
-
-PacketStatus VSCode::SendReverseRequest(llvm::json::Object request,
-                                        llvm::json::Object &response) {
-  request.try_emplace("seq", ++reverse_request_seq);
-  SendJSON(llvm::json::Value(std::move(request)));
-  while (true) {
-    PacketStatus status = GetObject(response);
-    const auto packet_type = GetString(response, "type");
-    if (packet_type == "response")
-      return status;
-    else {
-      // Not our response, we got another packet
-      HandleObject(response);
-    }
-  }
-  return PacketStatus::EndOfFile;
-}
-
-void VSCode::RegisterRequestCallback(std::string request,
-                                     RequestCallback callback) {
-  request_handlers[request] = callback;
-}
-
 } // namespace lldb_vscode

lldb/tools/lldb-vscode/JSONUtils.cpp

@@ -9,7 +9,6 @@
 #ifndef LLDB_TOOLS_LLDB_VSCODE_VSCODE_H
 #define LLDB_TOOLS_LLDB_VSCODE_VSCODE_H
 
-#include <condition_variable>
 #include <iosfwd>
 #include <map>
 #include <set>
@@ -20,7 +19,6 @@
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/JSON.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include "lldb/API/SBAttachInfo.h"
@@ -67,15 +65,6 @@ enum class OutputType { Console, Stdout, Stderr, Telemetry };
 
 enum VSCodeBroadcasterBits { eBroadcastBitStopEventThread = 1u << 0 };
 
-typedef void (*RequestCallback)(const llvm::json::Object &command);
-
-enum class PacketStatus {
-  Success = 0,
-  EndOfFile,
-  JSONMalformed,
-  JSONNotObject
-};
-
 struct VSCode {
   InputStream input;
   OutputStream output;
@@ -102,10 +91,6 @@ struct VSCode {
   bool sent_terminated_event;
   bool stop_at_entry;
   bool is_attach;
-  uint32_t reverse_request_seq;
-  std::map<std::string, RequestCallback> request_handlers;
-  std::condition_variable request_in_terminal_cv;
-  bool waiting_for_run_in_terminal;
   // Keep track of the last stop thread index IDs as threads won't go away
   // unless we send a "thread" event to indicate the thread exited.
   llvm::DenseSet<lldb::tid_t> thread_ids;
@@ -167,36 +152,6 @@ struct VSCode {
   /// Set given target object as a current target for lldb-vscode and start
   /// listeing for its breakpoint events.
   void SetTarget(const lldb::SBTarget target);
-
-  const std::map<std::string, RequestCallback> &GetRequestHandlers();
-
-  PacketStatus GetObject(llvm::json::Object &object);
-  bool HandleObject(const llvm::json::Object &object);
-
-  /// Send a Debug Adapter Protocol reverse request to the IDE
-  ///
-  /// \param[in] request
-  ///   The payload of the request to send.
-  ///
-  /// \param[out] response
-  ///   The response of the IDE. It might be undefined if there was an error.
-  ///
-  /// \return
-  ///   A \a PacketStatus object indicating the sucess or failure of the
-  ///   request.
-  PacketStatus SendReverseRequest(llvm::json::Object request,
-                                  llvm::json::Object &response);
-
-  /// Registers a callback handler for a Debug Adapter Protocol request
-  ///
-  /// \param[in] request
-  ///     The name of the request following the Debug Adapter Protocol
-  ///     specification.
-  ///
-  /// \param[in] callback
-  ///     The callback to execute when the given request is triggered by the
-  ///     IDE.
-  void RegisterRequestCallback(std::string request, RequestCallback callback);
 };
 
 extern VSCode g_vsc;