Fix test cases

Author: notriddle

Cargo.lock

@@ -17,8 +17,20 @@ description = "Creates a book from markdown files"
 rust-version = "1.74"
 build = "build.rs"
 
-[build-dependencies]
-syntect = { version = "5.1.0" }
+[build-dependencies.syntect]
+version = "5.1.0"
+default-features = false
+features = [
+    # regex-onig, the default, isn't portable enough
+    "regex-fancy",
+    "parsing",
+    "default-syntaxes",
+    "default-themes",
+    "html",
+    "yaml-load",
+    "dump-load",
+    "dump-create",
+]
 
 [dependencies]
 anyhow = "1.0.71"
@@ -67,7 +79,7 @@ walkdir = "2.3.3"
 
 [features]
 default = ["watch", "serve", "search", "gen-syntax-cache"]
-watch = ["dep:notify", "dep:notify-debouncer-mini", "dep:ignore"]
+watch = ["dep:notify", "dep:notify-debouncer-mini", "dep:ignore", "dep:pathdiff", "dep:walkdir"]
 serve = ["dep:futures-util", "dep:tokio", "dep:warp"]
 search = ["dep:elasticlunr-rs", "dep:ammonia"]
 gen-syntax-cache = ["syntect/dump-create"]
@@ -79,3 +91,7 @@ name = "mdbook"
 [[example]]
 name = "nop-preprocessor"
 test = true
+
+[profile.dev]
+opt-level = 1
+

Cargo.toml

@@ -2,9 +2,9 @@
 
 pub mod build;
 pub mod clean;
+pub mod command_prelude;
 #[cfg(feature = "gen-syntax-cache")]
 pub mod gen_syntax_cache;
-pub mod command_prelude;
 pub mod init;
 #[cfg(feature = "serve")]
 pub mod serve;

src/cmd/mod.rs

@@ -547,7 +547,7 @@ impl Renderer for HtmlHandlebars {
             None => ctx.root.join("theme"),
         };
 
-        let theme = theme::Theme::new(theme_dir);
+        let theme = theme::Theme::new(theme_dir.clone());
 
         debug!("Collect syntaxes into a syntax set");
         self.build_syntaxset(&theme, &theme_dir);

src/renderer/html_handlebars/hbs_renderer.rs

@@ -372,7 +372,7 @@ impl<'a> SyntaxHighlighter<'a> {
                     )))
                 }
             }
-            Event::End(Tag::CodeBlock(CodeBlockKind::Fenced(_))) => {
+            Event::End(TagEnd::CodeBlock) => {
                 self.highlight = false;
                 self.is_rust = false;
                 self.syntax = None;

src/utils/mod.rs

@@ -853,7 +853,7 @@ mod search {
     // Setting this to `true` may cause issues with `cargo watch`,
     // since it may not finish writing the fixture before the tests
     // are run again.
-    const GENERATE_FIXTURE: bool = true;
+    const GENERATE_FIXTURE: bool = false;
 
     fn get_fixture() -> serde_json::Value {
         if GENERATE_FIXTURE {