Parse more user generated section content, adapt existing changelogs to work correctly (#198)

Which means we can already deal with what's there and now work on
amending information parsed from the commit history, neat.

Author: Byron

cargo-smart-release/src/changelog/parse.rs

@@ -69,14 +69,15 @@ impl ChangeLog {
 
 impl Section {
     fn from_headline_and_body(Headline { level, version, date }: Headline, body: String) -> Self {
-        let mut events = pulldown_cmark::Parser::new(&body).into_offset_iter();
+        let mut events = pulldown_cmark::Parser::new_ext(&body, pulldown_cmark::Options::all()).into_offset_iter();
         let mut unknown = String::new();
         let mut thanks_clippy_count = 0;
         let mut segments = Vec::new();
 
         // let mut user_authored = String::new();
         let mut unknown_range = None;
         while let Some((e, range)) = events.next() {
+            // dbg!(&e, &range);
             match e {
                 Event::Html(text) if text.starts_with(Section::UNKNOWN_TAG_START) => {
                     consume_unknown_range(&mut segments, unknown_range.take(), &body);
@@ -96,11 +97,22 @@ impl Section {
                         Some((Event::Text(title), _range)) if title.starts_with(Section::THANKS_CLIPPY_TITLE) => {
                             State::ParseClippy
                         }
-                        _ => State::ConsiderUserAuthored,
+                        Some((_event, next_range)) => {
+                            update_unknown_range(&mut unknown_range, range);
+                            update_unknown_range(&mut unknown_range, next_range);
+                            State::ConsiderUserAuthored
+                        }
+                        None => State::ConsiderUserAuthored,
                     };
+
                     events
                         .by_ref()
-                        .take_while(|(e, _range)| !matches!(e, Event::End(Tag::Heading(_))))
+                        .take_while(|(e, range)| {
+                            if matches!(state, State::ConsiderUserAuthored) {
+                                update_unknown_range(&mut unknown_range, range.clone());
+                            }
+                            !matches!(e, Event::End(Tag::Heading(_)))
+                        })
                         .count();
                     match state {
                         State::ParseClippy => {
@@ -115,14 +127,7 @@ impl Section {
                         State::ConsiderUserAuthored => {}
                     }
                 }
-                _unknown_event => match &mut unknown_range {
-                    Some(range_thus_far) => {
-                        if range.end > range_thus_far.end {
-                            range_thus_far.end = range.end;
-                        }
-                    }
-                    None => unknown_range = range.into(),
-                },
+                _unknown_event => update_unknown_range(&mut unknown_range, range),
             };
         }
         consume_unknown_range(&mut segments, unknown_range.take(), &body);
@@ -140,6 +145,17 @@ impl Section {
     }
 }
 
+fn update_unknown_range(target: &mut Option<Range<usize>>, source: Range<usize>) {
+    match target {
+        Some(range_thus_far) => {
+            if source.end > range_thus_far.end {
+                range_thus_far.end = source.end;
+            }
+        }
+        None => *target = source.into(),
+    }
+}
+
 fn consume_unknown_range(out: &mut Vec<section::Segment>, range: Option<Range<usize>>, markdown: &str) {
     if let Some(range) = range {
         out.push(section::Segment::Unknown {

cargo-smart-release/tests/changelog/parse.rs

@@ -44,7 +44,7 @@ fn unknown_link_and_headling() {
             heading_level: 4,
             thanks_clippy_count: 0,
             segments: vec![section::Segment::Unknown {
-                text: "Hello [there][194] period.\n".into()
+                text: "##### Special\n\nHello [there][194] period.\n".into()
             }],
             unknown: String::new(),
         },]

git-odb/CHANGELOG.md

@@ -1,8 +1,8 @@
-### 0.21.1 (2021-09-08)
+### v0.21.1 (2021-09-08)
 
 * added `linked::Store::refresh()`
 
-### 0.21.0 (2021-08-27)
+### v0.21.0 (2021-08-27)
 
 - **renames**
    - `compound::Store::find()` -> `compound::Store::try_find()`

git-pack/CHANGELOG.md

@@ -1,15 +1,15 @@
-### 0.11.0 (2021-09-08)
+### v0.11.0 (2021-09-08)
 
 - manual bump for safety as its dependencies have breaking changes
 
-### 0.10.0 (2021-09-07)
+### v0.10.0 (2021-09-07)
 
 - **renames**
    - `data::Object::into_commit_iter()` -> `data::Object::try_into_commit_iter()`
    - `data::Object::into_tree_iter()` -> `data::Object::try_into_tree_iter()`
    - `data::Object::into_tag_iter()` -> `data::Object::try_into_tag_iter()`
 
-### 0.9.0 (2021-08-27)
+### v0.9.0 (2021-08-27)
 
 - **renames / moves / visibility**
    - `find::Find`  and `find::FindExt` only in `Find` and `FindExt` (not in `find` anymore)

git-packetline/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.10.0 (2021-08-27)
+### v0.10.0 (2021-08-27)
 
 #### Breaking
 

git-protocol/CHANGELOG.md

@@ -1,12 +1,12 @@
-### 0.10.1 (2021-08-29)
+### v0.10.1 (2021-08-29)
 
 - instruct docs.rs which features to use for more useful documentation
 
-### 0.10.0 (2021-08-27)
+### v0.10.0 (2021-08-27)
 
 - Various minor updates of pre-release dependencies
 
-### 0.9.0 (2021-08-17)
+### v0.9.0 (2021-08-17)
 
 #### BREAKING
 

git-transport/CHANGELOG.md

@@ -1,7 +1,7 @@
-### 0.11.1 (2021-08-29)
+### v0.11.1 (2021-08-29)
 
 - instruct docs.rs which features to use for more useful documentation
 
-### 0.11.0 (2021-08-27)
+### v0.11.0 (2021-08-27)
 
 - upgrade to the latest git-packetline release