From 8f9c7c6cf112e44f64b3dfbcd012e6550d8883e5 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Thu, 14 Jul 2022 20:00:00 +0200
Subject: Fix two more list bugs

---
 src/compiler.rs       | 2 +-
 src/construct/list.rs | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/compiler.rs b/src/compiler.rs
index 51c7e2b..fc0f986 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -1239,7 +1239,7 @@ fn on_enter_list(context: &mut CompileContext) {
                     false
                 };
 
-                if !at_marker && (!at_list_item || !at_empty_list_item) {
+                if !at_marker && !at_list_item && !at_empty_list_item {
                     loose = true;
                     break;
                 }
diff --git a/src/construct/list.rs b/src/construct/list.rs
index 6614122..2fe46b0 100644
--- a/src/construct/list.rs
+++ b/src/construct/list.rs
@@ -345,7 +345,12 @@ pub fn resolve(tokenizer: &mut Tokenizer) -> Vec<Event> {
                         && skip::opt(
                             &tokenizer.events,
                             previous.3 + 1,
-                            &[Token::SpaceOrTab, Token::LineEnding, Token::BlankLineEnding],
+                            &[
+                                Token::SpaceOrTab,
+                                Token::LineEnding,
+                                Token::BlankLineEnding,
+                                Token::BlockQuotePrefix,
+                            ],
                         ) == current.2
                     {
                         println!("prev:match {:?} {:?}", previous, current);
-- 
cgit