Merge pull request #2840 from ehuss/partition-source

Rewrite partition_source to return slices

crates/mdbook-html/src/html_handlebars/hbs_renderer.rs

@@ -871,9 +871,16 @@ fn add_playground_pre(
                             code.into()
                         } else {
                             // we need to inject our own main
-                            let (attrs, code) = partition_source(code);
+                            let (attrs, code) = partition_rust_source(code);
-
+                            let newline = if code.is_empty() || code.ends_with('\n') {
-                            format!("# #![allow(unused)]\n{attrs}# fn main() {{\n{code}# }}").into()
+                                ""
+                            } else {
+                                "\n"
+                            };
+                            format!(
+                                "# #![allow(unused)]\n{attrs}# fn main() {{\n{code}{newline}# }}"
+                            )
+                            .into()
                         };
                         content
                     }
@@ -980,25 +987,26 @@ fn hide_lines_with_prefix(content: &str, prefix: &str) -> String {
     result
 }
 
-fn partition_source(s: &str) -> (String, String) {
+/// Splits Rust inner attributes from the given source string.
-    let mut after_header = false;
+///
-    let mut before = String::new();
+/// Returns `(inner_attrs, rest_of_code)`.
-    let mut after = String::new();
+fn partition_rust_source(s: &str) -> (&str, &str) {
-
+    static_regex!(
-    for line in s.lines() {
+        HEADER_RE,
-        let trimline = line.trim();
+        r"^(?mx)
-        let header = trimline.chars().all(char::is_whitespace) || trimline.starts_with("#![");
+        (
-        if !header || after_header {
+            (?:
-            after_header = true;
+                ^[ \t]*\#!\[.* (?:\r?\n)?
-            after.push_str(line);
+                |
-            after.push('\n');
+                ^\s* (?:\r?\n)?
-        } else {
+            )*
-            before.push_str(line);
+        )"
-            before.push('\n');
+    );
-        }
+    let split_idx = match HEADER_RE.captures(s) {
-    }
+        Some(caps) => caps[1].len(),
-
+        None => 0,
-    (before, after)
+    };
+    s.split_at(split_idx)
 }
 
 struct RenderChapterContext<'a> {
@@ -1312,4 +1320,37 @@ mod tests {
         assert_eq!(json!(TextDirection::RightToLeft), json!("rtl"));
         assert_eq!(json!(TextDirection::LeftToRight), json!("ltr"));
     }
+
+    #[test]
+    fn it_partitions_rust_source() {
+        assert_eq!(partition_rust_source(""), ("", ""));
+        assert_eq!(partition_rust_source("let x = 1;"), ("", "let x = 1;"));
+        assert_eq!(
+            partition_rust_source("fn main()\n{ let x = 1; }\n"),
+            ("", "fn main()\n{ let x = 1; }\n")
+        );
+        assert_eq!(
+            partition_rust_source("#![allow(foo)]"),
+            ("#![allow(foo)]", "")
+        );
+        assert_eq!(
+            partition_rust_source("#![allow(foo)]\n"),
+            ("#![allow(foo)]\n", "")
+        );
+        assert_eq!(
+            partition_rust_source("#![allow(foo)]\nlet x = 1;"),
+            ("#![allow(foo)]\n", "let x = 1;")
+        );
+        assert_eq!(
+            partition_rust_source(
+                "\n\
+                #![allow(foo)]\n\
+                \n\
+                #![allow(bar)]\n\
+                \n\
+                let x = 1;"
+            ),
+            ("\n#![allow(foo)]\n\n#![allow(bar)]\n\n", "let x = 1;")
+        );
+    }
 }