Skip class strings containing template syntax (fixes 0.25.0 regression)

rustywind-core/src/app.rs

@@ -83,13 +83,23 @@ impl RustyWind {
                 .or_else(|| caps.get(2))
                 .expect("class extractor regex must include a capture group")
                 .as_str();
+
+            if contains_template_syntax(classes) {
+                return caps[0].to_string();
+            }
+
             let sorted_classes = self.sort_classes(classes);
             caps[0].replace(classes, &sorted_classes)
         })
     }
 
     /// Given a [&str] of whitespace-separated classes, returns a [String] of sorted classes.
     /// Does not preserve whitespace.
+    ///
+    /// Expects plain class names only: the template-syntax guard lives in
+    /// [`Self::sort_file_contents`], so passing a string containing embedded
+    /// template code (e.g. `<%= ... %>`) will split it on whitespace like any
+    /// other classes.
     pub fn sort_classes(&self, class_string: &str) -> String {
         let extracted_classes = self.unwrap_wrapped_classes(class_string);
 
@@ -282,6 +292,49 @@ fn prefixed_pattern_sorter(tailwind_prefix: &str) -> Arc<HybridSorter> {
     )
 }
 
+/// Delimiters of template-language tags (ERB/EJS `<% %>`, PHP `<? ?>`,
+/// Handlebars/Jinja/Liquid `{{ }}` and `{% %}`, Ruby string interpolation `#{ }`,
+/// JS template literals `${ }`). Class strings containing embedded code can't be
+/// safely split on whitespace — sorting them would move tokens across code
+/// boundaries and corrupt the template. Closing delimiters are included because
+/// a quote inside the template code can split the regex match, leaving a
+/// fragment that contains only the tail of a tag.
+// TODO: instead of skipping the whole class string, tokenize template tags as
+// opaque units so the static classes around them can still be sorted.
+const TEMPLATE_DELIMITERS: [&str; 10] =
+    ["<%", "%>", "<?", "?>", "{{", "}}", "{%", "%}", "#{", "${"];
+
+fn contains_template_syntax(class_string: &str) -> bool {
+    TEMPLATE_DELIMITERS
+        .iter()
+        .any(|delimiter| class_string.contains(delimiter))
+}
+
+#[cfg(test)]
+mod template_syntax_tests {
+    use super::contains_template_syntax;
+
+    #[test]
+    fn detects_closing_delimiter_fragments() {
+        // a quote inside template code can split the regex match, leaving a
+        // fragment with only the tail of a tag
+        assert!(contains_template_syntax("a' %> flex p-4"));
+        assert!(contains_template_syntax("arg'}} p-4"));
+        assert!(contains_template_syntax("x %} m-4"));
+        assert!(contains_template_syntax("y ?> m-4"));
+    }
+
+    #[test]
+    fn ignores_plain_class_strings() {
+        assert!(!contains_template_syntax(
+            "flex p-4 max-w-[min(100%, 500px)]"
+        ));
+        assert!(!contains_template_syntax(
+            "[&>*]:p-4 [@supports(display:grid)]:grid"
+        ));
+    }
+}
+
 fn split_class_tokens(class_string: &str) -> Vec<&str> {
     let mut tokens = Vec::new();
     let mut start = None;
@@ -521,6 +574,42 @@ mod tests {
         r#"<div><p><img height="100" width="250" /></p><p></p></div>"#
         ; "makes no change to elements without class string"
     )]
+    #[test_case(
+        &RUSTYWIND_DEFAULT,
+        r#"<div class="<%= layout == :cards ? 'flex flex-col gap-3 sm:flex-row sm:justify-between sm:items-center' : 'sm:flex sm:items-center' %>">"#,
+        r#"<div class="<%= layout == :cards ? 'flex flex-col gap-3 sm:flex-row sm:justify-between sm:items-center' : 'sm:flex sm:items-center' %>">"#
+        ; "makes no change to class string that is a single erb ternary"
+    )]
+    #[test_case(
+        &RUSTYWIND_DEFAULT,
+        r#"<span class="inline-flex items-center <%= data["company"].present? ? 'h-auto py-2 px-3 gap-x-1.5' : 'h-8 py-1 px-2 gap-x-0.5' %> rounded-md">"#,
+        r#"<span class="inline-flex items-center <%= data["company"].present? ? 'h-auto py-2 px-3 gap-x-1.5' : 'h-8 py-1 px-2 gap-x-0.5' %> rounded-md">"#
+        ; "makes no change to class string with erb tag between static classes"
+    )]
+    #[test_case(
+        &RUSTYWIND_DEFAULT,
+        r#"<span class="flex h-8 w-8 items-center justify-center rounded-full <%= record.active? ? 'bg-brand-yellow text-gray-950' : 'border-2 border-gray-300 bg-white' %>">"#,
+        r#"<span class="flex h-8 w-8 items-center justify-center rounded-full <%= record.active? ? 'bg-brand-yellow text-gray-950' : 'border-2 border-gray-300 bg-white' %>">"#
+        ; "makes no change to class string with static classes before an erb ternary"
+    )]
+    #[test_case(
+        &RUSTYWIND_DEFAULT,
+        r##"<div class="box f-col #{reply.reply_id ? "ok" : ""}">"##,
+        r##"<div class="box f-col #{reply.reply_id ? "ok" : ""}">"##
+        ; "makes no change to class string with ruby string interpolation"
+    )]
+    #[test_case(
+        &RUSTYWIND_DEFAULT,
+        r#"<div class="p-4 {{ active ? 'flex flex-col' : 'hidden' }}">"#,
+        r#"<div class="p-4 {{ active ? 'flex flex-col' : 'hidden' }}">"#
+        ; "makes no change to class string with mustache style interpolation"
+    )]
+    #[test_case(
+        &RUSTYWIND_DEFAULT,
+        r#"html`<div class="p-4 m-4 ${active ? 'flex flex-col' : 'hidden'}">`"#,
+        r#"html`<div class="p-4 m-4 ${active ? 'flex flex-col' : 'hidden'}">`"#
+        ; "makes no change to class string with js template literal interpolation"
+    )]
     fn test_sort_file_contents(app: &RustyWind, input: &str, output: &str) {
         assert_eq!(app.sort_file_contents(input), output);
     }