-
-
Notifications
You must be signed in to change notification settings - Fork 221
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
Template node structs & whitespace semantics #829
Open
couchand
wants to merge
27
commits into
djc:main
Choose a base branch
from
couchand:2023-06/ws-semantics
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
couchand
changed the title
Template block whitespace semantics
Template node whitespace semantics
Jun 24, 2023
couchand
changed the title
Template node whitespace semantics
Template node structs & whitespace semantics
Jun 24, 2023
djc
reviewed
Jun 28, 2023
askama_derive/src/generator.rs
Outdated
@@ -665,7 +665,14 @@ impl<'a> Generator<'a> { | |||
Node::Include(ws, path) => { | |||
size_hint += self.handle_include(ctx, buf, ws, path)?; | |||
} | |||
Node::Call(ws, scope, name, ref args) => { | |||
Node::Call( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're going to do this, I think we should just pass the &Call
directly to write_call()
... Not much point in destructing it here. (Same for other node types.)
#834 extracts a parser crate and improves the parser API a bunch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the first set of changes extracted from #782.
These changes focus on clarifying the semantics of the whitespace of each
Node
. This PR refrains from abstracting out the common whitespace-handling patterns that emerge here, leaving that for a follow-on PR.We make the following changes here:
Node
variant parsing testsNode
variantWs
value (though since the whitespace patterns aren't yet abstracted this clarification is still incomplete)There should be no visible effects of these changes, they are purely distilling towards greater insight. As described in the comments to #782, the general goal is to differentiate between the "inner" whitespace (within nested blocks) and the "outer" whitespace (around every node except lit).
Outer whitespace is the first field of each non-
Lit
variant ofNode
. Inner whitespace is on each nested-block-type node, stored alongside theVec<Node>
value that represents the nested block. For instance, for the templateWould result in the Rust value
Thanks for your review, your time and effort are appreciated!