refactor(fmt): rewrite HTML syntax error handling (#25892)

denoland · Sep 27, 2024 · 09a7cc4 · 09a7cc4
1 parent eff6423
commit 09a7cc4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -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

diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
@@ -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

diff --git a/tests/specs/fmt/html/broken.out b/tests/specs/fmt/html/broken.out
@@ -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