fix: error on missing include file

Author: cestef

Diff for: components/markdown/src/codeblock/mod.rs

@@ -129,15 +129,13 @@ impl<'config> CodeBlock<'config> {
         ))
     }
 
-    pub fn include(&self, base: Option<&PathBuf>) -> Option<String> {
-        let path = base?.join(self.include.as_ref()?);
-        let res = read_file(&path);
-        match res {
-            Ok(content) => Some(content),
-            Err(e) => {
-                eprintln!("Warning: Failed to include {:?}: {}", path, e);
-                None
-            }
+    pub fn include(&self, base: Option<&PathBuf>) -> Result<Option<String>> {
+        if let Some(base) = base {
+            let path = base.join(&self.include.as_ref().expect("No include path"));
+            let content = read_file(&path)?;
+            Ok(Some(content))
+        } else {
+            Ok(None)
         }
     }
 

Diff for: components/markdown/src/markdown.rs

@@ -577,19 +577,25 @@ pub fn markdown_to_html(
                 }
                 Event::End(TagEnd::CodeBlock { .. }) => {
                     if let Some(ref mut code_block) = code_block {
-                        let inner = code_block
-                            .include(
-                                context
-                                    .parent_absolute
-                                    .map(|e| {
-                                        path.map(|p| e.join(PathBuf::from(p).parent().unwrap()))
-                                    })
-                                    .flatten()
-                                    .as_ref(),
-                            )
-                            .unwrap_or(accumulated_block.clone());
-                        let html = code_block.highlight(&inner);
-                        events.push(Event::Html(html.into()));
+                        let maybe_inner = code_block.include(
+                            context
+                                .parent_absolute
+                                .map(|e| path.map(|p| e.join(PathBuf::from(p).parent().unwrap())))
+                                .flatten()
+                                .as_ref(),
+                        );
+                        match maybe_inner {
+                            Ok(i) => {
+                                let inner = i.as_ref().unwrap_or(&accumulated_block);
+                                let html = code_block.highlight(&inner);
+                                events.push(Event::Html(html.into()));
+                            }
+                            Err(e) => {
+                                error = Some(e);
+                                break;
+                            }
+                        }
+
                         accumulated_block.clear();
                     }