Fix Twig/Jinja: incorrect recognition of some special tokens like keywords #1949
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
…words
`Twig` and `Jinja` lexers share some variables as class variables.
Both classes define `keywords` method like this:
```
class Jinja
def self.keywords
@@Keywords ||= ...
end
end
class Twig < Jinja
def self.keywords
@@Keywords ||= ...
end
end
```
If `Twig.keywords` is called before `Jinja.keywords`, `@@keywords` is
set to Twig's and both classes return the same value. If not,
`@@keywords` is initialized to Jinja's.
|
Thanks, @nsfisis. The change looks great to me 🚀 |
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.
Bug
Twig and Jinja may return incorrect token types for some special tokens like keywords. It depends on loading order.
cf. #1939 (comment)
Cause
TwigandJinjalexers share class variables. Both classes definekeywordsmethod like this:If
Twig.keywordsis called beforeJinja.keywords,@@keywordsis set to Twig's and both methods return the same value. If not,@@keywordsis initialized to Jinja's.Solution
I changed class variables to instance variables. Other lexer classes define their keywords as instance variables.