fix regression

Author: cscheid

crates/quarto-markdown-pandoc/src/pandoc/treesitter_utils/editorial_marks.rs

@@ -7,12 +7,15 @@
  */
 
 use crate::pandoc::ast_context::ASTContext;
-use crate::pandoc::inline::{Delete, EditComment, Highlight, Inline, Insert, Inlines};
-use crate::pandoc::location::node_source_info_with_context;
+use crate::pandoc::inline::{Delete, EditComment, Highlight, Inline, Inlines, Insert, Space, Str};
+use crate::pandoc::location::{SourceInfo, node_source_info_with_context};
+use once_cell::sync::Lazy;
+use regex::Regex;
 use std::collections::HashMap;
 use std::io::Write;
 
 use super::pandocnativeintermediate::PandocNativeIntermediate;
+use super::text_helpers::apply_smart_quotes;
 
 macro_rules! process_editorial_mark {
     ($struct_name:ident) => {
@@ -23,6 +26,7 @@ macro_rules! process_editorial_mark {
                 children: Vec<(String, PandocNativeIntermediate)>,
                 context: &ASTContext,
             ) -> PandocNativeIntermediate {
+                let whitespace_re: Lazy<Regex> = Lazy::new(|| Regex::new(r"\s+").unwrap());
                 let mut attr = ("".to_string(), vec![], HashMap::new());
                 let mut content: Inlines = vec![];
 
@@ -37,6 +41,32 @@ macro_rules! process_editorial_mark {
                         PandocNativeIntermediate::IntermediateInlines(mut inlines) => {
                             content.append(&mut inlines);
                         }
+                        PandocNativeIntermediate::IntermediateBaseText(text, range) => {
+                            if let Some(_) = whitespace_re.find(&text) {
+                                content.push(Inline::Space(Space {
+                                    source_info: SourceInfo::new(
+                                        if context.filenames.is_empty() {
+                                            None
+                                        } else {
+                                            Some(0)
+                                        },
+                                        range,
+                                    ),
+                                }))
+                            } else {
+                                content.push(Inline::Str(Str {
+                                    text: apply_smart_quotes(text),
+                                    source_info: SourceInfo::new(
+                                        if context.filenames.is_empty() {
+                                            None
+                                        } else {
+                                            Some(0)
+                                        },
+                                        range,
+                                    ),
+                                }))
+                            }
+                        }
                         PandocNativeIntermediate::IntermediateUnknown(_) => {
                             // Skip unknown nodes (delimiters, etc.)
                         }

crates/quarto-markdown-pandoc/src/pandoc/treesitter_utils/postprocess.rs

@@ -399,11 +399,7 @@ pub fn postprocess(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
                 classes.extend(insert.attr.1);
                 FilterResult(
                     vec![Inline::Span(Span {
-                        attr: (
-                            insert.attr.0,
-                            classes,
-                            insert.attr.2,
-                        ),
+                        attr: (insert.attr.0, classes, insert.attr.2),
                         content,
                         source_info: empty_source_info(),
                     })],
@@ -416,11 +412,7 @@ pub fn postprocess(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
                 classes.extend(delete.attr.1);
                 FilterResult(
                     vec![Inline::Span(Span {
-                        attr: (
-                            delete.attr.0,
-                            classes,
-                            delete.attr.2,
-                        ),
+                        attr: (delete.attr.0, classes, delete.attr.2),
                         content,
                         source_info: empty_source_info(),
                     })],
@@ -433,11 +425,7 @@ pub fn postprocess(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
                 classes.extend(highlight.attr.1);
                 FilterResult(
                     vec![Inline::Span(Span {
-                        attr: (
-                            highlight.attr.0,
-                            classes,
-                            highlight.attr.2,
-                        ),
+                        attr: (highlight.attr.0, classes, highlight.attr.2),
                         content,
                         source_info: empty_source_info(),
                     })],
@@ -450,11 +438,7 @@ pub fn postprocess(doc: Pandoc) -> Result<Pandoc, Vec<String>> {
                 classes.extend(edit_comment.attr.1);
                 FilterResult(
                     vec![Inline::Span(Span {
-                        attr: (
-                            edit_comment.attr.0,
-                            classes,
-                            edit_comment.attr.2,
-                        ),
+                        attr: (edit_comment.attr.0, classes, edit_comment.attr.2),
                         content,
                         source_info: empty_source_info(),
                     })],