Remove the SetSource trait.
It was only being used for creating paragraphs of specific text, so I just adjusted the of_text function to handle it.
This commit is contained in:
parent
f47d688be4
commit
5e2dea1f28
@ -15,10 +15,8 @@ use crate::context::RefContext;
|
|||||||
use crate::error::CustomError;
|
use crate::error::CustomError;
|
||||||
use crate::error::Res;
|
use crate::error::Res;
|
||||||
use crate::parser::macros::element;
|
use crate::parser::macros::element;
|
||||||
use crate::types::AffiliatedKeywords;
|
|
||||||
use crate::types::Object;
|
use crate::types::Object;
|
||||||
use crate::types::Paragraph;
|
use crate::types::Paragraph;
|
||||||
use crate::types::PlainText;
|
|
||||||
|
|
||||||
#[cfg_attr(
|
#[cfg_attr(
|
||||||
feature = "tracing",
|
feature = "tracing",
|
||||||
@ -80,13 +78,10 @@ pub(crate) fn broken_end<'b, 'g, 'r, 's>(
|
|||||||
|
|
||||||
Ok((
|
Ok((
|
||||||
remaining,
|
remaining,
|
||||||
Paragraph {
|
Paragraph::of_text(
|
||||||
source: input.get_until(remaining).into(),
|
input.get_until(remaining).into(),
|
||||||
affiliated_keywords: AffiliatedKeywords::default(),
|
input.get_until(lead_in_remaining).into(),
|
||||||
children: vec![Object::PlainText(PlainText {
|
),
|
||||||
source: input.get_until(lead_in_remaining).into(),
|
|
||||||
})],
|
|
||||||
},
|
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -139,13 +134,10 @@ pub(crate) fn broken_dynamic_block<'b, 'g, 'r, 's>(
|
|||||||
|
|
||||||
Ok((
|
Ok((
|
||||||
remaining,
|
remaining,
|
||||||
Paragraph {
|
Paragraph::of_text(
|
||||||
source: input.get_until(remaining).into(),
|
input.get_until(remaining).into(),
|
||||||
affiliated_keywords: AffiliatedKeywords::default(),
|
input.get_until(lead_in_remaining).into(),
|
||||||
children: vec![Object::PlainText(PlainText {
|
),
|
||||||
source: input.get_until(lead_in_remaining).into(),
|
|
||||||
})],
|
|
||||||
},
|
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,6 @@ use crate::types::Drawer;
|
|||||||
use crate::types::Element;
|
use crate::types::Element;
|
||||||
use crate::types::Keyword;
|
use crate::types::Keyword;
|
||||||
use crate::types::Paragraph;
|
use crate::types::Paragraph;
|
||||||
use crate::types::SetSource;
|
|
||||||
|
|
||||||
#[cfg_attr(
|
#[cfg_attr(
|
||||||
feature = "tracing",
|
feature = "tracing",
|
||||||
@ -81,9 +80,8 @@ where
|
|||||||
))(remaining)
|
))(remaining)
|
||||||
{
|
{
|
||||||
Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
|
Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
|
||||||
let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
|
|
||||||
let source = get_consumed(remaining, remain);
|
let source = get_consumed(remaining, remain);
|
||||||
element.set_source(source.into());
|
let element = Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()));
|
||||||
(remain, vec![element])
|
(remain, vec![element])
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
|
@ -37,7 +37,6 @@ use crate::types::DynamicBlock;
|
|||||||
use crate::types::Element;
|
use crate::types::Element;
|
||||||
use crate::types::Keyword;
|
use crate::types::Keyword;
|
||||||
use crate::types::Paragraph;
|
use crate::types::Paragraph;
|
||||||
use crate::types::SetSource;
|
|
||||||
|
|
||||||
#[cfg_attr(
|
#[cfg_attr(
|
||||||
feature = "tracing",
|
feature = "tracing",
|
||||||
@ -88,9 +87,7 @@ where
|
|||||||
))))(remaining)?;
|
))))(remaining)?;
|
||||||
let leading_blank_lines =
|
let leading_blank_lines =
|
||||||
leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
|
leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
|
||||||
let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
|
Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()))
|
||||||
element.set_source(source.into());
|
|
||||||
element
|
|
||||||
});
|
});
|
||||||
let (remaining, (mut children, _exit_contents)) =
|
let (remaining, (mut children, _exit_contents)) =
|
||||||
many_till(element_matcher, exit_matcher)(remaining)?;
|
many_till(element_matcher, exit_matcher)(remaining)?;
|
||||||
|
@ -39,7 +39,6 @@ use crate::types::Element;
|
|||||||
use crate::types::Keyword;
|
use crate::types::Keyword;
|
||||||
use crate::types::Paragraph;
|
use crate::types::Paragraph;
|
||||||
use crate::types::QuoteBlock;
|
use crate::types::QuoteBlock;
|
||||||
use crate::types::SetSource;
|
|
||||||
use crate::types::SpecialBlock;
|
use crate::types::SpecialBlock;
|
||||||
|
|
||||||
#[cfg_attr(
|
#[cfg_attr(
|
||||||
@ -257,9 +256,7 @@ fn greater_block_body<'c, 'b, 'g, 'r, 's>(
|
|||||||
))))(remaining)?;
|
))))(remaining)?;
|
||||||
let leading_blank_lines =
|
let leading_blank_lines =
|
||||||
leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
|
leading_blank_lines.map(|(source, (first_line, _remaining_lines))| {
|
||||||
let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
|
Element::Paragraph(Paragraph::of_text(source.into(), first_line.into()))
|
||||||
element.set_source(source.into());
|
|
||||||
element
|
|
||||||
});
|
});
|
||||||
let (remaining, (mut children, _exit_contents)) =
|
let (remaining, (mut children, _exit_contents)) =
|
||||||
many_till(element_matcher, exit_matcher)(remaining)?;
|
many_till(element_matcher, exit_matcher)(remaining)?;
|
||||||
|
@ -22,7 +22,6 @@ use super::CenterBlock;
|
|||||||
use super::Drawer;
|
use super::Drawer;
|
||||||
use super::GetStandardProperties;
|
use super::GetStandardProperties;
|
||||||
use super::QuoteBlock;
|
use super::QuoteBlock;
|
||||||
use super::SetSource;
|
|
||||||
use super::SpecialBlock;
|
use super::SpecialBlock;
|
||||||
use super::StandardProperties;
|
use super::StandardProperties;
|
||||||
|
|
||||||
@ -55,38 +54,6 @@ pub enum Element<'s> {
|
|||||||
LatexEnvironment(LatexEnvironment<'s>),
|
LatexEnvironment(LatexEnvironment<'s>),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'s> SetSource<'s> for Element<'s> {
|
|
||||||
#[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
|
|
||||||
fn set_source(&mut self, source: &'s str) {
|
|
||||||
match self {
|
|
||||||
Element::Paragraph(obj) => obj.source = source,
|
|
||||||
Element::PlainList(obj) => obj.source = source,
|
|
||||||
Element::CenterBlock(obj) => obj.source = source,
|
|
||||||
Element::QuoteBlock(obj) => obj.source = source,
|
|
||||||
Element::SpecialBlock(obj) => obj.source = source,
|
|
||||||
Element::DynamicBlock(obj) => obj.source = source,
|
|
||||||
Element::FootnoteDefinition(obj) => obj.source = source,
|
|
||||||
Element::Comment(obj) => obj.source = source,
|
|
||||||
Element::Drawer(obj) => obj.source = source,
|
|
||||||
Element::PropertyDrawer(obj) => obj.source = source,
|
|
||||||
Element::Table(obj) => obj.source = source,
|
|
||||||
Element::VerseBlock(obj) => obj.source = source,
|
|
||||||
Element::CommentBlock(obj) => obj.source = source,
|
|
||||||
Element::ExampleBlock(obj) => obj.source = source,
|
|
||||||
Element::ExportBlock(obj) => obj.source = source,
|
|
||||||
Element::SrcBlock(obj) => obj.source = source,
|
|
||||||
Element::Clock(obj) => obj.source = source,
|
|
||||||
Element::DiarySexp(obj) => obj.source = source,
|
|
||||||
Element::Planning(obj) => obj.source = source,
|
|
||||||
Element::FixedWidthArea(obj) => obj.source = source,
|
|
||||||
Element::HorizontalRule(obj) => obj.source = source,
|
|
||||||
Element::Keyword(obj) => obj.source = source,
|
|
||||||
Element::BabelCall(obj) => obj.source = source,
|
|
||||||
Element::LatexEnvironment(obj) => obj.source = source,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'s> GetStandardProperties<'s> for Element<'s> {
|
impl<'s> GetStandardProperties<'s> for Element<'s> {
|
||||||
fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
|
fn get_standard_properties<'b>(&'b self) -> &'b dyn StandardProperties<'s> {
|
||||||
match self {
|
match self {
|
||||||
|
@ -169,11 +169,11 @@ impl<'s> Paragraph<'s> {
|
|||||||
/// Generate a paragraph of the passed in text with no additional properties.
|
/// Generate a paragraph of the passed in text with no additional properties.
|
||||||
///
|
///
|
||||||
/// This is used for elements that support an "empty" content like greater blocks.
|
/// This is used for elements that support an "empty" content like greater blocks.
|
||||||
pub(crate) fn of_text(input: &'s str) -> Self {
|
pub(crate) fn of_text(source: &'s str, body: &'s str) -> Self {
|
||||||
Paragraph {
|
Paragraph {
|
||||||
source: input,
|
source,
|
||||||
affiliated_keywords: AffiliatedKeywords::default(),
|
affiliated_keywords: AffiliatedKeywords::default(),
|
||||||
children: vec![Object::PlainText(PlainText { source: input })],
|
children: vec![Object::PlainText(PlainText { source: body })],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ mod greater_element;
|
|||||||
mod lesser_element;
|
mod lesser_element;
|
||||||
mod macros;
|
mod macros;
|
||||||
mod object;
|
mod object;
|
||||||
mod source;
|
|
||||||
mod standard_properties;
|
mod standard_properties;
|
||||||
mod util;
|
mod util;
|
||||||
pub use affiliated_keyword::AffiliatedKeyword;
|
pub use affiliated_keyword::AffiliatedKeyword;
|
||||||
@ -113,5 +112,4 @@ pub use object::WarningDelay;
|
|||||||
pub use object::WarningDelayType;
|
pub use object::WarningDelayType;
|
||||||
pub use object::Year;
|
pub use object::Year;
|
||||||
pub use object::YearInner;
|
pub use object::YearInner;
|
||||||
pub(crate) use source::SetSource;
|
|
||||||
pub use standard_properties::StandardProperties;
|
pub use standard_properties::StandardProperties;
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
pub(crate) trait SetSource<'s> {
|
|
||||||
fn set_source(&mut self, source: &'s str);
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user