diff options
Diffstat (limited to 'cli/tools/fmt.rs')
| -rw-r--r-- | cli/tools/fmt.rs | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs index 7a3c0de4b..a7f4fd554 100644 --- a/cli/tools/fmt.rs +++ b/cli/tools/fmt.rs @@ -33,6 +33,7 @@ use deno_core::error::AnyError; use deno_core::futures; use deno_core::parking_lot::Mutex; use deno_core::unsync::spawn_blocking; +use deno_core::url::Url; use log::debug; use log::info; use log::warn; @@ -435,7 +436,39 @@ pub fn format_html( }, ) .map_err(|error| match error { - markup_fmt::FormatError::Syntax(error) => AnyError::from(error), + markup_fmt::FormatError::Syntax(error) => { + // TODO(bartlomieju): rework when better error support in `markup_fmt` lands + fn inner( + error: &markup_fmt::SyntaxError, + file_path: &Path, + ) -> Option<String> { + let error_str = format!("{}", error); + let error_str = error_str.strip_prefix("syntax error '")?; + + let reason = error_str + .split("' at") + .collect::<Vec<_>>() + .first() + .map(|s| s.to_string())?; + + let url = Url::from_file_path(file_path).ok()?; + + let error_msg = format!( + "Syntax error ({}) at {}:{}:{}\n", + reason, + url.as_str(), + error.line, + error.column + ); + Some(error_msg) + } + + if let Some(error_msg) = inner(&error, file_path) { + AnyError::from(generic_error(error_msg)) + } else { + AnyError::from(error) + } + } markup_fmt::FormatError::External(errors) => { let last = errors.len() - 1; AnyError::msg( |