Skip to content

Commit 2b1f570

Browse files
JDevlieghereJDevlieghere
committed
[lldb-dap] Move the command plugins out of the DAP header
Move the command plugins out of the DAP header and into their file. This PR also renames the classes from "RequestHandler" to "Command". Although they are implemented in terms of sending requests, they are not "handlers".
1 parent f695c8d commit 2b1f570

File tree

6 files changed

+208
-177
lines changed

6 files changed

+208
-177
lines changed

‎lldb/tools/lldb-dap/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ add_public_tablegen_target(LLDBDAPOptionsTableGen)
88
add_lldb_library(lldbDAP
99
Breakpoint.cpp
1010
BreakpointBase.cpp
11+
CommandPlugins.cpp
1112
DAP.cpp
1213
DAPError.cpp
1314
DAPLog.cpp

‎lldb/tools/lldb-dap/CommandPlugins.cpp‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
//===-- CommandPlugins.cpp ------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "CommandPlugins.h"
10+
#include "Handler/ResponseHandler.h"
11+
#include "JSONUtils.h"
12+
#include "lldb/API/SBStream.h"
13+
14+
using namespace lldb_dap;
15+
16+
bool StartDebuggingCommand::DoExecute(lldb::SBDebugger debugger, char **command,
17+
lldb::SBCommandReturnObject &result) {
18+
// Command format like: `start-debugging <launch|attach> <configuration>`
19+
if (!command) {
20+
result.SetError("Invalid use of start-debugging, expected format "
21+
"`start-debugging <launch|attach> <configuration>`.");
22+
return false;
23+
}
24+
25+
if (!command[0] || llvm::StringRef(command[0]).empty()) {
26+
result.SetError("start-debugging request type missing.");
27+
return false;
28+
}
29+
30+
if (!command[1] || llvm::StringRef(command[1]).empty()) {
31+
result.SetError("start-debugging debug configuration missing.");
32+
return false;
33+
}
34+
35+
llvm::StringRef request{command[0]};
36+
std::string raw_configuration{command[1]};
37+
38+
llvm::Expected<llvm::json::Value> configuration =
39+
llvm::json::parse(raw_configuration);
40+
41+
if (!configuration) {
42+
llvm::Error err = configuration.takeError();
43+
std::string msg = "Failed to parse json configuration: " +
44+
llvm::toString(std::move(err)) + "\n\n" +
45+
raw_configuration;
46+
result.SetError(msg.c_str());
47+
return false;
48+
}
49+
50+
dap.SendReverseRequest<LogFailureResponseHandler>(
51+
"startDebugging",
52+
llvm::json::Object{{"request", request},
53+
{"configuration", std::move(*configuration)}});
54+
55+
result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
56+
57+
return true;
58+
}
59+
60+
bool ReplModeCommand::DoExecute(lldb::SBDebugger debugger, char **command,
61+
lldb::SBCommandReturnObject &result) {
62+
// Command format like: `repl-mode <variable|command|auto>?`
63+
// If a new mode is not specified report the current mode.
64+
if (!command || llvm::StringRef(command[0]).empty()) {
65+
std::string mode;
66+
switch (dap.repl_mode) {
67+
case ReplMode::Variable:
68+
mode = "variable";
69+
break;
70+
case ReplMode::Command:
71+
mode = "command";
72+
break;
73+
case ReplMode::Auto:
74+
mode = "auto";
75+
break;
76+
}
77+
78+
result.Printf("lldb-dap repl-mode %s.\n", mode.c_str());
79+
result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
80+
81+
return true;
82+
}
83+
84+
llvm::StringRef new_mode{command[0]};
85+
86+
if (new_mode == "variable") {
87+
dap.repl_mode = ReplMode::Variable;
88+
} else if (new_mode == "command") {
89+
dap.repl_mode = ReplMode::Command;
90+
} else if (new_mode == "auto") {
91+
dap.repl_mode = ReplMode::Auto;
92+
} else {
93+
lldb::SBStream error_message;
94+
error_message.Printf("Invalid repl-mode '%s'. Expected one of 'variable', "
95+
"'command' or 'auto'.\n",
96+
new_mode.data());
97+
result.SetError(error_message.GetData());
98+
return false;
99+
}
100+
101+
result.Printf("lldb-dap repl-mode %s set.\n", new_mode.data());
102+
result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
103+
return true;
104+
}
105+
106+
/// Sends a DAP event with an optional body.
107+
///
108+
/// https://code.visualstudio.com/api/references/vscode-api#debug.onDidReceiveDebugSessionCustomEvent
109+
bool SendEventCommand::DoExecute(lldb::SBDebugger debugger, char **command,
110+
lldb::SBCommandReturnObject &result) {
111+
// Command format like: `send-event <name> <body>?`
112+
if (!command || !command[0] || llvm::StringRef(command[0]).empty()) {
113+
result.SetError("Not enough arguments found, expected format "
114+
"`lldb-dap send-event <name> <body>?`.");
115+
return false;
116+
}
117+
118+
llvm::StringRef name{command[0]};
119+
// Events that are stateful and should be handled by lldb-dap internally.
120+
const std::array internal_events{"breakpoint", "capabilities", "continued",
121+
"exited", "initialize", "loadedSource",
122+
"module", "process", "stopped",
123+
"terminated", "thread"};
124+
if (llvm::is_contained(internal_events, name)) {
125+
std::string msg =
126+
llvm::formatv("Invalid use of lldb-dap send-event, event \"{0}\" "
127+
"should be handled by lldb-dap internally.",
128+
name)
129+
.str();
130+
result.SetError(msg.c_str());
131+
return false;
132+
}
133+
134+
llvm::json::Object event(CreateEventObject(name));
135+
136+
if (command[1] && !llvm::StringRef(command[1]).empty()) {
137+
// See if we have unused arguments.
138+
if (command[2]) {
139+
result.SetError(
140+
"Additional arguments found, expected `lldb-dap send-event "
141+
"<name> <body>?`.");
142+
return false;
143+
}
144+
145+
llvm::StringRef raw_body{command[1]};
146+
147+
llvm::Expected<llvm::json::Value> body = llvm::json::parse(raw_body);
148+
149+
if (!body) {
150+
llvm::Error err = body.takeError();
151+
std::string msg = "Failed to parse custom event body: " +
152+
llvm::toString(std::move(err));
153+
result.SetError(msg.c_str());
154+
return false;
155+
}
156+
157+
event.try_emplace("body", std::move(*body));
158+
}
159+
160+
dap.SendJSON(llvm::json::Value(std::move(event)));
161+
result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
162+
return true;
163+
}

‎lldb/tools/lldb-dap/CommandPlugins.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
//===-- CommandPlugins.h --------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef LLDB_TOOLS_LLDB_DAP_COMMANDPLUGINS_H
10+
#define LLDB_TOOLS_LLDB_DAP_COMMANDPLUGINS_H
11+
12+
#include "DAP.h"
13+
#include "lldb/API/SBCommandInterpreter.h"
14+
15+
namespace lldb_dap {
16+
17+
struct StartDebuggingCommand : public lldb::SBCommandPluginInterface {
18+
DAP &dap;
19+
explicit StartDebuggingCommand(DAP &d) : dap(d) {};
20+
bool DoExecute(lldb::SBDebugger debugger, char **command,
21+
lldb::SBCommandReturnObject &result) override;
22+
};
23+
24+
struct ReplModeCommand : public lldb::SBCommandPluginInterface {
25+
DAP &dap;
26+
explicit ReplModeCommand(DAP &d) : dap(d) {};
27+
bool DoExecute(lldb::SBDebugger debugger, char **command,
28+
lldb::SBCommandReturnObject &result) override;
29+
};
30+
31+
struct SendEventCommand : public lldb::SBCommandPluginInterface {
32+
DAP &dap;
33+
explicit SendEventCommand(DAP &d) : dap(d) {};
34+
bool DoExecute(lldb::SBDebugger debugger, char **command,
35+
lldb::SBCommandReturnObject &result) override;
36+
};
37+
38+
} // namespace lldb_dap
39+
40+
#endif

‎lldb/tools/lldb-dap/DAP.cpp‎

Lines changed: 0 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,159 +1060,6 @@ int64_t Variables::InsertVariable(lldb::SBValue variable, bool is_permanent) {
10601060
return var_ref;
10611061
}
10621062

1063-
bool StartDebuggingRequestHandler::DoExecute(
1064-
lldb::SBDebugger debugger, char **command,
1065-
lldb::SBCommandReturnObject &result) {
1066-
// Command format like: `start-debugging <launch|attach> <configuration>`
1067-
if (!command) {
1068-
result.SetError("Invalid use of start-debugging, expected format "
1069-
"`start-debugging <launch|attach> <configuration>`.");
1070-
return false;
1071-
}
1072-
1073-
if (!command[0] || llvm::StringRef(command[0]).empty()) {
1074-
result.SetError("start-debugging request type missing.");
1075-
return false;
1076-
}
1077-
1078-
if (!command[1] || llvm::StringRef(command[1]).empty()) {
1079-
result.SetError("start-debugging debug configuration missing.");
1080-
return false;
1081-
}
1082-
1083-
llvm::StringRef request{command[0]};
1084-
std::string raw_configuration{command[1]};
1085-
1086-
llvm::Expected<llvm::json::Value> configuration =
1087-
llvm::json::parse(raw_configuration);
1088-
1089-
if (!configuration) {
1090-
llvm::Error err = configuration.takeError();
1091-
std::string msg = "Failed to parse json configuration: " +
1092-
llvm::toString(std::move(err)) + "\n\n" +
1093-
raw_configuration;
1094-
result.SetError(msg.c_str());
1095-
return false;
1096-
}
1097-
1098-
dap.SendReverseRequest<LogFailureResponseHandler>(
1099-
"startDebugging",
1100-
llvm::json::Object{{"request", request},
1101-
{"configuration", std::move(*configuration)}});
1102-
1103-
result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
1104-
1105-
return true;
1106-
}
1107-
1108-
bool ReplModeRequestHandler::DoExecute(lldb::SBDebugger debugger,
1109-
char **command,
1110-
lldb::SBCommandReturnObject &result) {
1111-
// Command format like: `repl-mode <variable|command|auto>?`
1112-
// If a new mode is not specified report the current mode.
1113-
if (!command || llvm::StringRef(command[0]).empty()) {
1114-
std::string mode;
1115-
switch (dap.repl_mode) {
1116-
case ReplMode::Variable:
1117-
mode = "variable";
1118-
break;
1119-
case ReplMode::Command:
1120-
mode = "command";
1121-
break;
1122-
case ReplMode::Auto:
1123-
mode = "auto";
1124-
break;
1125-
}
1126-
1127-
result.Printf("lldb-dap repl-mode %s.\n", mode.c_str());
1128-
result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
1129-
1130-
return true;
1131-
}
1132-
1133-
llvm::StringRef new_mode{command[0]};
1134-
1135-
if (new_mode == "variable") {
1136-
dap.repl_mode = ReplMode::Variable;
1137-
} else if (new_mode == "command") {
1138-
dap.repl_mode = ReplMode::Command;
1139-
} else if (new_mode == "auto") {
1140-
dap.repl_mode = ReplMode::Auto;
1141-
} else {
1142-
lldb::SBStream error_message;
1143-
error_message.Printf("Invalid repl-mode '%s'. Expected one of 'variable', "
1144-
"'command' or 'auto'.\n",
1145-
new_mode.data());
1146-
result.SetError(error_message.GetData());
1147-
return false;
1148-
}
1149-
1150-
result.Printf("lldb-dap repl-mode %s set.\n", new_mode.data());
1151-
result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
1152-
return true;
1153-
}
1154-
1155-
// Sends a DAP event with an optional body.
1156-
//
1157-
// See
1158-
// https://code.visualstudio.com/api/references/vscode-api#debug.onDidReceiveDebugSessionCustomEvent
1159-
bool SendEventRequestHandler::DoExecute(lldb::SBDebugger debugger,
1160-
char **command,
1161-
lldb::SBCommandReturnObject &result) {
1162-
// Command format like: `send-event <name> <body>?`
1163-
if (!command || !command[0] || llvm::StringRef(command[0]).empty()) {
1164-
result.SetError("Not enough arguments found, expected format "
1165-
"`lldb-dap send-event <name> <body>?`.");
1166-
return false;
1167-
}
1168-
1169-
llvm::StringRef name{command[0]};
1170-
// Events that are stateful and should be handled by lldb-dap internally.
1171-
const std::array internal_events{"breakpoint", "capabilities", "continued",
1172-
"exited", "initialize", "loadedSource",
1173-
"module", "process", "stopped",
1174-
"terminated", "thread"};
1175-
if (llvm::is_contained(internal_events, name)) {
1176-
std::string msg =
1177-
llvm::formatv("Invalid use of lldb-dap send-event, event \"{0}\" "
1178-
"should be handled by lldb-dap internally.",
1179-
name)
1180-
.str();
1181-
result.SetError(msg.c_str());
1182-
return false;
1183-
}
1184-
1185-
llvm::json::Object event(CreateEventObject(name));
1186-
1187-
if (command[1] && !llvm::StringRef(command[1]).empty()) {
1188-
// See if we have unused arguments.
1189-
if (command[2]) {
1190-
result.SetError(
1191-
"Additional arguments found, expected `lldb-dap send-event "
1192-
"<name> <body>?`.");
1193-
return false;
1194-
}
1195-
1196-
llvm::StringRef raw_body{command[1]};
1197-
1198-
llvm::Expected<llvm::json::Value> body = llvm::json::parse(raw_body);
1199-
1200-
if (!body) {
1201-
llvm::Error err = body.takeError();
1202-
std::string msg = "Failed to parse custom event body: " +
1203-
llvm::toString(std::move(err));
1204-
result.SetError(msg.c_str());
1205-
return false;
1206-
}
1207-
1208-
event.try_emplace("body", std::move(*body));
1209-
}
1210-
1211-
dap.SendJSON(llvm::json::Value(std::move(event)));
1212-
result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
1213-
return true;
1214-
}
1215-
12161063
void DAP::ConfigureSourceMaps() {
12171064
if (configuration.sourceMap.empty() && configuration.sourcePath.empty())
12181065
return;

0 commit comments

Comments
 (0)