Commit a4a2b9e40b546078cae57f9ddc95701fc538419d | markodown

Cargo.lock-37

...	...	@@ -403,8 +403,6 @@ dependencies = [
403	403	"serde",
404	404	"serde_json",
405	405	"serde_yml",
406		"tree-sitter",
407		"tree-sitter-typescript",
408	406	]
409	407
410	408	[[package]]
...	...	@@ -924,12 +922,6 @@ version = "1.1.0"
924	922	source = "registry+https://github.com/rust-lang/crates.io-index"
925	923	checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
926	924
927		[[package]]
928		name = "streaming-iterator"
929		version = "0.1.9"
930		source = "registry+https://github.com/rust-lang/crates.io-index"
931		checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
932
933	925	[[package]]
934	926	name = "strsim"
935	927	version = "0.11.1"
...	...	@@ -1004,35 +996,6 @@ version = "0.1.1"
1004	996	source = "registry+https://github.com/rust-lang/crates.io-index"
1005	997	checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
1006	998
1007		[[package]]
1008		name = "tree-sitter"
1009		version = "0.24.7"
1010		source = "registry+https://github.com/rust-lang/crates.io-index"
1011		checksum = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75"
1012		dependencies = [
1013		"cc",
1014		"regex",
1015		"regex-syntax",
1016		"streaming-iterator",
1017		"tree-sitter-language",
1018		]
1019
1020		[[package]]
1021		name = "tree-sitter-language"
1022		version = "0.1.7"
1023		source = "registry+https://github.com/rust-lang/crates.io-index"
1024		checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782"
1025
1026		[[package]]
1027		name = "tree-sitter-typescript"
1028		version = "0.23.2"
1029		source = "registry+https://github.com/rust-lang/crates.io-index"
1030		checksum = "6c5f76ed8d947a75cc446d5fccd8b602ebf0cde64ccf2ffa434d873d7a575eff"
1031		dependencies = [
1032		"cc",
1033		"tree-sitter-language",
1034		]
1035
1036	999	[[package]]
1037	1000	name = "unicode-bidi"
1038	1001	version = "0.3.18"

Cargo.toml-3

...	...	@@ -17,6 +17,3 @@ oxc_parser = "0.96.0"
17	17	oxc_span = "0.96.0"
18	18	serde_json = "1.0"
19	19	serde_yml = "0.0.12"
20		tree-sitter = "0.24"
21		tree-sitter-typescript = "0.23"
22

examples/next-js.mdo+4-3

...	...	@@ -656,7 +656,7 @@ object, but instead uses inline JSX to fill that gap.
656	656	[lib-jsr]: https://jsr.io/@clo/lib
657	657	[lib-npm]: https://npmjs.com/@paperclover/lib
658	658
659		<h3 id='vercel-og'>`next/og` is Good Too</>
	659	<h3 id='vercel-og'><code>next/og</code> is Good Too</>
660	660
661	661	No strong opinions. I just want to remind everyone that the `@vercel/og` package exists.
662	662
...	...	@@ -742,8 +742,9 @@ subscribe to the email list:
742	742	<br />
743	743	<br />
744	744	<br />
745
746		<footer>2025 (c) paper clover</footer>
	745	<footer>
	746	2025 (c) paper clover
	747	</footer>
747	748
748	749	</blog-layout>
749	750

src/lib.rs+6

...	...	@@ -2,6 +2,8 @@ pub mod marko;
2	2	pub mod plugin;
3	3	pub mod typescript;
4	4
	5	use std::borrow::Cow;
	6
5	7	use oxc_diagnostics::{LabeledSpan, OxcDiagnostic};
6	8	use plugin::tags::{MarkoClose, MarkoOpen};
7	9
...	...	@@ -223,3 +225,7 @@ fn validate_marko_tags(node: &markdown_it::Node, errors: &mut Vec<OxcDiagnostic>
223	225	);
224	226	}
225	227	}
	228
	229	pub fn err<T: Into<Cow<'static, str>>>(str: T, offset: usize, length: usize) -> OxcDiagnostic {
	230	OxcDiagnostic::error(str).and_label(LabeledSpan::new(None, offset, length))
	231	}

