language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 08:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add caret underline for sinlg-line regions

Browse source
This commit is contained in:
Folkert 2020-03-31 23:28:14 +02:00
parent 11c8e2bfaa
commit 2b4b63a8eb
2 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

43
compiler/reporting/src/report.rs
View file

@ -295,10 +295,10 @@ impl ReportText {
buf.push('\n');
let max_line_number_length = region.end_line.to_string().len();
for i in region.start_line..=region.end_line {
let i_one_indexed = i + 1;
if region.start_line == region.end_line {
let i = region.start_line;
let line_number_string = i_one_indexed.to_string();
let line_number_string = (i + 1).to_string();
let line_number = line_number_string.as_str();
let this_line_number_length = line_number.len();
@ -316,8 +316,41 @@ impl ReportText {
buf.push_str(src_lines[i as usize]);
}
if i != region.end_line {
buf.push('\n');
buf.push('\n');
buf.push_str(" ".repeat(max_line_number_length).as_str());
buf.push_str(" ┆");
let spaces = std::iter::repeat(" ").take(region.start_col as usize + 2);
let carets =
std::iter::repeat("^").take((region.end_col - region.start_col) as usize);
let line = spaces.chain(carets).collect::<String>();
buf.push_str(&*line);
} else {
for i in region.start_line..=region.end_line {
let i_one_indexed = i + 1;
let line_number_string = i_one_indexed.to_string();
let line_number = line_number_string.as_str();
let this_line_number_length = line_number.len();
buf.push_str(
" ".repeat(max_line_number_length - this_line_number_length)
.as_str(),
);
buf.push_str(line_number);
buf.push_str(" ┆");
let line = src_lines[i as usize];
if !line.trim().is_empty() {
buf.push_str(" ");
buf.push_str(src_lines[i as usize]);
}
if i != region.end_line {
buf.push('\n');
}
}
}

3
compiler/reporting/tests/test_reporting.rs
View file

@ -285,6 +285,7 @@ mod test_reporting {
y is not used anywhere in your code.
2 ┆ y = 2
┆ ^
If you didn't intend on using y then remove it so future readers of your code don't wonder why it is there."#
),
@ -345,11 +346,11 @@ mod test_reporting {
You cannot mix (!=) and (==) without parentheses
3 ┆ if selectedId != thisId == adminsId then
┆ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
"#
),
)
// ┆ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
}
#[test]