Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Nested Set and Call Blocks #340

Merged
merged 8 commits into from
Dec 12, 2022

Conversation

tconbeer
Copy link
Owner

@tconbeer tconbeer commented Dec 11, 2022

This closes #338 , and also handles some long-overdue refactoring of how we lex jinja blocks. Namely, now that we support multiple rulesets, we can do more of the lexing in the main loop, rather than in a specialized jinja-block-specific loop. This actually simplifies quite a bit of the lexing logic.

  • wip: refactor jinja lexing
  • refactor: use a single StopLexing exception'
  • refactor: handle jinja block keywords with new action
  • refactor: remove unused analyzer.stops
  • fix: allow empty jinja blocks
  • fix: fix issue with whitespace and data tokens
  • chore: bump primer ref

@tconbeer tconbeer merged commit af9c170 into main Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issue with nested jinja call and endcall syntax with v0.14.1
1 participant