itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-09-27 04:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

generator: remove invisible group from output

Browse Source 
The generated `TokenStream` gets parsed correctly by `rustc`, but fails
to be parsed by `syn` in some circumstances. E.g. the template syntax
`test {#` lets the playground crash.

This PR removes the invisible group.
This commit is contained in:
René Kijewski 2025-04-26 10:07:48 +02:00 committed by René Kijewski
parent 3cdc0ea4c1
commit bf5e066b68
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
askama_derive/src/lib.rs
View File

@ -23,7 +23,7 @@ use parser::{Parsed, ascii_str, strip_common};
use proc_macro::TokenStream as TokenStream12;
#[cfg(feature = "__standalone")]
use proc_macro2::TokenStream as TokenStream12;
use proc_macro2::{Delimiter, Group, Span, TokenStream, TokenTree};
use proc_macro2::{Span, TokenStream};
use quote::{quote, quote_spanned};
use rustc_hash::FxBuildHasher;
@ -239,7 +239,6 @@ pub fn derive_template(input: TokenStream12) -> TokenStream12 {
buf.into_string().parse().unwrap()
};
let ts = TokenTree::Group(Group::new(Delimiter::None, ts));
let ts = if let Some(crate_name) = crate_name {
quote! {
const _: () = {

13
askama_derive/src/tests.rs
View File

@ -1169,3 +1169,16 @@ fn test_with_config() {
r#"#[template(config = "empty_test_config.toml")]"#,
);
}
#[test]
#[cfg(feature = "__standalone")]
fn test_generated_with_error() {
// Ensure that the generated code on errors can still be parsed by syn.
let ts = quote::quote! {
#[derive(Template)]
#[template(ext = "txt", source = "test {#")]
struct HelloWorld;
};
let ts = crate::derive_template(ts);
let _: syn::File = syn::parse2(ts).unwrap();
}