roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-13 09:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

show preceding comment in failed test messages

Browse Source
This commit is contained in:
Folkert 2022-07-19 20:38:42 +02:00 committed by Richard Feldman
parent 2caf58dfd2
commit 2e07c3f617
No known key found for this signature in database
GPG Key ID: 7E4127D1E4241798
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/cli/src/lib.rs
View File

@ -444,7 +444,13 @@ pub fn test(matches: &ArgMatches, triple: Triple) -> io::Result<i32> {
println!();
} else if buffer.iter().any(|b| *b != 0) {
failed += 1;
render_expect_failure(arena, &mut expectations, interns, shared_memory_ptr);
render_expect_failure(
arena,
Some(expect),
&mut expectations,
interns,
shared_memory_ptr,
);
println!();
} else {
passed += 1;
@ -1011,7 +1017,13 @@ unsafe fn roc_run_native_debug(
let shared_memory_ptr: *const u8 = shared_ptr.cast();
render_expect_failure(arena, &mut expectations, interns, shared_memory_ptr);
render_expect_failure(
arena,
None,
&mut expectations,
interns,
shared_memory_ptr,
);
}
_ => println!("received signal {}", sig),
}
@ -1074,6 +1086,7 @@ fn render_expect_panic<'a>(
fn render_expect_failure<'a>(
arena: &'a Bump,
expect: Option<ToplevelExpect>,
expectations: &mut VecMap<ModuleId, Expectations>,
interns: &'a Interns,
start: *const u8,
@ -1102,7 +1115,11 @@ fn render_expect_failure<'a>(
let src_lines: Vec<_> = file_string.lines().collect();
let line_info = roc_region::all::LineInfo::new(&file_string);
let line_col_region = line_info.convert_region(region);
let display_region = match expect {
Some(expect) => Region::span_across(&expect.region, &region),
None => region,
};
let line_col_region = line_info.convert_region(display_region);
let alloc = RocDocAllocator::new(&src_lines, module_id, interns);