openharmony/third_party_jinja2
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_jinja2 synced 2024-11-23 15:19:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix tokens line number calculation when whitespace stripping is used

Browse Source
This commit is contained in:
Andrey Lisin 2020-03-27 13:20:01 +03:00 committed by David Lord
parent 07b5c01338
commit 77a212bf93
No known key found for this signature in database
GPG Key ID: 7A1C87E3F5BC42A8
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@ -21,6 +21,8 @@ Unreleased
when using Pytest. Due to the difficulty in supporting Python 2 and
:pep:`451` simultaneously, the changes are reverted until 3.0.
:pr:`1182`
- Fix line numbers in error messages when newlines are stripped.
:pr:`1178`
Version 2.11.1

8
src/jinja2/lexer.py
View File

@ -681,6 +681,7 @@ class Lexer(object):
source_length = len(source)
balancing_stack = []
lstrip_unless_re = self.lstrip_unless_re
newlines_stripped = 0
while 1:
# tokenizer loop
@ -717,7 +718,9 @@ class Lexer(object):
if strip_sign == "-":
# Strip all whitespace between the text and the tag.
groups = (text.rstrip(),) + groups[1:]
stripped = text.rstrip()
newlines_stripped = text[len(stripped) :].count("\n")
groups = (stripped,) + groups[1:]
elif (
# Not marked for preserving whitespace.
strip_sign != "+"
@ -758,7 +761,8 @@ class Lexer(object):
data = groups[idx]
if data or token not in ignore_if_empty:
yield lineno, token, data
lineno += data.count("\n")
lineno += data.count("\n") + newlines_stripped
newlines_stripped = 0
# strings as token just are yielded as it.
else:

18
tests/test_lexnparse.py
View File

@ -178,6 +178,24 @@ class TestLexer(object):
else:
pytest.raises(TemplateSyntaxError, env.from_string, t)
def test_lineno_with_strip(self, env):
tokens = env.lex(
"""\
<html>
<body>
{%- block content -%}
<hr>
{{ item }}
{% endblock %}
</body>
</html>"""
)
for tok in tokens:
lineno, token_type, value = tok
if token_type == "name" and value == "item":
assert lineno == 5
break
class TestParser(object):
def test_php_syntax(self, env):