Skip to content

Commit 482c722

Browse files
Fix RapidJson Failure
1 parent 7a0c5ef commit 482c722

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/bin/lpython.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,13 +378,17 @@ int get_symbols (const std::string &infile,
378378
uint32_t last_line;
379379
uint32_t first_column;
380380
uint32_t last_column;
381-
lm.pos_to_linecol(a.second->base.loc.first, first_line, first_column);
382-
lm.pos_to_linecol(a.second->base.loc.last, last_line, last_column);
381+
std::string filename;
382+
lm.pos_to_linecol(a.second->base.loc.first, first_line,
383+
first_column, filename);
384+
lm.pos_to_linecol(a.second->base.loc.last, last_line,
385+
last_column, filename);
383386
loc.first_column = first_column;
384387
loc.last_column = last_column;
385388
loc.first_line = first_line-1;
386389
loc.last_line = last_line-1;
387390
loc.symbol_name = symbol_name;
391+
loc.filename = filename;
388392
symbol_lists.push_back(loc);
389393
}
390394
rapidjson::Document test_output(rapidjson::kArrayType);
@@ -478,12 +482,16 @@ int get_errors (const std::string &infile,
478482
uint32_t first_column;
479483
uint32_t last_line;
480484
uint32_t last_column;
481-
lm.pos_to_linecol(span.loc.first, first_line, first_column);
482-
lm.pos_to_linecol(span.loc.last, last_line, last_column);
485+
std::string filename;
486+
lm.pos_to_linecol(span.loc.first, first_line, first_column,
487+
filename);
488+
lm.pos_to_linecol(span.loc.last, last_line, last_column,
489+
filename);
483490
h.first_column = first_column;
484491
h.last_column = last_column;
485492
h.first_line = first_line-1;
486493
h.last_line = last_line-1;
494+
h.filename = filename;
487495
diag_lists.push_back(h);
488496
}
489497
}

src/libasr/lsp_interface.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace LFortran::LPython {
1111
uint32_t first_column;
1212
uint32_t last_line;
1313
uint32_t last_column;
14+
std::string filename;
1415
uint32_t severity;
1516
};
1617
struct document_symbols {
@@ -19,6 +20,7 @@ namespace LFortran::LPython {
1920
uint32_t first_column;
2021
uint32_t last_line;
2122
uint32_t last_column;
23+
std::string filename;
2224
};
2325

2426
} // namespace LFortran::Python

0 commit comments

Comments
 (0)