From 3203989cb248a50012bf5135e5f069018ef42029 Mon Sep 17 00:00:00 2001
From: lqdev <liquidev@tutanota.com>
Date: Fri, 18 Aug 2023 20:44:27 +0200
Subject: [PATCH] add support for multiple <p>s in one block

---
 content/tree/root.tree              | 15 ++++++++
 crates/treehouse-format/src/lib.rs  |  3 ++
 crates/treehouse-format/src/pull.rs | 54 +++++++++++++++++++++--------
 crates/treehouse/src/html/tree.rs   |  1 -
 4 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/content/tree/root.tree b/content/tree/root.tree
index 3e8c386..f08b281 100644
--- a/content/tree/root.tree
+++ b/content/tree/root.tree
@@ -1,3 +1,5 @@
+% always_expanded = true
+  id = "treehouse"
 - # treehouse
 
     - welcome to the treehouse!
@@ -98,3 +100,16 @@
         - expanded
         <svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><line x1="4" y1="8" x2="12" y2="8" stroke="currentColor" stroke-width="2"/></svg>
 
+    + some tests for multiple ps in one block
+
+        - here's a test for multiple paragraphs in one block
+
+        this should be working fine
+
+        - and this shouldn't be breaking yeah
+
+        - nor should
+
+        this be
+
+            - breaking
diff --git a/crates/treehouse-format/src/lib.rs b/crates/treehouse-format/src/lib.rs
index 62dde31..9cb4927 100644
--- a/crates/treehouse-format/src/lib.rs
+++ b/crates/treehouse-format/src/lib.rs
@@ -10,6 +10,9 @@ pub enum ParseErrorKind {
 
     #[error("root branches must not be indented")]
     RootIndentLevel,
+
+    #[error("at least {expected} spaces of indentation were expected, but got {got}")]
+    InconsistentIndentation { got: usize, expected: usize },
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
diff --git a/crates/treehouse-format/src/pull.rs b/crates/treehouse-format/src/pull.rs
index 6400208..e5e273d 100644
--- a/crates/treehouse-format/src/pull.rs
+++ b/crates/treehouse-format/src/pull.rs
@@ -1,4 +1,4 @@
-use std::ops::Range;
+use std::{convert::identity, ops::Range};
 
 use crate::{ParseError, ParseErrorKind};
 
@@ -22,10 +22,10 @@ impl BranchKind {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct BranchEvent {
     pub indent_level: usize,
-    pub attributes: Range<usize>,
     pub kind: BranchKind,
     pub kind_span: Range<usize>,
     pub content: Range<usize>,
+    pub attributes: Range<usize>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -52,8 +52,8 @@ impl<'a> Parser<'a> {
         count
     }
 
-    fn eat_until(&mut self, c: char) {
-        while self.current() != Some(c) {
+    fn eat_until(&mut self, cond: impl Fn(char) -> bool) {
+        while self.current().map(&cond).is_some_and(|x| !x) {
             self.advance();
         }
         self.advance();
@@ -66,6 +66,30 @@ impl<'a> Parser<'a> {
         indent_level
     }
 
+    fn eat_indented_lines_until(
+        &mut self,
+        indent_level: usize,
+        cond: impl Fn(char) -> bool,
+    ) -> Result<(), ParseError> {
+        loop {
+            self.eat_until(|c| c == '\n');
+            let before_indentation = self.position;
+            let line_indent_level = self.eat_as_long_as(' ');
+            let after_indentation = self.position;
+            if self.current().map(&cond).is_some_and(identity) || self.current().is_none() {
+                self.position = before_indentation;
+                break;
+            } else if !matches!(self.current(), Some('\n')) && line_indent_level < indent_level {
+                return Err(ParseErrorKind::InconsistentIndentation {
+                    got: line_indent_level,
+                    expected: indent_level,
+                }
+                .at(before_indentation..after_indentation));
+            }
+        }
+        Ok(())
+    }
+
     pub fn next_branch(&mut self) -> Result<Option<BranchEvent>, ParseError> {
         if self.current().is_none() {
             return Ok(None);
@@ -73,9 +97,15 @@ impl<'a> Parser<'a> {
 
         let indent_level = self.eat_as_long_as(' ');
 
-        // TODO: Configs
-        let config_start = self.position;
-        let config_end = self.position;
+        let attributes = if self.current() == Some('%') {
+            let start = self.position;
+            self.advance();
+            self.eat_indented_lines_until(indent_level, |c| c == '-' || c == '+')?;
+            let end = self.position;
+            start..end
+        } else {
+            self.position..self.position
+        };
 
         let kind_start = self.position;
         let kind = match self.current() {
@@ -87,18 +117,12 @@ impl<'a> Parser<'a> {
         let kind_end = self.position;
 
         let content_start = self.position;
-        loop {
-            self.eat_until('\n');
-            if let Some('\n') | None = self.current() {
-                self.advance();
-                break;
-            }
-        }
+        self.eat_indented_lines_until(indent_level, |c| c == '-' || c == '+' || c == '%')?;
         let content_end = self.position;
 
         Ok(Some(BranchEvent {
             indent_level,
-            attributes: config_start..config_end,
+            attributes,
             kind,
             kind_span: kind_start..kind_end,
             content: content_start..content_end,
diff --git a/crates/treehouse/src/html/tree.rs b/crates/treehouse/src/html/tree.rs
index 9e9c2ef..62d56cb 100644
--- a/crates/treehouse/src/html/tree.rs
+++ b/crates/treehouse/src/html/tree.rs
@@ -30,7 +30,6 @@ pub fn branch_to_html(s: &mut String, branch: &Branch, source: &str) {
                 }
             }
 
-            dbg!(&line[space_count..]);
             unindented_block_content.push_str(&line[space_count..]);
             unindented_block_content.push('\n');
         }