feat: reduce nesting of InlineContent when possible

unimarkup · Aug 1, 2022 · 7946da0 · 7946da0
1 parent cf58e5c
commit 7946da0
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/inline/src/inlines/mod.rs b/inline/src/inlines/mod.rs
@@ -85,12 +85,39 @@ impl Inline {
     /// [`Inline`]: self::Inline
     /// [`TokenKind`]: crate::TokenKind
     /// [`InlineContent`]: self::content::InlineContent
-    pub fn new(content: InlineContent<PlainContent, NestedContent>, kind: TokenKind) -> Self {
+    pub fn new(mut content: InlineContent<PlainContent, NestedContent>, kind: TokenKind) -> Self {
         let consume_as_plain = |content| match content {
             InlineContent::Plain(plain_content) => Self::Plain(plain_content),
             InlineContent::Nested(nested_content) => Self::Multiple(nested_content),
         };
 
+        let is_plain = matches!(
+            kind,
+            TokenKind::Verbatim
+                | TokenKind::Newline
+                | TokenKind::EndOfLine
+                | TokenKind::Whitespace
+                | TokenKind::Plain
+                | TokenKind::UnderlineSubscript
+                | TokenKind::ItalicBold
+                | TokenKind::CloseParens
+                | TokenKind::CloseBracket
+                | TokenKind::CloseBrace
+        );
+
+        if !is_plain {
+            let span = content.span();
+            // try to flatten content more
+            if let InlineContent::Nested(ref mut nested) = content {
+                if nested.content.len() == 1 {
+                    if let Inline::Multiple(ref mut nested) = nested.content[0] {
+                        content = InlineContent::Nested(std::mem::take(nested));
+                        content.set_span(span);
+                    }
+                }
+            }
+        }
+
         match kind {
             TokenKind::Bold => Self::Bold(content.into()),
             TokenKind::Italic => Self::Italic(content.into()),