Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion rust/src/modules/vmerror/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ impl fmt::Display for VMError {
}
VMError::SystemError(s) => write!(f, "{}", s),
}?;
write!(f, "\n{}", self.diagnostic_link())?;
if !matches!(self, VMError::SystemError(_)) {
if is_hint {
write!(
Expand All @@ -144,6 +143,11 @@ impl fmt::Display for VMError {
write!(f, "\n {DARK_GRAY}error type: {}", err_type)?;
}
}
write!(
f,
"\n {RESET}{CYAN}├── {DARK_GRAY}documentation: {}{RESET}",
self.diagnostic_link()
)?;
if is_backtrace {
let backtrace = get_backtrace();
write!(
Expand Down
36 changes: 33 additions & 3 deletions rust/src/modules/vmerror/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,23 +182,53 @@ mod tests {

#[test]
fn formatted_error_contains_its_diagnostic_link() {
set_thread_error_config(false, false, true);
let error = VMError::StackOverflow { ip: 1, limit: 2 };
let formatted = error.to_string();
let metadata_position = formatted.find("error type:").unwrap();
let documentation_position = formatted.find("documentation:").unwrap();
let hint_position = formatted.find("hint:").unwrap();

assert!(error.to_string().contains(&error.diagnostic_link()));
assert!(
formatted.contains(&format!("documentation: {}", error.diagnostic_link()))
);
assert!(formatted.contains("\x1b[36m├── \x1b[2;37mdocumentation:"));
assert!(metadata_position < documentation_position);
assert!(documentation_position < hint_position);
}

#[test]
fn formatted_system_error_contains_its_diagnostic_link() {
set_thread_error_config(false, false, true);
let error = VMError::SystemError(SmolStr::new("system failure"));
let formatted = error.to_string();
let error_position = formatted.find("system failure").unwrap();
let documentation_position = formatted.find("documentation:").unwrap();
let hint_position = formatted.find("hint:").unwrap();

assert!(error.to_string().contains(&error.diagnostic_link()));
assert!(formatted.contains(&error.diagnostic_link()));
assert!(error_position < documentation_position);
assert!(documentation_position < hint_position);
}

#[test]
fn diagnostic_link_is_rendered_when_hints_are_disabled() {
set_thread_error_config(false, false, false);
let error = VMError::StackOverflow { ip: 1, limit: 2 };
let formatted = error.to_string();

assert!(error.to_string().contains(&error.diagnostic_link()));
assert!(formatted.contains(&error.diagnostic_link()));
assert!(formatted.contains("documentation:"));
}

#[test]
fn diagnostic_link_is_rendered_before_backtrace() {
set_thread_error_config(true, false, true);
let error = VMError::StackOverflow { ip: 1, limit: 2 };
let formatted = error.to_string();
let documentation_position = formatted.find("documentation:").unwrap();
let backtrace_position = formatted.find("internal backtrace:").unwrap();

assert!(documentation_position < backtrace_position);
}
}
Loading