Fix calc() minify bug

Author: texodus

rust-toolchain.toml

@@ -1,4 +1,10 @@
 [toolchain]
 channel = "nightly-2023-10-12"
-components = ["rustfmt", "clippy", "rust-src", "llvm-tools-preview"]
+components = [
+    "rustfmt",
+    "clippy",
+    "rust-src",
+    "llvm-tools-preview",
+    "rust-analyzer",
+]
 targets = ["wasm32-unknown-unknown"]

src/ast/token/space.rs

@@ -39,6 +39,7 @@ impl NeedsWhitespaceStringExt for str {
                     || x == '+'
                     || x == '"'
                     || x == '\''
+                    || x == '('
             })
             .unwrap_or_default()
     }
@@ -54,6 +55,7 @@ impl NeedsWhitespaceStringExt for str {
                     || x == '_'
                     || x == '%'
                     || x == '+'
+                    || x == ')'
             })
             .unwrap_or_default()
     }

tests/at_ruleset.rs

@@ -131,7 +131,7 @@ fn test_font_face() {
         .map(|x| x.flatten_tree().as_css_string())
         .as_deref(),
         Ok("@font-face{font-family:\"Open \
-            Sans\";font-display:block;src:url(./font/open-sans.woff2)format(\"truetype\");}")
+            Sans\";font-display:block;src:url(./font/open-sans.woff2) format(\"truetype\");}")
     )
 }
 
@@ -149,7 +149,7 @@ fn test_media() {
         )
         .map(|x| x.flatten_tree().as_css_string())
         .as_deref(),
-        Ok("@media(max-width:1250px){div{color:red;}}")
+        Ok("@media (max-width:1250px){div{color:red;}}")
     )
 }
 
@@ -174,7 +174,7 @@ fn test_nested_media_preserved_after_flatten() {
         .map(|x| x.flatten_tree().as_css_string())
         .as_deref(),
         Ok(
-            "@media(max-width:1250px){@media(min-width:50px){div{color:red;}div \
+            "@media (max-width:1250px){@media (min-width:50px){div{color:red;}div \
              span{color:blue;}}}"
         )
     )

tests/minify.rs

@@ -45,3 +45,13 @@ fn test_minify_svg() {
         Ok("div{background:url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' preserveAspectRatio='none' viewBox='0 0 100 100'><path d='M100 0 L0 100 ' stroke='black' stroke-width='1'/><path d='M0 0 L100 100 ' stroke='black' stroke-width='1'/></svg>\")#8b868045;}")
     )
 }
+
+#[test]
+fn test_minify_complex_calc() {
+    assert_matches!(
+        parse(r#"div { padding: calc(17px + ((var(--status-bar--height) - 48px) / 2)); }"#)
+            .map(|x| x.as_css_string())
+            .as_deref(),
+        Ok("div{padding:calc(17px + ((var(--status-bar--height) - 48px)/2));}")
+    )
+}