bq

tests

accept para after bq

Author: commonquail

src/commitmsgfmt.rs

@@ -28,7 +28,8 @@ impl CommitMsgFmt {
         let mut buf = String::new();
         for tok in msg {
             match *tok {
-                Comment(ref s) | Literal(ref s) | Scissored(ref s) | Trailer(ref s) => {
+                BlockQuote(ref s) | Comment(ref s) | Literal(ref s) | Scissored(ref s)
+                | Trailer(ref s) => {
                     buf.push_str(s);
                 }
                 ListItem(ref indent, ref li, ref s) => {
@@ -207,6 +208,70 @@ foo
         assert_eq!(filter(72, &input), expected);
     }
 
+    #[test]
+    fn preserves_block_quote() {
+        let input = "
+foo
+
+> block quote
+paragraph
+";
+
+        let expected = input;
+
+        assert_eq!(filter(72, &input), expected);
+    }
+
+    #[test]
+    fn preserves_block_quote_with_attribution() {
+        let input = "
+foo
+
+author wrote:
+> block quote
+paragraph
+";
+
+        let expected = input;
+
+        assert_eq!(filter(72, &input), expected);
+    }
+
+    #[test]
+    fn parses_block_quote_with_preceding_attribution_as_unspaced_paragraph_and_literal() {
+        let input = "
+xxx xxxx xxxxx xxxxxxxx xxx xxxx xxxxxxxxxxxxxxxx xxxxx
+
+xxxxxxx xxxxxxxxx xxxxxxxx xxx xxxxxxxxxx
+> xxxxxxx xxx xxxx xxxxxx xx xxx xxxxxxxxx xxxxx xxx xxxx xxxx
+> xxxx xxxxxxx xxxx xxx xxxxxxxxx
+>
+> xx xxxxx xxxxxxx xxxxxxx xxxxxxxx xxxxxxx xxxxxx xx
+> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx xx
+> xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxx xxxxx
+> xxxxxxxxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxx xxx
+>
+> xxxx xxxx xxxxxxxx xxxx xxx xxxxxxxx x xxxxxx xx xxxxx
+>
+> xxxxxxxxx xxx xxxx xxxx xxxxxxxxxxxxx
+> xxx xxxxxxxx xxxx xxxx xx xxx xxxx xx xxx xxxx xxxx xxxxxxxxxxx
+> xxx xxxx xxxx xxxx
+> x xxxxxxx xxx xxxxx xxxx xx xxxx xxxxx
+> xx xxxxxxxxxx xx xxx xxxxxxxx xxxx xx xxx xxxx
+> xx xxxxxxx xxxx
+> xx xxxxxx xx xxxx
+> x xxxx xxxxxxxx x xxxxxx
+
+xxxxx xxxx xxx xxxxxxxx xxx xxxx x xxxxxxx xx xx xxxxxxxxxxx
+xxxxx xxxxxxxx xx xxx xxx xx xxxxxxxx xxx xxxx xxxx xxx
+xxxxxxxxx xxxxxxxxxxx xx xxxxxx
+";
+
+        let expected = input;
+
+        assert_eq!(filter(60, &input), expected);
+    }
+
     #[test]
     fn formats_footnotes() {
         let msg = "

src/parser.rs

@@ -17,6 +17,7 @@ pub enum Token<'input> {
     Subject(String),
     Scissored(&'input str),
     Trailer(&'input str),
+    BlockQuote(&'input str),
     VerticalSpace,
 }
 
@@ -83,7 +84,13 @@ pub fn parse(input: &str, comment_char: char) -> Vec<Token> {
             toks.push(Token::Trailer(line));
         } else if let Some(y) = match toks.last_mut() {
             Some(&mut Token::Footnote(_, ref mut b)) => extend_prose_buffer_with_line(b, line),
-            Some(&mut Token::Paragraph(ref mut b)) => extend_prose_buffer_with_line(b, line),
+            Some(&mut Token::Paragraph(ref mut b)) => {
+                if is_line_block_quote(line) {
+                    Some(Token::BlockQuote(line))
+                } else {
+                    extend_prose_buffer_with_line(b, line)
+                }
+            }
             Some(&mut Token::ListItem(_, _, ref mut b)) => {
                 if list_item.is_match(line) {
                     Some(list_item_from_line(&list_item, line))
@@ -96,6 +103,8 @@ pub fn parse(input: &str, comment_char: char) -> Vec<Token> {
                     Some(list_item_from_line(&list_item, line))
                 } else if is_line_indented(line) {
                     Some(Token::Literal(line))
+                } else if is_line_block_quote(line) {
+                    Some(Token::BlockQuote(line))
                 } else {
                     px = false;
                     Some(Token::Paragraph(line.trim().to_owned()))
@@ -209,6 +218,10 @@ fn is_line_footnote(line: &str) -> bool {
     false
 }
 
+fn is_line_block_quote(line: &str) -> bool {
+    line.starts_with('>')
+}
+
 #[cfg(test)]
 mod tests {
     use super::Token::*;
@@ -513,6 +526,113 @@ some other paragraph
         );
     }
 
+    #[test]
+    fn parses_block_quote_verbatim() {
+        assert_eq!(
+            parse(
+                "
+some subject
+
+some paragraph
+
+> some block quote
+
+some other paragraph
+"
+            ),
+            [
+                VerticalSpace,
+                Subject("some subject".to_owned()),
+                VerticalSpace,
+                Paragraph("some paragraph".to_owned()),
+                VerticalSpace,
+                BlockQuote("> some block quote"),
+                VerticalSpace,
+                Paragraph("some other paragraph".to_owned()),
+            ],
+        );
+    }
+
+    #[test]
+    fn parses_nested_block_quotes_verbatim() {
+        assert_eq!(
+            parse(
+                "
+some subject
+
+some paragraph
+
+> > some block quote
+
+some other paragraph
+"
+            ),
+            [
+                VerticalSpace,
+                Subject("some subject".to_owned()),
+                VerticalSpace,
+                Paragraph("some paragraph".to_owned()),
+                VerticalSpace,
+                BlockQuote("> > some block quote"),
+                VerticalSpace,
+                Paragraph("some other paragraph".to_owned()),
+            ],
+        );
+    }
+
+    #[test]
+    fn parses_nested_block_quotes_ignoring_quote_marker_spacing_and_quote_levels() {
+        assert_eq!(
+            parse(
+                "
+some subject
+
+some paragraph
+
+>>>> >>> >> some block quote
+
+some other paragraph
+"
+            ),
+            [
+                VerticalSpace,
+                Subject("some subject".to_owned()),
+                VerticalSpace,
+                Paragraph("some paragraph".to_owned()),
+                VerticalSpace,
+                BlockQuote(">>>> >>> >> some block quote"),
+                VerticalSpace,
+                Paragraph("some other paragraph".to_owned()),
+            ],
+        );
+    }
+
+    #[test]
+    fn parses_block_quote_with_immediately_preceding_paragraph_as_attribution_leaving_no_vertical_space(
+    ) {
+        assert_eq!(
+            parse(
+                "
+some subject
+
+some attribution paragraph
+> some block quote
+
+some other paragraph
+"
+            ),
+            [
+                VerticalSpace,
+                Subject("some subject".to_owned()),
+                VerticalSpace,
+                Paragraph("some attribution paragraph".to_owned()),
+                BlockQuote("> some block quote"),
+                VerticalSpace,
+                Paragraph("some other paragraph".to_owned()),
+            ],
+        );
+    }
+
     #[test]
     fn parses_trailers() {
         // Trailers look like HTTP or email headers but are not formally