Merge pull request #1637 from notriddle/no-headers

ehuss · web-flow · commit 9634798eb708 · 2021-09-03T10:10:07.000-07:00
Include chapters with no headers in the search index
diff --git a/src/renderer/html_handlebars/search.rs b/src/renderer/html_handlebars/search.rs
@@ -165,7 +165,12 @@ fn render_item(
         }
     }
 
-    if !heading.is_empty() {
+    if !body.is_empty() || !heading.is_empty() {
+        if heading.is_empty() {
+            if let Some(chapter) = breadcrumbs.first() {
+                heading = chapter.clone();
+            }
+        }
         // Make sure the last section is added to the index
         add_doc(
             index,
diff --git a/tests/dummy_book/src/SUMMARY.md b/tests/dummy_book/src/SUMMARY.md
@@ -12,6 +12,7 @@
     - [Recursive](first/recursive.md)
     - [Markdown](first/markdown.md)
     - [Unicode](first/unicode.md)
+    - [No Headers](first/no-headers.md)
 - [Second Chapter](second.md)
     - [Nested Chapter](second/nested.md)
 
diff --git a/tests/dummy_book/src/first/no-headers.md b/tests/dummy_book/src/first/no-headers.md
@@ -0,0 +1,3 @@
+Capybara capybara capybara.
+
+Capybara capybara capybara.
diff --git a/tests/rendered_output.rs b/tests/rendered_output.rs
@@ -34,6 +34,7 @@ const TOC_SECOND_LEVEL: &[&str] = &[
     "1.3. Recursive",
     "1.4. Markdown",
     "1.5. Unicode",
+    "1.6. No Headers",
     "2.1. Nested Chapter",
 ];
 
@@ -631,6 +632,7 @@ mod search {
         let introduction = get_doc_ref("intro.html#introduction");
         let some_section = get_doc_ref("first/index.html#some-section");
         let summary = get_doc_ref("first/includes.html#summary");
+        let no_headers = get_doc_ref("first/no-headers.html");
         let conclusion = get_doc_ref("conclusion.html#conclusion");
 
         let bodyidx = &index["index"]["index"]["body"]["root"];
@@ -644,13 +646,21 @@ mod search {
         assert_eq!(docs[&some_section]["body"], "");
         assert_eq!(
             docs[&summary]["body"],
-            "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode Second Chapter Nested Chapter Conclusion"
+            "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Second Chapter Nested Chapter Conclusion"
         );
         assert_eq!(
             docs[&summary]["breadcrumbs"],
             "First Chapter » Includes » Summary"
         );
         assert_eq!(docs[&conclusion]["body"], "I put &lt;HTML&gt; in here!");
+        assert_eq!(
+            docs[&no_headers]["breadcrumbs"],
+            "First Chapter » No Headers"
+        );
+        assert_eq!(
+            docs[&no_headers]["body"],
+            "Capybara capybara capybara. Capybara capybara capybara."
+        );
     }
 
     // Setting this to `true` may cause issues with `cargo watch`,
diff --git a/tests/searchindex_fixture.json b/tests/searchindex_fixture.json

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,12 @@ fn render_item(`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`- if !heading.is_empty() {`
	`168`	`+ if !body.is_empty() \|\| !heading.is_empty() {`
	`169`	`+ if heading.is_empty() {`
	`170`	`+ if let Some(chapter) = breadcrumbs.first() {`
	`171`	`+ heading = chapter.clone();`
	`172`	`+ }`
	`173`	`+ }`
`169`	`174`	`// Make sure the last section is added to the index`
`170`	`175`	`add_doc(`
`171`	`176`	`index,`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Capybara capybara capybara.`
	`2`	`+`
	`3`	`+Capybara capybara capybara.`