itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-29 22:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better error message for {% macro super %}

Browse Source
This commit is contained in:
René Kijewski 2024-05-15 23:44:42 +02:00 committed by René Kijewski
parent 33f823d582
commit e605478076
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
askama_parser/src/node.rs
View File

@ -7,7 +7,7 @@ use nom::character::complete::char;
use nom::combinator::{
complete, consumed, cut, eof, map, map_res, not, opt, peek, recognize, value,
};
use nom::error::{Error, ErrorKind};
use nom::error::ErrorKind;
use nom::error_position;
use nom::multi::{fold_many0, many0, many1, separated_list0, separated_list1};
use nom::sequence::{delimited, pair, preceded, terminated, tuple};
@ -520,7 +520,13 @@ impl<'a> Macro<'a> {
|i| s.tag_block_end(i),
))),
));
let (i, (pws1, _, (name, params, nws1, _))) = start(i)?;
let (j, (pws1, _, (name, params, nws1, _))) = start(i)?;
if name == "super" {
return Err(nom::Err::Failure(ErrorContext {
input: i,
message: Some(Cow::Borrowed("'super' is not a valid name for a macro")),
}));
}
let mut end = cut(tuple((
|i| Node::many(i, s),
@ -537,15 +543,7 @@ impl<'a> Macro<'a> {
)),
))),
)));
let (i, (contents, (_, pws2, _, nws2))) = end(i)?;
if name == "super" {
// TODO: yield a a better error message here
return Err(ErrorContext::from_err(nom::Err::Failure(Error::new(
i,
ErrorKind::Fail,
))));
}
let (i, (contents, (_, pws2, _, nws2))) = end(j)?;
Ok((
i,

5
testing/tests/ui/macro-super.stderr
View File

@ -1,5 +1,6 @@
error: failed to parse template source at row 1, column 35 near:
"%}"
error: 'super' is not a valid name for a macro
failed to parse template source at row 1, column 2 near:
"- macro super() -%}{%- endmacro -%}"
--> tests/ui/macro-super.rs:3:10
|
3 | #[derive(Template)]