chris/orgize
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: FixedWidth::value & Comment::value

Browse source
This commit is contained in:
PoiScript 2023-12-14 18:15:09 +08:00
parent 7d4b176975
commit 868cd9ab10
No known key found for this signature in database
GPG key ID: 22C2B1249D99985E
6 changed files with 163 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/syntax/comment.rs
View file

@ -1,39 +1,53 @@
use nom::{IResult, InputTake};
use nom::{
bytes::complete::{tag, take_while},
character::complete::{space0, space1},
combinator::{iterator, opt},
sequence::tuple,
IResult,
};
use super::{
combinator::{blank_lines, line_ends_iter, node, GreenElement},
combinator::{blank_lines, eol_or_eof, GreenElement, NodeBuilder},
input::Input,
SyntaxKind,
};
fn comment_node_base(input: Input) -> IResult<Input, GreenElement, ()> {
let mut start = 0;
for i in line_ends_iter(input.as_str()) {
let mut iter = input.as_bytes()[start..]
.iter()
.skip_while(|&&b| b == b' ' || b == b'\t');
let mut b = NodeBuilder::new();
if matches!(iter.next(), Some(b'#'))
&& matches!(iter.next(), None | Some(b'\n') | Some(b'\r') | Some(b' '))
{
start = i;
} else {
break;
let mut iter = iterator(
input,
opt(tuple((
space0,
tag("#"),
opt(tuple((space1, take_while(|c| c != '\r' && c != '\n')))),
eol_or_eof,
))),
);
for (idx, option) in iter.enumerate() {
match option {
Some((ws, common, content, eol)) => {
b.ws(ws);
b.token(SyntaxKind::HASH, common);
if let Some((ws, text)) = content {
b.ws(ws);
b.text(text);
}
b.text(eol);
}
_ if idx == 0 => return Err(nom::Err::Error(())),
_ => break,
}
}
if start == 0 {
return Err(nom::Err::Error(()));
}
let (input, _) = iter.finish()?;
let (input, contents) = input.take_split(start);
let (input, post_blank) = blank_lines(input)?;
let mut children = vec![];
children.push(contents.text_token());
children.extend(post_blank);
b.children.extend(post_blank);
Ok((input, node(SyntaxKind::COMMENT, children)))
Ok((input, b.finish(SyntaxKind::COMMENT)))
}
#[tracing::instrument(level = "debug", skip(input), fields(input = input.s))]
@ -65,7 +79,7 @@ fn parse() {
t("#"),
@r###"
COMMENT@0..1
TEXT@0..1 "#"
HASH@0..1 "#"
"###
);
@ -73,7 +87,16 @@ fn parse() {
t("#\n # a\n #\n\n"),
@r###"
COMMENT@0..12
TEXT@0..11 "#\n # a\n #\n"
HASH@0..1 "#"
TEXT@1..2 "\n"
WHITESPACE@2..4 " "
HASH@4..5 "#"
WHITESPACE@5..6 " "
TEXT@6..7 "a"
TEXT@7..8 "\n"
WHITESPACE@8..9 " "
HASH@9..10 "#"
TEXT@10..11 "\n"
BLANK_LINE@11..12 "\n"
"###
);
@ -82,7 +105,8 @@ fn parse() {
t("#\na\n #\n\n"),
@r###"
COMMENT@0..2
TEXT@0..2 "#\n"
HASH@0..1 "#"
TEXT@1..2 "\n"
"###
);
}

75
src/syntax/fixed_width.rs
View file

@ -1,39 +1,57 @@
use nom::{IResult, InputTake};
use nom::{
bytes::complete::{tag, take_while},
character::complete::{space0, space1},
combinator::{iterator, opt},
sequence::tuple,
IResult,
};
use super::{
combinator::{blank_lines, line_ends_iter, node, GreenElement},
combinator::{blank_lines, eol_or_eof, GreenElement, NodeBuilder},
input::Input,
keyword::affiliated_keyword_nodes,
SyntaxKind,
};
fn fixed_width_node_base(input: Input) -> IResult<Input, GreenElement, ()> {
let mut start = 0;
for i in line_ends_iter(input.as_str()) {
let mut iter = input.as_bytes()[start..]
.iter()
.skip_while(|&&b| b == b' ' || b == b'\t');
let mut b = NodeBuilder::new();
if matches!(iter.next(), Some(b':'))
&& matches!(iter.next(), None | Some(b'\n') | Some(b'\r') | Some(b' '))
{
start = i;
} else {
break;
let (input, keywords) = affiliated_keyword_nodes(input)?;
b.children.extend(keywords);
let mut iter = iterator(
input,
opt(tuple((
space0,
tag(":"),
opt(tuple((space1, take_while(|c| c != '\r' && c != '\n')))),
eol_or_eof,
))),
);
for (idx, option) in iter.enumerate() {
match option {
Some((ws, common, content, eol)) => {
b.ws(ws);
b.token(SyntaxKind::COMMA, common);
if let Some((ws, text)) = content {
b.ws(ws);
b.text(text);
}
b.text(eol);
}
_ if idx == 0 => return Err(nom::Err::Error(())),
_ => break,
}
}
if start == 0 {
return Err(nom::Err::Error(()));
}
let (input, _) = iter.finish()?;
let (input, contents) = input.take_split(start);
let (input, post_blank) = blank_lines(input)?;
let mut children = vec![];
children.push(contents.text_token());
children.extend(post_blank);
b.children.extend(post_blank);
Ok((input, node(SyntaxKind::FIXED_WIDTH, children)))
Ok((input, b.finish(SyntaxKind::FIXED_WIDTH)))
}
#[tracing::instrument(level = "debug", skip(input), fields(input = input.s))]
@ -58,7 +76,20 @@ fn parse() {
).syntax,
@r###"
FIXED_WIDTH@0..19
TEXT@0..14 ": A\n:\n: B\n: C\n"
COMMA@0..1 ":"
WHITESPACE@1..2 " "
TEXT@2..3 "A"
TEXT@3..4 "\n"
COMMA@4..5 ":"
TEXT@5..6 "\n"
COMMA@6..7 ":"
WHITESPACE@7..8 " "
TEXT@8..9 "B"
TEXT@9..10 "\n"
COMMA@10..11 ":"
WHITESPACE@11..12 " "
TEXT@12..13 "C"
TEXT@13..14 "\n"
BLANK_LINE@14..15 "\n"
BLANK_LINE@15..19 " "
"###