Skip to content

Commit b5e70d0

Browse files
authored
[lldb-dap] Use LLDB_INVALID_LINE_NUMBER & LLDB_INVALID_COLUMN_NUMBER (#129948)
Consistently use LLDB_INVALID_LINE_NUMBER & LLDB_INVALID_COLUMN_NUMBER when parsing line and column numbers respectively.
1 parent f2bebdc commit b5e70d0

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ void BreakpointLocationsRequestHandler::operator()(
131131
auto *arguments = request.getObject("arguments");
132132
auto *source = arguments->getObject("source");
133133
std::string path = GetString(source, "path").str();
134-
const auto start_line = GetInteger<uint64_t>(arguments, "line").value_or(0);
135-
const auto start_column =
136-
GetInteger<uint64_t>(arguments, "column").value_or(0);
134+
const auto start_line = GetInteger<uint64_t>(arguments, "line")
135+
.value_or(LLDB_INVALID_LINE_NUMBER);
136+
const auto start_column = GetInteger<uint64_t>(arguments, "column")
137+
.value_or(LLDB_INVALID_COLUMN_NUMBER);
137138
const auto end_line =
138139
GetInteger<uint64_t>(arguments, "endLine").value_or(start_line);
139140
const auto end_column = GetInteger<uint64_t>(arguments, "endColumn")

lldb/tools/lldb-dap/SourceBreakpoint.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ namespace lldb_dap {
2727
SourceBreakpoint::SourceBreakpoint(DAP &dap, const llvm::json::Object &obj)
2828
: Breakpoint(dap, obj),
2929
logMessage(std::string(GetString(obj, "logMessage"))),
30-
line(GetInteger<uint64_t>(obj, "line").value_or(0)),
31-
column(GetInteger<uint64_t>(obj, "column").value_or(0)) {}
30+
line(
31+
GetInteger<uint64_t>(obj, "line").value_or(LLDB_INVALID_LINE_NUMBER)),
32+
column(GetInteger<uint64_t>(obj, "column")
33+
.value_or(LLDB_INVALID_COLUMN_NUMBER)) {}
3234

3335
void SourceBreakpoint::SetBreakpoint(const llvm::StringRef source_path) {
3436
lldb::SBFileSpecList module_list;

0 commit comments

Comments
 (0)