src/marko.rs+72-69

...	...	@@ -1,9 +1,12 @@
1		use oxc_diagnostics::{LabeledSpan, OxcDiagnostic};
	1	use oxc_diagnostics::OxcDiagnostic;
2	2	use oxc_span::Span;
3	3
4		use crate::typescript::{
5		parse_call_arguments, parse_expr, parse_expr_without_gt, parse_fn_params_and_body,
6		parse_var_binding,
	4	use crate::{
	5	err,
	6	typescript::{
	7	parse_call_arguments, parse_expr, parse_expr_without_gt, parse_fn_params_and_body,
	8	parse_var_binding,
	9	},
7	10	};
8	11
9	12	#[derive(Debug, Clone, PartialEq, Eq)]
...	...	@@ -100,13 +103,7 @@ impl<'a> LexState<'a> {
100	103	self.offset += 1;
101	104	return Ok(b);
102	105	}
103		Err(
104		OxcDiagnostic::error("Unexpected end of file").and_label(LabeledSpan::new(
105		None,
106		self.offset,
107		1,
108		)),
109		)
	106	Err(err("Unexpected end of file", self.offset, 1))
110	107	}
111	108
112	109	pub fn expect(&mut self, expected: &str) -> Result<(), OxcDiagnostic> {
...	...	@@ -114,13 +111,7 @@ impl<'a> LexState<'a> {
114	111	self.offset += expected.len();
115	112	Ok(())
116	113	} else {
117		Err(
118		OxcDiagnostic::error(format!("Expected {expected}")).and_label(LabeledSpan::new(
119		None,
120		self.offset,
121		1,
122		)),
123		)
	114	Err(err(format!("Expected {expected}"), self.offset, 1))
124	115	}
125	116	}
126	117
...	...	@@ -153,10 +144,7 @@ pub fn parse_open(src: &str) -> Result<Open, OxcDiagnostic> {
153	144
154	145	if byte == b'#' {
155	146	if has_id {
156		return Err(
157		OxcDiagnostic::error("Cannot specify two ID shorthands".to_string())
158		.and_label(LabeledSpan::new(None, offset, name.len())),
159		);
	147	return Err(err("Cannot specify two ID shorthands", offset, name.len()));
160	148	}
161	149	has_id = true;
162	150	}
...	...	@@ -174,6 +162,9 @@ pub fn parse_open(src: &str) -> Result<Open, OxcDiagnostic> {
174	162	match byte {
175	163	b'\|' => {
176	164	// parameters
	165	if has_js_params {
	166	return Err(err("Params already specified", offset, 1));
	167	}
177	168	l.offset += 1;
178	169	l.skip_whitespace();
179	170	while l.peek_byte() != Some(b'\|') && l.peek_byte().is_some() {
...	...	@@ -192,6 +183,9 @@ pub fn parse_open(src: &str) -> Result<Open, OxcDiagnostic> {
192	183	}
193	184	b'(' => {
194	185	// arguments
	186	if has_js_arguments {
	187	return Err(err("Function call already specified", offset, 1));
	188	}
195	189	// TODO: METHOD SHORTHAND
196	190	println!("{}", l.peek_rest());
197	191	parse_call_arguments(&mut l)?;
...	...	@@ -202,6 +196,9 @@ pub fn parse_open(src: &str) -> Result<Open, OxcDiagnostic> {
202	196	if l.peek_rest().starts_with("/>") {
203	197	break;
204	198	}
	199	if has_js_variable {
	200	return Err(err("Variable already specified", offset, 1));
	201	}
205	202	l.offset += 1;
206	203	l.skip_whitespace();
207	204	parse_var_binding(&mut l)?;
...	...	@@ -212,45 +209,55 @@ pub fn parse_open(src: &str) -> Result<Open, OxcDiagnostic> {
212	209	}
213	210
214	211	if is_attribute_tag && byte == b'/' {
215		return Err(
216		OxcDiagnostic::error("Attribute tags do not support variables")
217		.and_label(LabeledSpan::new(None, offset, l.offset - offset)),
218		);
	212	return Err(err(
	213	"Attribute tags do not support variables",
	214	offset,
	215	l.offset - offset,
	216	));
219	217	}
220	218	if is_attribute_tag && byte == b'(' {
221		return Err(
222		OxcDiagnostic::error("Attribute tags do not support arguments")
223		.and_label(LabeledSpan::new(None, offset, l.offset - offset)),
224		);
	219	return Err(err(
	220	"Attribute tags do not support arguments",
	221	offset,
	222	l.offset - offset,
	223	));
225	224	}
226	225	}
227	226
228		// keyless value
229		if l.peek_byte() == Some(b'=') {
230		l.offset += 1;
231		l.skip_whitespace();
232		parse_expr_without_gt(&mut l)?;
233		l.skip_whitespace();
234		}
235
236		// attributes
237	227	let mut self_closing = false;
238		loop {
239		match l.peek_byte() {
240		None => return Err(l.expect_byte().expect_err("err")),
241		Some(b'>') => {
242		l.advance(1);
243		break;
244		}
245		Some(_) => {
246		if l.expect("/>").is_ok() {
247		self_closing = true;
	228	if !has_js_arguments {
	229	// keyless value
	230	if l.peek_byte() == Some(b'=') {
	231	l.offset += 1;
	232	l.skip_whitespace();
	233	parse_expr_without_gt(&mut l)?;
	234	l.skip_whitespace();
	235	}
	236
	237	// attributes
	238	loop {
	239	match l.peek_byte() {
	240	None => return Err(l.expect_byte().expect_err("err")),
	241	Some(b'>') => {
	242	l.advance(1);
248	243	break;
249	244	}
250		parse_attribute(&mut l)?;
251		l.skip_whitespace();
	245	Some(_) => {
	246	if l.expect("/>").is_ok() {
	247	self_closing = true;
	248	break;
	249	}
	250	parse_attribute(&mut l)?;
	251	l.skip_whitespace();
	252	}
252	253	}
253	254	}
	255	} else {
	256	if l.expect("/>").is_ok() {
	257	self_closing = true;
	258	} else {
	259	l.expect(">")?;
	260	}
254	261	}
255	262
256	263	Ok(Open {
...	...	@@ -299,8 +306,7 @@ fn parse_tag_name<'a>(l: &mut LexState<'a>) -> Result<&'a str, OxcDiagnostic> {
299	306	if !tag_name.is_empty() {
300	307	Ok(tag_name)
301	308	} else {
302		Err(OxcDiagnostic::error("Expected tag name".to_string())
303		.and_label(LabeledSpan::new(None, l.offset, 1)))
	309	Err(err("Expected tag name", l.offset, 1))
304	310	}
305	311	}
306	312
...	...	@@ -316,8 +322,7 @@ fn parse_attr_name<'a>(l: &mut LexState<'a>) -> Result<&'a str, OxcDiagnostic> {
316	322	if !tag_name.is_empty() {
317	323	Ok(tag_name)
318	324	} else {
319		Err(OxcDiagnostic::error("Expected attribute name".to_string())
320		.and_label(LabeledSpan::new(None, l.offset, 1)))
	325	Err(err("Expected attribute name", l.offset, 1))
321	326	}
322	327	}
323	328
...	...	@@ -348,10 +353,7 @@ fn parse_attribute(l: &mut LexState) -> Result<(), OxcDiagnostic> {
348	353	parse_fn_params_and_body(l)?;
349	354	l.skip_whitespace();
350	355	} else if !has_ws_or_end {
351		return Err(
352		OxcDiagnostic::error("Expected whitespace or '>'".to_string())
353		.and_label(LabeledSpan::new(None, l.offset, 1)),
354		);
	356	return Err(err("Expected whitespace or '>'", l.offset, 1));
355	357	}
356	358
357	359	Ok(())
...	...	@@ -375,12 +377,15 @@ fn parse_class_name_shorthand<'a>(
375	377	if !tag_name.is_empty() {
376	378	Ok(tag_name)
377	379	} else {
378		Err(OxcDiagnostic::error(if id {
379		"Expected id"
380		} else {
381		"Expected class name"
382		})
383		.and_label(LabeledSpan::new(None, l.offset, 1)))
	380	Err(err(
	381	if id {
	382	"Expected id"
	383	} else {
	384	"Expected class name"
	385	},
	386	l.offset,
	387	1,
	388	))
384	389	}
385	390	}
386	391
...	...	@@ -1095,10 +1100,10 @@ mod tests {
1095	1100	#[test]
1096	1101	fn test_combined_complex() {
1097	1102	assert_eq!(
1098		parse_open("<my-tag#id.cls/result(arg1, arg2) foo=bar ...spread>"),
	1103	parse_open("<my-tag#id.cls/result\|arg1, arg2\| foo=bar ...spread>"),
1099	1104	Ok(Open {
1100	1105	tag_name: "my-tag",
1101		content: "<my-tag#id.cls/result(arg1, arg2) foo=bar ...spread>",
	1106	content: "<my-tag#id.cls/result\|arg1, arg2\| foo=bar ...spread>",
1102	1107	self_closing: false,
1103	1108	})
1104	1109	);
...	...	@@ -1270,13 +1275,11 @@ mod tests {
1270	1275	}
1271	1276
1272	1277	#[test]
1273		#[ignore = "need to fix parse_var_binding"]
1274	1278	fn test_tag_params_simple() {
1275	1279	parse_open("<for\|item\| of=items>").unwrap();
1276	1280	}
1277	1281
1278	1282	#[test]
1279		#[ignore = "need to fix parse_var_binding"]
1280	1283	fn test_tag_params_destructure() {
1281	1284	parse_open("<for\|{ name, age }\| of=people>").unwrap();
1282	1285	}

src/plugin/statement.rs+18-29

...	...	@@ -3,7 +3,7 @@ use markdown_it::Node;
3	3
4	4	use crate::adjust_err;
5	5	use crate::plugin::{ErrorBlock, RawBlock};
6		use crate::typescript::find_statement_extent;
	6	use crate::typescript::scan_first_statement_forbid_trailing;
7	7
8	8	/// Parse JavaScript statements (import, export, static X, server X, client X)
9	9	pub struct Rule;
...	...	@@ -11,20 +11,6 @@ pub struct Rule;
11	11	const KEYWORDS: &[&str] = &["import ", "export ", "static ", "server ", "client "];
12	12	const MARKO_PREFIXES: &[&str] = &["static ", "server ", "client "];
13	13
14		/// Check if a line is a valid statement (starts with keyword and parses successfully).
15		fn is_valid_statement(line: &str) -> bool {
16		let trimmed = line.trim_start();
17		let Some(keyword) = KEYWORDS.iter().find(\|k\| trimmed.starts_with(*k)) else {
18		return false;
19		};
20		let keyword_trim = MARKO_PREFIXES
21		.iter()
22		.find(\|k\| *k == keyword)
23		.map(\|k\| k.len())
24		.unwrap_or(0);
25		find_statement_extent(&trimmed[keyword_trim..]).is_ok()
26		}
27
28	14	impl BlockRule for Rule {
29	15	fn run(state: &mut BlockState) -> Option<(Node, usize)> {
30	16	if state.line >= state.line_max \|\| state.blk_indent > 0 {
...	...	@@ -37,9 +23,11 @@ impl BlockRule for Rule {
37	23	// Statements must start a new block - they can't be in the middle of a paragraph.
38	24	// Allow if: start of document, previous line is empty, or previous line is a valid statement.
39	25	if state.line > 0 {
40		let prev_line = state.get_line(state.line - 1);
41		let prev_is_empty = prev_line.trim().is_empty();
42		if !prev_is_empty && !is_valid_statement(prev_line) {
	26	let prev_line = state.get_line(state.line - 1).trim();
	27	if !prev_line.is_empty()
	28	&& prev_line != "---"
	29	&& !KEYWORDS.iter().any(\|k\| prev_line.starts_with(*k))
	30	{
43	31	return None;
44	32	}
45	33	}
...	...	@@ -52,17 +40,18 @@ impl BlockRule for Rule {
52	40
53	41	let unbounded_src = &state.src[state.line_offsets[state.line].first_nonspace..];
54	42
55		let statement_end = match find_statement_extent(&unbounded_src[keyword_trim..]) {
56		Ok(ok) => ok,
57		Err(err) => {
58		return Some((
59		Node::new(ErrorBlock {
60		errors: vec![adjust_err(err, keyword_trim.cast_signed())],
61		}),
62		1,
63		));
64		}
65		};
	43	let statement_end =
	44	match scan_first_statement_forbid_trailing(&unbounded_src[keyword_trim..]) {
	45	Ok(ok) => ok,
	46	Err(err) => {
	47	return Some((
	48	Node::new(ErrorBlock {
	49	errors: vec![adjust_err(err, keyword_trim.cast_signed())],
	50	}),
	51	1,
	52	));
	53	}
	54	};
66	55
67	56	let total_end = keyword_trim + statement_end;
68	57	let content = &unbounded_src[0..unbounded_src.len().min(total_end + 1)];

src/typescript.rs+105-51

...	...	@@ -1,53 +1,93 @@
1	1	//! implement ts partial parsing helpers
2		use crate::{adjust_err, marko::LexState};
	2	use crate::{adjust_err, err, marko::LexState};
3	3
4	4	use oxc_allocator::Allocator;
5		use oxc_ast::ast::Expression;
	5	use oxc_ast::ast::{Expression, Statement};
6	6	use oxc_diagnostics::{LabeledSpan, OxcDiagnostic};
7	7	use oxc_span::{GetSpan, SourceType};
8		use std::borrow::Cow;
9		use tree_sitter::Parser;
10	8
11		fn err<T: Into<Cow<'static, str>>>(str: T, offset: usize, length: usize) -> OxcDiagnostic {
12		OxcDiagnostic::error(str).and_label(LabeledSpan::new(None, offset, length))
13		}
14
15		/// TODO: Blow up
16		pub fn find_statement_extent(source: &str) -> Result<usize, OxcDiagnostic> {
17		let mut parser = Parser::new();
18
19		let language = tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into();
20		parser
21		.set_language(&language)
22		.expect("Failed to load TypeScript grammar");
23
24		let tree = parser.parse(source, None).ok_or_else(\|\| {
25		OxcDiagnostic::error("Failed to parse").and_label(LabeledSpan::new(None, 0, 1))
26		})?;
27		let root = tree.root_node();
	9	/// TODO: Replace with oxc parser, but oxc is tough here
	10	pub fn scan_first_statement_forbid_trailing(source: &str) -> Result<usize, OxcDiagnostic> {
	11	let mut allocator = Allocator::new();
	12	let expr = parse_stmt_extra(source, 0, &mut allocator)?;
	13	let span = expr.span();
	14	let len = (span.end - span.start) as usize;
28	15
29		let first_statement = root.named_child(0).ok_or_else(\|\| {
30		OxcDiagnostic::error("Failed to parse").and_label(LabeledSpan::new(None, 0, 1))
31		})?;
	16	if let Some(trailing) = source[span.end as usize..].lines().next() {
	17	if trailing.trim().len() > 0 {
	18	return Err(err(
	19	"Trailing content not allowed here",
	20	span.end as usize + (trailing.len() - trailing.trim_start().len()),
	21	trailing.trim().len(),
	22	));
	23	}
	24	}
	25	Ok(len)
	26	}
32	27
33		if first_statement.kind() == "ERROR" {
34		return Err(OxcDiagnostic::error("Invalid TypeScript/JavaScript syntax")
35		.and_label(LabeledSpan::new(None, 0, first_statement.end_byte())));
	28	fn parse_stmt_extra<'alloc, 'src: 'alloc>(
	29	source: &'src str,
	30	offset: isize,
	31	allocator: &'alloc mut Allocator,
	32	) -> Result<Statement<'alloc>, OxcDiagnostic> {
	33	if source.is_empty() {
	34	return Err(err(
	35	"Expected expression, found end of file",
	36	offset.max(0).cast_unsigned(),
	37	1,
	38	));
36	39	}
37	40
38		let end_byte = first_statement.end_byte();
	41	let source_type = SourceType::default()
	42	.with_module(true)
	43	.with_typescript(true);
39	44
40		let remaining = &source[end_byte..];
41		let same_line = remaining
42		.find('\n')
43		.map(\|x\| &remaining[..x])
44		.unwrap_or(remaining);
45		if !same_line.trim().is_empty() {
46		return Err(OxcDiagnostic::error("Unexpected content after statement.")
47		.with_label(LabeledSpan::new(None, end_byte, same_line.len())));
	45	let mut result = oxc_parser::Parser::new(allocator, source, source_type).parse();
	46	if !result.errors.is_empty() && result.program.body.len() == 0 {
	47	let first_err = result
	48	.errors
	49	.into_iter()
	50	.next()
	51	.expect("no errors but no result!");
	52	let first_err_offset = first_err
	53	.labels
	54	.as_ref()
	55	.ok_or_else(\|\| err("Expected statement", offset.max(0).cast_unsigned(), 1))?
	56	.first()
	57	.expect("labels, but no labels!")
	58	.offset();
	59
	60	let mut candidate = source[0..first_err_offset].trim_end();
	61	let mut whitespace_groups = 0;
	62	loop {
	63	if candidate.is_empty() {
	64	return Err(adjust_err(first_err, offset));
	65	}
	66	result = oxc_parser::Parser::new(allocator, candidate, source_type).parse();
	67	if (!result.errors.is_empty() \|\| result.panicked) && result.program.body.len() == 0 {
	68	let before_trim = &candidate[..candidate.len() - 1];
	69	let after_trim = before_trim.trim_end();
	70	if after_trim.len() < before_trim.len() {
	71	whitespace_groups += 1;
	72	if whitespace_groups > 1 {
	73	return Err(adjust_err(first_err, offset));
	74	}
	75	}
	76	candidate = after_trim;
	77	} else {
	78	break;
	79	}
	80	}
	81	} else {
	82	assert!(!result.panicked);
48	83	}
49	84
50		Ok(end_byte)
	85	result
	86	.program
	87	.body
	88	.into_iter()
	89	.next()
	90	.ok_or_else(\|\| err("Expected statement", offset.max(0).cast_unsigned(), 1))
51	91	}
52	92
53	93	fn parse_expr_extra<'alloc, 'src: 'alloc>(
...	...	@@ -71,15 +111,22 @@ fn parse_expr_extra<'alloc, 'src: 'alloc>(
71	111	Ok(expr) => expr,
72	112	Err(errors) => {
73	113	let first_err = errors.into_iter().next().expect("no errors but no result!");
74		let first_err_offset = first_err
	114	let first_label = first_err
75	115	.labels
76	116	.as_ref()
77	117	.ok_or_else(\|\| err("Expected expression", offset.max(0).cast_unsigned(), 1))?
78	118	.first()
79		.expect("labels, but no labels!")
80		.offset();
81
82		let mut candidate = source[0..first_err_offset].trim_end();
	119	.expect("labels, but no labels!");
	120	let first_err_offset = first_label.offset();
	121	let first_err_len = first_label.len();
	122
	123	// Use end of error span when error is at start (e.g. "Cannot assign to this expression")
	124	let initial_end = if first_err_offset == 0 {
	125	(first_err_offset + first_err_len).min(source.len())
	126	} else {
	127	first_err_offset
	128	};
	129	let mut candidate = source[0..initial_end].trim_end();
83	130	let mut whitespace_groups = 0;
84	131	loop {
85	132	if candidate.is_empty() {
...	...	@@ -184,6 +231,7 @@ pub fn parse_call_arguments(l: &mut LexState) -> Result<usize, OxcDiagnostic> {
184	231	/// parse variable binding. identifier or destructuring pattern
185	232	/// also parses optional `: Type`
186	233	pub fn parse_var_binding(l: &mut LexState) -> Result<usize, OxcDiagnostic> {
	234	// TODO: this approach has bugs
187	235	let offset = l.offset();
188	236	let source = l.peek_rest();
189	237	if source.is_empty() {
...	...	@@ -724,52 +772,58 @@ mod tests {
724	772	assert_eq!(parse_var_binding("café"), Ok(5));
725	773	}
726	774
	775	#[test]
	776	fn test_var_binding_equals() {
	777	assert_eq!(parse_var_binding("foo = 1"), Ok(3));
	778	assert_eq!(parse_var_binding("foo\| of=1>"), Ok(3));
	779	}
	780
727	781	#[test]
728	782	fn test_stmt_function_with_garbage() {
729	783	let source = "function hello() {\n console.log(1);\n}\n\nrandom markdown garbage";
730		let end = find_statement_extent(source).unwrap();
	784	let end = scan_first_statement_forbid_trailing(source).unwrap();
731	785	assert_eq!(&source[..end], "function hello() {\n console.log(1);\n}");
732	786	}
733	787
734	788	#[test]
735	789	fn test_stmt_import_with_garbage() {
736	790	let source = "import { foo } from 'bar';\n\n# markdown heading";
737		let end = find_statement_extent(source).unwrap();
	791	let end = scan_first_statement_forbid_trailing(source).unwrap();
738	792	assert_eq!(&source[..end], "import { foo } from 'bar';");
739	793	}
740	794
741	795	#[test]
742	796	fn test_stmt_interface_with_garbage() {
743	797	let source = "interface Foo {\n bar: string;\n}\n\nsome text";
744		let end = find_statement_extent(source).unwrap();
	798	let end = scan_first_statement_forbid_trailing(source).unwrap();
745	799	assert_eq!(&source[..end], "interface Foo {\n bar: string;\n}");
746	800	}
747	801
748	802	#[test]
749	803	fn test_stmt_const_declaration() {
750	804	let source = "const answer = 42;\n\n# Next section";
751		let end = find_statement_extent(source).unwrap();
	805	let end = scan_first_statement_forbid_trailing(source).unwrap();
752	806	assert_eq!(&source[..end], "const answer = 42;");
753	807	}
754	808
755	809	#[test]
756	810	fn test_stmt_expression_statement() {
757	811	let source = "console.log('hello');\n\nmore content";
758		let end = find_statement_extent(source).unwrap();
	812	let end = scan_first_statement_forbid_trailing(source).unwrap();
759	813	assert_eq!(&source[..end], "console.log('hello');");
760	814	}
761	815
762	816	#[test]
763	817	fn test_stmt_pure_garbage() {
764	818	let source = "random unexpected garbage";
765		let result = find_statement_extent(source);
	819	let result = scan_first_statement_forbid_trailing(source);
766	820	assert!(result.is_err());
767	821	}
768	822
769	823	#[test]
770	824	fn test_stmt_multiline_function() {
771	825	let source = "function sort(items) {\n while (!isSorted()) {\n shuffle(items);\n }\n return items;\n}\n\n# Heading";
772		let end = find_statement_extent(source).unwrap();
	826	let end = scan_first_statement_forbid_trailing(source).unwrap();
773	827	assert!(source[..end].contains("return items;"));
774	828	assert!(source[..end].contains("}"));
775	829	}
...	...	@@ -777,14 +831,14 @@ mod tests {
777	831	#[test]
778	832	fn test_stmt_trailing_content_on_same_line() {
779	833	let source = "const x = 1; const y = 2;";
780		let result = find_statement_extent(source);
	834	let result = scan_first_statement_forbid_trailing(source);
781	835	assert!(result.is_err());
782	836	}
783	837
784	838	#[test]
785	839	fn test_stmt_trailing_whitespace_ok() {
786	840	let source = "const x = 1; \n\nmore content";
787		let result = find_statement_extent(source);
	841	let result = scan_first_statement_forbid_trailing(source);
788	842	assert!(result.is_ok());
789	843	}
790	844	}

tests/fixtures.rs+12

...	...	@@ -147,3 +147,15 @@ fn fixture_16_same_line_text() {
147	147	fn fixture_17_consecutive_statements() {
148	148	run_fixture("17-consecutive-statements");
149	149	}
	150
	151	#[ignore = "known bug"]
	152	#[test]
	153	fn fixture_18_multiline_tag_with_value() {
	154	run_fixture("18-multiline-tag-with-value");
	155	}
	156
	157	#[ignore = "known bug"]
	158	#[test]
	159	fn fixture_19_extra_cases() {
	160	run_fixture("19-extra-cases");
	161	}

tests/fixtures/13-kitchen-sink.marko+1-2

...	...	@@ -1,5 +1,4 @@
1	1	export const title = "Full Example";
2
3	2	import Chart from "./chart.marko";
4	3	static const year = 2026;
5	4	export const slug = "full-example";
...	...	@@ -19,7 +18,7 @@ server {
19	18	</for>
20	19	</if>
21	20	<else>
22		<p>No data available. Visit <a href="https://example.com">example.com</a> for help.</p>
	21	No data available. Visit <a href="https://example.com">example.com</a> for help.
23	22	</else>
24	23	<div#footer.site-footer>
25	24	<app-footer year=year />

tests/fixtures/13-kitchen-sink.mdo+9-9

...	...	@@ -1,11 +1,8 @@
1	1	---
2	2	title: Full Example
3	3	---
4
5	4	import Chart from "./chart.marko";
6
7	5	static const year = 2026;
8
9	6	export const slug = "full-example";
10	7
11	8	// Page starts here
...	...	@@ -19,16 +16,19 @@ server {
19	16	}
20	17
21	18	<if=data>
22		## Chart
23	19
24		<Chart data=data year=year />
	20	## Chart
	21
	22	<Chart data=data year=year />
	23
	24	<for\|point\| of=data.points>
	25
	26	- ${point.label}: ${point.value}
25	27
26		<for\|point\| of=data.points>
27		- ${point.label}: ${point.value}
28		</for>
	28	</for>
29	29	</if>
30	30	<else>
31		No data available. Visit <https://example.com> for help.
	31	No data available. Visit <https://example.com> for help.
32	32	</else>
33	33
34	34	<div#footer.site-footer>

tests/fixtures/18-multiline-tag-with-value.marko created+6

...	...	@@ -0,0 +1,6 @@
	1	<blog-layout
	2	meta=meta
	3	>
	4	<h3 id='next-metadata'><code>next/metadata</code> is Great</>
	5	<p>hi</p>
	6	</blog-layout>

tests/fixtures/18-multiline-tag-with-value.mdo created+9

...	...	@@ -0,0 +1,9 @@
	1	<blog-layout
	2	meta=meta
	3	>
	4
	5	<h3 id='next-metadata'>`next/metadata` is Great</>
	6
	7	hi
	8
	9	</blog-layout>

tests/fixtures/19-extra-cases.marko created+3

...	...	@@ -0,0 +1,3 @@
	1	<tag attr=(value
	2	>
	3	5)>

tests/fixtures/19-extra-cases.mdo created+4

...	...	@@ -0,0 +1,4 @@
	1
	2	<tag attr=(value
	3	>
	4	5)>

author	clover caruso <git@paperclover.net> 2026-02-12 22:22:37-08:00
committer	clover caruso <git@paperclover.net> 2026-02-13 11:09:29-08:00
log	a4a2b9e40b546078cae57f9ddc95701fc538419d
tree	1162640166f5d978c5ac179d4f4e8afa35969465
parent	4326328d78523d6933f7257ca0c9cbfa71b6cbb2
signature	Signed by SSH key SHA256:xbd+BjjhyBfwk7GVoURf9Yx0gzDerHbvYv7SddNWmAs

chore: drop tree sitter, fix bugs