Skip to content

Commit 5d3e742

Browse files
committed
fix regex && add test
1 parent 773b6bd commit 5d3e742

4 files changed

Lines changed: 53 additions & 12 deletions

File tree

‎mako/lexer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,11 @@ def match_text(self):
357357
r"""
358358
(.*?) # anything, followed by:
359359
(
360-
((?<=\n)|^)(?=[ \t]*(?=%|\#\#)) # an eval or line-based
361-
# comment preceded by a
362-
# consumed newline and whitespace
360+
(?<=\n)(?=[ \t]*(?=%(?!%)|\#\#)) # an eval or line-based
361+
# comment, preceded by a
362+
# consumed newline and whitespace
363363
|
364-
(?<!%)(?=%%+)
364+
(?<!%)(?=%%+) # consume the first percent sign out of a group of percent signs
365365
|
366366
(?=\${) # an expression
367367
|

‎mako/testing/helpers.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ def result_lines(result):
1818
if x.strip() != ""
1919
]
2020

21+
def result_raw_lines(result):
22+
return [
23+
x
24+
for x in re.split(r"\r?\n", result)
25+
if x.strip() != ""
26+
]
27+
2128

2229
def make_path(
2330
filespec: Union[Path, str],

‎test/test_lexer.py‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ def test_percent_escape(self):
201201
{},
202202
[
203203
Text("""\n\n""", (1, 1)),
204-
Text("""% some whatever.\n\n""", (3, 2)),
205-
Text(" ", (5, 2)),
204+
Text("""% some whatever.\n\n """, (3, 2)),
206205
Text("% more some whatever\n", (5, 6)),
207206
ControlLine("if", "if foo:", False, (6, 1)),
208207
ControlLine("if", "endif", True, (7, 1)),
@@ -224,12 +223,33 @@ def test_percent_escape2(self):
224223
{},
225224
[
226225
Text("% do something\n", (1, 2)),
227-
Text("%% do something\nif <some condition>:\n", (2, 2)),
228-
Text(" ", (4, 2)),
226+
Text("%% do something\nif <some condition>:\n ", (2, 2)),
229227
Text("%%% do something\n ", (4, 6)),
230228
],
231229
),
232230
)
231+
232+
def test_percent_escape_with_control_block(self):
233+
template = """
234+
% for i in [1, 2, 3]:
235+
%% do something ${i}
236+
% endfor
237+
"""
238+
node = Lexer(template).parse()
239+
self._compare(
240+
node,
241+
TemplateNode(
242+
{},
243+
[
244+
Text('\n', (1, 1)),
245+
ControlLine('for', 'for i in [1, 2, 3]:', False, (2, 1)),
246+
Text(' ', (3, 1)),
247+
Text('% do something ', (3, 6)),
248+
Expression('i', [], (3, 21)),
249+
Text('\n', (3, 25)),
250+
ControlLine('for', 'endfor', True, (4, 1))]
251+
),
252+
)
233253

234254
def test_old_multiline_comment(self):
235255
template = """#*"""

‎test/test_template.py‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from mako.testing.config import config
1515
from mako.testing.fixtures import TemplateTest
1616
from mako.testing.helpers import flatten_result
17-
from mako.testing.helpers import result_lines
17+
from mako.testing.helpers import result_lines, result_raw_lines
1818

1919

2020
class ctx:
@@ -1672,15 +1672,29 @@ def test_future_import(self):
16721672
class EscapeTest(TemplateTest):
16731673
def test_percent_escape(self):
16741674
t = Template(
1675-
"""%% do something
1675+
"""%% do something
16761676
%%% do something
16771677
if <some condition>:
16781678
%%%% do something
16791679
"""
16801680
)
1681-
assert result_lines(t.render()) == [
1681+
assert result_raw_lines(t.render()) == [
16821682
"% do something",
16831683
"%% do something",
16841684
"if <some condition>:",
1685-
"%%% do something",
1685+
" %%% do something",
1686+
]
1687+
1688+
def test_percent_escape2(self):
1689+
t = Template(
1690+
"""
1691+
% for i in [1, 2, 3]:
1692+
%% do something ${i}
1693+
% endfor
1694+
"""
1695+
)
1696+
assert result_raw_lines(t.render()) == [
1697+
" % do something 1",
1698+
" % do something 2",
1699+
" % do something 3",
16861700
]

0 commit comments

Comments
 (0)