From 0c45c04fbbea1cc8de15fdec07a68333f9948658 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Fri, 9 Sep 2022 11:07:31 +0200
Subject: Fix to allow blank lines in mdx jsx (flow)

---
 src/construct/partial_mdx_jsx.rs | 66 ++++++++++++++--------------------------
 src/state.rs                     |  6 ----
 2 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/src/construct/partial_mdx_jsx.rs b/src/construct/partial_mdx_jsx.rs
index 2daa448..b85fb50 100644
--- a/src/construct/partial_mdx_jsx.rs
+++ b/src/construct/partial_mdx_jsx.rs
@@ -986,7 +986,12 @@ pub fn tag_end(tokenizer: &mut Tokenizer) -> State {
 /// ```
 pub fn es_whitespace_start(tokenizer: &mut Tokenizer) -> State {
     match tokenizer.current {
-        Some(b'\n') => State::Retry(StateName::MdxJsxEsWhitespaceEol),
+        Some(b'\n') => {
+            tokenizer.enter(Name::LineEnding);
+            tokenizer.consume();
+            tokenizer.exit(Name::LineEnding);
+            State::Next(StateName::MdxJsxEsWhitespaceEolAfter)
+        }
         _ => {
             if kind_after_index(tokenizer.parse_state.bytes, tokenizer.point.index)
                 == CharacterKind::Whitespace
@@ -1010,7 +1015,10 @@ pub fn es_whitespace_inside(tokenizer: &mut Tokenizer) -> State {
     match tokenizer.current {
         Some(b'\n') => {
             tokenizer.exit(Name::MdxJsxEsWhitespace);
-            State::Retry(StateName::MdxJsxEsWhitespaceEol)
+            tokenizer.enter(Name::LineEnding);
+            tokenizer.consume();
+            tokenizer.exit(Name::LineEnding);
+            State::Next(StateName::MdxJsxEsWhitespaceEolAfter)
         }
         // Allow continuation bytes.
         Some(0x80..=0xBF) => {
@@ -1031,51 +1039,21 @@ pub fn es_whitespace_inside(tokenizer: &mut Tokenizer) -> State {
     }
 }
 
-pub fn es_whitespace_eol(tokenizer: &mut Tokenizer) -> State {
-    match tokenizer.current {
-        Some(b'\n') => {
-            tokenizer.enter(Name::LineEnding);
-            tokenizer.consume();
-            tokenizer.exit(Name::LineEnding);
-            State::Next(StateName::MdxJsxEsWhitespaceEolAfter)
-        }
-        _ => State::Ok,
-    }
-}
-
+/// After eol in whitespace.
+///
+/// ```markdown
+/// > | a <a\nb> c
+///          ^
+/// ```
 pub fn es_whitespace_eol_after(tokenizer: &mut Tokenizer) -> State {
+    // Lazy continuation in a flow tag is a syntax error.
     if tokenizer.tokenize_state.token_1 == Name::MdxJsxFlowTag && tokenizer.lazy {
-        crash_lazy(tokenizer)
-    } else if kind_after_index(tokenizer.parse_state.bytes, tokenizer.point.index)
-        == CharacterKind::Whitespace
-    {
-        tokenizer.enter(Name::MdxJsxEsWhitespace);
-        State::Retry(StateName::MdxJsxEsWhitespaceEolAfterInside)
+        State::Error(format!(
+            "{}:{}: Unexpected lazy line in container, expected line to be prefixed with `>` when in a block quote, whitespace when in a list, etc",
+            tokenizer.point.line, tokenizer.point.column
+        ))
     } else {
-        State::Ok
-    }
-}
-
-pub fn es_whitespace_eol_after_inside(tokenizer: &mut Tokenizer) -> State {
-    match tokenizer.current {
-        // Not allowed.
-        Some(b'\n') => State::Nok,
-        // Allow continuation bytes.
-        Some(0x80..=0xBF) => {
-            tokenizer.consume();
-            State::Next(StateName::MdxJsxEsWhitespaceEolAfterInside)
-        }
-        _ => {
-            if kind_after_index(tokenizer.parse_state.bytes, tokenizer.point.index)
-                == CharacterKind::Whitespace
-            {
-                tokenizer.consume();
-                State::Next(StateName::MdxJsxEsWhitespaceEolAfterInside)
-            } else {
-                tokenizer.exit(Name::MdxJsxEsWhitespace);
-                State::Ok
-            }
-        }
+        State::Retry(StateName::MdxJsxEsWhitespaceStart)
     }
 }
 
diff --git a/src/state.rs b/src/state.rs
index 4201f5c..db03a90 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -369,9 +369,7 @@ pub enum Name {
     MdxJsxTextNok,
     MdxJsxEsWhitespaceStart,
     MdxJsxEsWhitespaceInside,
-    MdxJsxEsWhitespaceEol,
     MdxJsxEsWhitespaceEolAfter,
-    MdxJsxEsWhitespaceEolAfterInside,
     MdxJsxStart,
     MdxJsxStartAfter,
     MdxJsxNameBefore,
@@ -858,11 +856,7 @@ pub fn call(tokenizer: &mut Tokenizer, name: Name) -> State {
         Name::MdxJsxAttributeValueQuoted => construct::partial_mdx_jsx::attribute_value_quoted,
         Name::MdxJsxEsWhitespaceStart => construct::partial_mdx_jsx::es_whitespace_start,
         Name::MdxJsxEsWhitespaceInside => construct::partial_mdx_jsx::es_whitespace_inside,
-        Name::MdxJsxEsWhitespaceEol => construct::partial_mdx_jsx::es_whitespace_eol,
         Name::MdxJsxEsWhitespaceEolAfter => construct::partial_mdx_jsx::es_whitespace_eol_after,
-        Name::MdxJsxEsWhitespaceEolAfterInside => {
-            construct::partial_mdx_jsx::es_whitespace_eol_after_inside
-        }
 
         Name::NonLazyContinuationStart => construct::partial_non_lazy_continuation::start,
         Name::NonLazyContinuationAfter => construct::partial_non_lazy_continuation::after,
-- 
cgit