fix: single \r will be consider as blank line

This commit is contained in:
PoiScript 2023-11-14 11:46:26 +08:00
parent b6e86a128a
commit a269f2f258
No known key found for this signature in database
GPG key ID: 22C2B1249D99985E
23 changed files with 101 additions and 305 deletions

View file

@ -1,18 +0,0 @@
use orgize::Org;
#[test]
fn can_handle_empty_emphasis() {
let cases = &[
"* / // a",
"\"* / // a\"",
"* * ** a",
"* 2020\n** December\n*** Experiment\nType A is marked with * and type B is marked with **.\n",
"* 2020\n:DRAWER:\n* ** a\n:END:",
"* * ** :a:",
"* * ** "
];
for case in cases {
let _ = Org::parse(case);
}
}

View file

@ -1,21 +0,0 @@
use orgize::Org;
#[test]
fn can_handle_empty_list_item() {
let cases = &[
"0. ",
"* \n0. ",
" * ",
" 0. ",
"\t* ",
"- ",
"- hello\n- ",
"- \n- hello",
"- hello\n- \n- world",
"* world\n- ",
];
for case in cases {
let _ = Org::parse(case);
}
}

View file

@ -1,8 +0,0 @@
use orgize::{ast::Paragraph, rowan::ast::AstNode, Org};
#[test]
fn whitespaces() {
let case = "\u{000b}\u{0085}\u{00a0}\u{1680}\u{2000}\u{2001}\u{2002}\u{2003}\u{2004}\u{2005}\u{2006}\u{2007}\u{2008}\u{2009}\u{200a}\u{2028}\u{2029}\u{202f}\u{205f}\u{3000}";
let paragraph = Org::parse(case).first_node::<Paragraph>().unwrap();
assert_eq!(&paragraph.syntax().to_string(), case);
}

View file

@ -1,168 +1,36 @@
use orgize::Org;
use pretty_assertions::assert_eq;
const INPUT: &[&str] = &[
// issue 10
"* / // a",
"\"* / // a\"",
"* * ** a",
"* 2020\n** December\n*** Experiment\nType A is marked with * and type B is marked with **.\n",
"* 2020\n:DRAWER:\n* ** a\n:END:",
"* * ** :a:",
"* * ** ",
// issue 11
"0. ",
"* \n0. ",
" * ",
" 0. ",
"\t* ",
"- ",
"- hello\n- ",
"- \n- hello",
"- hello\n- \n- world",
"* world\n- ",
// issue 22
"\u{000b}\u{0085}\u{00a0}\u{1680}\u{2000}\u{2001}\u{2002}\u{2003}\u{2004}\u{2005}\u{2006}\u{2007}\u{2008}\u{2009}\u{200a}\u{2028}\u{2029}\u{202f}\u{205f}\u{3000}",
// fuzz test
"___\n",
"\n\n\n",
"\n\n\n",
"\n*",
"\r-"
];
macro_rules! test_suite {
($name:ident, $content:expr, $expected:expr) => {
#[test]
fn $name() {
assert_eq!(Org::parse($content).to_html(), $expected);
}
};
#[test]
fn parse() {
for input in INPUT {
let _ = orgize::Org::parse(input);
}
}
test_suite!(
emphasis,
"*bold*, /italic/,\n_underlined_, =verbatim= and ~code~",
"<main><section><p><b>bold</b>, <i>italic</i>,\n<u>underlined</u>, \
<code>verbatim</code> and <code>code</code></p></section></main>"
);
test_suite!(
link,
"Visit[[http://example.com][link1]]or[[http://example.com][link1]].",
r#"<main><section><p>Visit<a href="http://example.com">link1</a>or<a href="http://example.com">link1</a>.</p></section></main>"#
);
test_suite!(
section_and_headline,
r#"
* title 1
section 1
** title 2
section 2
* title 3
section 3
* title 4
section 4
"#,
"<main><h1>title 1</h1><section><p>section 1</p></section>\
<h2>title 2</h2><section><p>section 2</p></section>\
<h1>title 3</h1><section><p>section 3</p></section>\
<h1>title 4</h1><section><p>section 4</p></section></main>"
);
test_suite!(
list,
r#"
+ 1
+ 2
- 3
- 4
+ 5
"#,
"<main><section><ul>\
<li><p>1</p></li>\
<li><p>2</p><ul><li><p>3</p></li><li><p>4</p></li></ul></li>\
<li><p>5</p></li>\
</ul></section></main>"
);
test_suite!(
snippet,
"@@html:<del>@@delete this@@html:</del>@@",
"<main><section><p><del>delete this</del></p></section></main>"
);
test_suite!(
paragraphs,
r#"
* title
paragraph 1
paragraph 2
paragraph 3
paragraph 4
"#,
"<main><h1>title</h1><section>\
<p>paragraph 1</p><p>paragraph 2</p>\
<p>paragraph 3</p><p>paragraph 4</p>\
</section></main>"
);
test_suite!(
table1,
r#"
|-----+-----+-----|
| 0 | 1 | 2 |
|-----+-----+-----|
| 4 | 5 | 6 |
"#,
"<main><section><table>\
<thead><tr><th>0</th><th>1</th><th>2</th></tr></thead>\
<tbody><tr><td>4</td><td>5</td><td>6</td></tr></tbody>\
</table></section></main>"
);
test_suite!(
table2,
r#"
|-----+-----+-----|
| 0 | 1 | 2 |
| 4 | 5 | 6 |
|-----+-----+-----|
"#,
"<main><section><table>\
<tbody><tr><td>0</td><td>1</td><td>2</td></tr>\
<tr><td>4</td><td>5</td><td>6</td></tr></tbody>\
</table></section></main>"
);
test_suite!(
table3,
r#"
|-----+-----+-----|
|-----+-----+-----|
| 0 | 1 | 2 |
| 4 | 5 | 6 |
"#,
"<main><section><table><thead></thead>\
<tbody><tr><td>0</td><td>1</td><td>2</td></tr>\
<tr><td>4</td><td>5</td><td>6</td></tr></tbody>\
</table></section></main>"
);
test_suite!(
table4,
r#"
| 0 | 1 | 2 |
| 4 | 5 | 6 |
|-----+-----+-----|
|-----+-----+-----|
"#,
"<main><section><table>\
<thead><tr><th>0</th><th>1</th><th>2</th></tr>\
<tr><th>4</th><th>5</th><th>6</th></tr></thead>\
<tbody></tbody></table></section></main>"
);
test_suite!(
table5,
r#"
|-----+-----+-----|
|-----+-----+-----|
"#,
"<main><section><table><tbody></tbody></table></section></main>"
);
test_suite!(
table6,
r#"
|
|-
|
|-
|
"#,
"<main><section><table>\
<thead><tr></tr></thead>\
<tbody><tr></tr></tbody>\
<tbody><tr></tr></tbody>\
</table></section></main>"
);