From aac3afcba8ee9b3692f784c78626aa0596aaf612 Mon Sep 17 00:00:00 2001
From: Martin Haug <mhaug@live.de>
Date: Mon, 21 Feb 2022 13:48:21 +0100
Subject: Remove `Parbreak` as a `NodeKind`

---
 src/parse/incremental.rs | 5 ++---
 src/parse/mod.rs         | 6 +-----
 src/parse/parser.rs      | 7 -------
 3 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/parse')

diff --git a/src/parse/incremental.rs b/src/parse/incremental.rs
index 7418dd58..bb5288dc 100644
--- a/src/parse/incremental.rs
+++ b/src/parse/incremental.rs
@@ -138,7 +138,7 @@ impl Reparser<'_> {
 
             // Similarly to above, the end of the edit must be in the
             // reconsidered range. However, in markup mode, we need to extend
-            // the reconsidered range by up to two nodes so that spaceing etc.
+            // the reconsidered range by up to two nodes so that spacing etc.
             // results in the same tree.
             //
             // Therefore, there are two cases:
@@ -400,7 +400,7 @@ fn validate(
 
             let mut right_pos = newborn_span.end;
             for child in &superseded[superseded_range.end ..] {
-                if child.kind().is_trivia() || child.kind() == &NodeKind::Parbreak {
+                if child.kind().is_trivia() {
                     right_pos += child.len();
                     continue;
                 }
@@ -451,7 +451,6 @@ impl NodeKind {
         match self {
             // These are all replaceable by other tokens.
             Self::Linebreak
-            | Self::Parbreak
             | Self::Text(_)
             | Self::TextInLine(_)
             | Self::NonBreakingSpace
diff --git a/src/parse/mod.rs b/src/parse/mod.rs
index c14c45cf..bd217c1c 100644
--- a/src/parse/mod.rs
+++ b/src/parse/mod.rs
@@ -172,11 +172,7 @@ fn markup_node(p: &mut Parser, at_start: &mut bool) {
         // Whitespace.
         NodeKind::Space(newlines) => {
             *at_start |= *newlines > 0;
-            if *newlines < 2 {
-                p.eat();
-            } else {
-                p.convert(NodeKind::Parbreak);
-            }
+            p.eat();
             return;
         }
 
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
index e495dbd0..545f6fd4 100644
--- a/src/parse/parser.rs
+++ b/src/parse/parser.rs
@@ -176,13 +176,6 @@ impl<'s> Parser<'s> {
         }
     }
 
-    /// Eat the current token, but change its type.
-    pub fn convert(&mut self, kind: NodeKind) {
-        let marker = self.marker();
-        self.eat();
-        marker.convert(self, kind);
-    }
-
     /// Whether the current token is of the given type.
     pub fn at(&self, kind: &NodeKind) -> bool {
         self.peek() == Some(kind)
-- 
cgit v1.2.3