Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: parse_tree groups list items into Lists #23

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: parse_tree groups list items into Lists #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/snapshots/rust_norg__tests__carryover_tags_tree.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,18 @@ expression: examples
- Token:
Text: two
content:
- NestableDetachedModifier:
- List:
modifier_type: UnorderedList
level: 4
extensions: []
text:
Paragraph:
- Token:
Text: four
content: []
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 4
extensions: []
text:
Paragraph:
- Token:
Text: four
content: []
- CarryoverTag:
tag_type: Macro
name:
Expand Down
19 changes: 11 additions & 8 deletions src/snapshots/rust_norg__tests__delimiting_mods_tree.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,18 @@ expression: examples
- Paragraph:
- Token:
Text: two
- - NestableDetachedModifier:
- - List:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: list
content: []
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: list
content: []
- DelimitingModifier: HorizontalRule
- Paragraph:
- Token:
Expand Down
173 changes: 97 additions & 76 deletions src/snapshots/rust_norg__tests__lists_tree.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,112 @@
source: src/lib.rs
expression: examples
---
- - NestableDetachedModifier:
- - List:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: base
content: []
- - NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: one
content:
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: two
Text: base
content: []
- - NestableDetachedModifier:
- - List:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: one
content:
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: two
- Token: Whitespace
Text: one
content:
- List:
modifier_type: UnorderedList
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
extensions: []
text:
Paragraph:
- Token:
Text: two
content: []
- - List:
modifier_type: UnorderedList
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: with
- Token: Whitespace
Text: one
content:
- List:
modifier_type: UnorderedList
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
extensions: []
text:
Paragraph:
- Token:
Text: two
- Token: Whitespace
- Token:
Text: with
- Token: Whitespace
- Token:
Text: content
content: []
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
extensions: []
text:
Paragraph:
- Token:
Text: two
- Token: Whitespace
- Token:
Special: (
- Token:
Text: "2"
- Token:
Special: )
content:
- List:
modifier_type: UnorderedList
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 3
extensions: []
text:
Paragraph:
- Token:
Text: three
content: []
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: content
Text: one
content: []
- - List:
modifier_type: UnorderedList
items:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
Expand All @@ -61,47 +116,13 @@ expression: examples
Paragraph:
- Token:
Text: two
- Token: Whitespace
- Token:
Special: (
- Token:
Text: "2"
content: []
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Special: )
content:
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 3
extensions: []
text:
Paragraph:
- Token:
Text: three
content: []
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: one
content: []
- - NestableDetachedModifier:
modifier_type: UnorderedList
level: 2
extensions: []
text:
Paragraph:
- Token:
Text: two
content: []
- NestableDetachedModifier:
modifier_type: UnorderedList
level: 1
extensions: []
text:
Paragraph:
- Token:
Text: one
content: []
Text: one
content: []
2 changes: 1 addition & 1 deletion src/stage_3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use textwrap::dedent;

use crate::stage_2::{NorgBlock, ParagraphSegmentToken, ParagraphTokenList};

#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize)]
#[derive(Clone, Copy, Hash, Debug, PartialEq, Eq, Serialize)]
pub enum NestableDetachedModifier {
Quote,
UnorderedList,
Expand Down
37 changes: 27 additions & 10 deletions src/stage_4.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ pub enum NorgAST {
text: Box<NorgASTFlat>,
content: Vec<Self>,
},
List {
modifier_type: NestableDetachedModifier,
// These will only ever be NestableDetachedModifiers, we should really pull them out into
// their own struct
items: Vec<NorgAST>,
},
RangeableDetachedModifier {
modifier_type: RangeableDetachedModifier,
title: Vec<ParagraphSegment>,
Expand Down Expand Up @@ -190,12 +196,13 @@ fn consume_nestable_detached_mod_content(
start_level: &u16,
flat: &[NorgASTFlat],
i: &mut usize,
list_type: NestableDetachedModifier,
) -> Vec<NorgAST> {
let mut content = vec![];
for j in (*i + 1)..flat.len() {
match &flat[j] {
NorgASTFlat::NestableDetachedModifier { level, .. } => {
if level <= start_level {
NorgASTFlat::NestableDetachedModifier { level, modifier_type, .. } => {
if *modifier_type != list_type || level <= start_level {
content = stage_4(flat[(*i + 1)..j].to_vec());
*i = j - 1;
break;
Expand All @@ -208,8 +215,8 @@ fn consume_nestable_detached_mod_content(
NorgASTFlat::CarryoverTag { next_object, .. }
if matches!(**next_object, NorgASTFlat::NestableDetachedModifier { .. }) =>
{
if let NorgASTFlat::NestableDetachedModifier { level, .. } = **next_object {
if level <= *start_level {
if let NorgASTFlat::NestableDetachedModifier { level, modifier_type, .. } = **next_object {
if modifier_type != list_type || level <= *start_level {
content = stage_4(flat[(*i + 1)..j].to_vec());
*i = j - 1;
break;
Expand Down Expand Up @@ -287,7 +294,7 @@ pub fn stage_4(flat: Vec<NorgASTFlat>) -> Vec<NorgAST> {
content,
} => {
let new_content =
consume_nestable_detached_mod_content(&level, &flat, &mut i);
consume_nestable_detached_mod_content(&level, &flat, &mut i, modifier_type);
ast.push(NorgAST::CarryoverTag {
tag_type: tag_type.clone(),
name: name.to_vec(),
Expand All @@ -312,15 +319,25 @@ pub fn stage_4(flat: Vec<NorgASTFlat>) -> Vec<NorgAST> {
extensions,
content: text,
} => {
let content = consume_nestable_detached_mod_content(start_level, &flat, &mut i);

ast.push(NorgAST::NestableDetachedModifier {
modifier_type: modifier_type.clone(),
let content = consume_nestable_detached_mod_content(start_level, &flat, &mut i, *modifier_type);
let parsed = NorgAST::NestableDetachedModifier {
modifier_type: *modifier_type,
level: *start_level,
extensions: extensions.to_vec(),
text: text.clone(),
content,
});
};
if !ast.is_empty() {
let len = ast.len();
if let NorgAST::List { modifier_type: list_modifier, ref mut items } = ast[len - 1] {
if *modifier_type == list_modifier {
items.push(parsed);
i += 1;
continue
}
}
}
ast.push(NorgAST::List { modifier_type: *modifier_type, items: vec![parsed] });
}
_ => {
ast.push(convert(item.clone()));
Expand Down