mirror of
https://github.com/denoland/deno.git
synced 2024-11-24 15:19:26 -05:00
refactor(fmt): rewrite HTML syntax error handling (#25892)
This commit is contained in:
parent
eff64238b6
commit
09a7cc4723
4 changed files with 5 additions and 15 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -4342,9 +4342,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "markup_fmt"
|
||||
version = "0.13.0"
|
||||
version = "0.13.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74fc137a4a591720176339bf7e857586a48ff35c0caee7ad6cf709327901232c"
|
||||
checksum = "9dab5ae899659fbe5c8835b2c8ca8d3e357974a3e454138925b404004973361f"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"css_dataset",
|
||||
|
|
|
@ -124,7 +124,7 @@ libz-sys.workspace = true
|
|||
log = { workspace = true, features = ["serde"] }
|
||||
lsp-types.workspace = true
|
||||
malva = "=0.10.1"
|
||||
markup_fmt = "=0.13.0"
|
||||
markup_fmt = "=0.13.1"
|
||||
memmem.workspace = true
|
||||
monch.workspace = true
|
||||
notify.workspace = true
|
||||
|
|
|
@ -437,25 +437,15 @@ pub fn format_html(
|
|||
)
|
||||
.map_err(|error| match 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,
|
||||
error.kind,
|
||||
url.as_str(),
|
||||
error.line,
|
||||
error.column
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Error formatting: [WILDCARD]broken.html
|
||||
Syntax error (expect close tag) at file://[WILDCARD]broken.html:3:0
|
||||
Syntax error (expected close tag) at file://[WILDCARD]broken.html:3:0
|
||||
|
||||
Checked 1 file
|
||||
|
|
Loading…
Reference in a new issue