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

Improve formatting of formatter error messages, and also write out the invalidly formatted file separately

Browse source
This commit is contained in:
Joshua Warner 2021-11-26 17:16:51 -08:00
parent 0a58d6e60e
commit 16cf95cf6e
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cli/src/format.rs
View file

@ -34,7 +34,13 @@ pub fn format(files: std::vec::Vec<PathBuf>) {
let mut fail_file = file.clone(); let mut fail_file = file.clone();
fail_file.set_extension("roc-format-failed"); fail_file.set_extension("roc-format-failed");
std::fs::write(&fail_file, &buf).unwrap(); std::fs::write(&fail_file, &buf).unwrap();
internal_error!("Formatting bug; formatted code isn't valid\n\nI wrote the incorrect result to this file for debugging purposes:\n{}\n\nParse error was: {:?}", fail_file.display(), e); internal_error!(
"Formatting bug; formatted code isn't valid\n\n\
I wrote the incorrect result to this file for debugging purposes:\n{}\n\n\
Parse error was: {:?}\n\n",
fail_file.display(),
e
);
})); }));
let ast = ast.remove_spaces(&arena); let ast = ast.remove_spaces(&arena);
@ -46,15 +52,25 @@ pub fn format(files: std::vec::Vec<PathBuf>) {
// I don't have the patience to debug this right now, so let's leave it for another day... // I don't have the patience to debug this right now, so let's leave it for another day...
// TODO: fix PartialEq impl on ast types // TODO: fix PartialEq impl on ast types
if format!("{:?}", ast) != format!("{:?}", reparsed_ast) { if format!("{:?}", ast) != format!("{:?}", reparsed_ast) {
let mut fail_file = file.clone();
fail_file.set_extension("roc-format-failed");
std::fs::write(&fail_file, &buf).unwrap();
let mut before_file = file.clone(); let mut before_file = file.clone();
before_file.set_extension("roc-failed-format-ast-before"); before_file.set_extension("roc-format-failed-ast-before");
std::fs::write(&before_file, &format!("{:#?}\n", ast)).unwrap(); std::fs::write(&before_file, &format!("{:#?}\n", ast)).unwrap();
let mut after_file = file.clone(); let mut after_file = file.clone();
after_file.set_extension("roc-failed-format-ast-after"); after_file.set_extension("roc-format-failed-ast-after");
std::fs::write(&after_file, &format!("{:#?}\n", reparsed_ast)).unwrap(); std::fs::write(&after_file, &format!("{:#?}\n", reparsed_ast)).unwrap();
internal_error!("Formatting bug; formatting didn't reparse as the same tree\n\nI wrote the tree before and after formatting to these files, for debugging purposes:\n{}\n{}", before_file.display(), after_file.display()); internal_error!(
"Formatting bug; formatting didn't reparse as the same tree\n\n\
I wrote the incorrect result to this file for debugging purposes:\n{}\n\n\
I wrote the tree before and after formatting to these files for debugging purposes:\n{}\n{}\n\n",
fail_file.display(),
before_file.display(),
after_file.display());
} }
std::fs::write(&file, &buf).unwrap(); std::fs::write(&file, &buf).unwrap();