Don't skip an erroneous comma when parsing "from"#617
Merged
davidism merged 2 commits intopallets:masterfrom Jul 7, 2017
jackwilsdon:dont-skip-comma
Merged
Don't skip an erroneous comma when parsing "from"#617davidism merged 2 commits intopallets:masterfrom jackwilsdon:dont-skip-comma
davidism merged 2 commits intopallets:masterfrom
jackwilsdon:dont-skip-comma
Conversation
Currently we skip an extra comma when "with context" is not provided to
the "from" statement. This allows invalid code such as this:
{% from "functions.html" import my_function,, %}
The primary issue with this is that it is not consistent when providing
"with context". The following code throws an error, contrary to the
previous example:
{% from "functions.html" import my_function,, with context %}
It seems that the comma skipping was originally found in 0611e49 and was
accidentally put inside the "with context" check in ea847c5. It was then
updated to use "skip_if" in fdf9530.
There doesn't seem to be any reason for this check existing, as
double commas should never be allowed and serve no purpose in the
statement.
Member
|
After #618, the example already fails, removing this doesn't change anything. However, since it seems redundant, I'll still remove it and add a test. |
davidism
approved these changes
Jul 7, 2017
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Currently we skip an extra comma when "with context" is not provided to the "from" statement. This allows invalid code such as this:
The primary issue with this is that it is not consistent when providing "with context". The following code throws an error, contrary to the previous example:
It seems that the comma skipping was originally found in 0611e49 and was accidentally put inside the "with context" check in ea847c5. It was then updated to use "skip_if" in fdf9530.
There doesn't seem to be any reason for this check existing, as commas should never be allowed and serve no purpose in the statement.
Sadly this may be a "semi-breaking" change, as it removes some functionality that should have never existed and hopefully nobody relies on.
This PR ensures that both examples throw an error as expected.