use malva for testing

Author: kt3k

Cargo.lock

@@ -42,5 +42,6 @@ serde_json = { version = "1.0", optional = true }
 
 [dev-dependencies]
 dprint-development = "0.10.1"
+malva = "0.11.1"
 pretty_assertions = "1.3.0"
 serde_json = { version = "1.0" }

Cargo.toml

@@ -3025,7 +3025,7 @@ fn maybe_gen_tagged_tpl_with_external_formatter<'a>(node: &TaggedTpl<'a>, contex
   for (i, quasi) in node.tpl.quasis.iter().enumerate() {
     text.push(quasi.raw().to_string());
     if i < expr_len {
-      text.push(format!("@dprint-placeholder-{}-id", i));
+      text.push(format!("dprint-placeholder-{}-id", i));
     }
   }
 
@@ -3039,7 +3039,7 @@ fn maybe_gen_tagged_tpl_with_external_formatter<'a>(node: &TaggedTpl<'a>, contex
   items.push_signal(Signal::StartIndent);
   for line in formatted_tpl.lines() {
     let mut i = 0;
-    let re = regex::Regex::new("@dprint-placeholder-(\\d+)-id").unwrap();
+    let re = regex::Regex::new("dprint-placeholder-(\\d+)-id").unwrap();
     re.captures_iter(line).for_each(|cap| {
       let m = cap.get(0).unwrap();
       let d = cap.get(1).unwrap().as_str().parse::<usize>().unwrap();

src/generation/generate.rs

@@ -9,23 +9,27 @@ use dprint_plugin_typescript::*;
 
 fn external_formatter(media_type: MediaType, text: String) -> Option<String> {
   assert_eq!(media_type, MediaType::Css);
-  // Put each rule on a separate line.
-  Some(
-    text
-      .split(';')
-      .filter_map(|val| {
-        let val = val.trim();
-        if val.is_empty() {
-          None
-        } else {
-          Some(format!("{};", val))
-        }
-      })
-      .collect::<Vec<_>>()
-      .join("\n"),
-  )
+  let Ok(text) = malva::format_text(&format!("a{{\n{}\n}}", text), malva::Syntax::Css, &malva::config::FormatOptions::default()) else {
+    return None;
+  };
+  let mut buf = vec![];
+  for (i, l) in text.lines().enumerate() {
+    if i == 0 {
+      continue;
+    }
+    if l.starts_with("}") {
+      continue;
+    }
+    let mut chars = l.chars();
+    // drop the first two chars
+    chars.next();
+    chars.next();
+    buf.push(chars.as_str());
+  }
+  Some(buf.join("\n").to_string())
 }
 
+
 fn main() {
   //debug_here!();
   let global_config = GlobalConfiguration {