paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-28 18:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

template_parser: Add support for jinja2 whitespace markers.

Browse Source 
Fixes #11516.
This commit is contained in:
Rafid Aslam
2019-04-16 17:54:01 +07:00
committed by Tim Abbott
parent d4893dfcbc
commit d983611919
3 changed files with 106 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/lib/pretty_print.py
View File

@@ -39,7 +39,9 @@ def pretty_print_html(html, num_spaces=4):
for token in tokens:
if token.kind in ('html_start', 'handlebars_start', 'handlebars_singleton',
'html_singleton', 'django_start') and stack[-1]['tag'] != 'pre':
'html_singleton', 'django_start',
'jinja2_whitespace_stripped_type2_start',
'jinja2_whitespace_stripped_start') and stack[-1]['tag'] != 'pre':
# An HTML start tag should only cause a new indent if we
# are on a new line.
if (token.tag not in ('extends', 'include', 'else', 'elif') and
@@ -50,8 +52,12 @@ def pretty_print_html(html, num_spaces=4):
if is_block:
if (((token.kind == 'handlebars_start' and
stack[-1]['token_kind'] == 'handlebars_start') or
(token.kind == 'django_start' and
stack[-1]['token_kind'] == 'django_start')) and
(token.kind in {'django_start',
'jinja2_whitespace_stripped_type2_start',
'jinja2_whitespace_stripped_start'} and
stack[-1]['token_kind'] in {'django_start',
'jinja2_whitespace_stripped_type2_start',
'jinja2_whitespace_stripped_start'})) and
not stack[-1]['indenting']):
info = stack.pop()
info['depth'] = info['depth'] + 1
@@ -94,7 +100,8 @@ def pretty_print_html(html, num_spaces=4):
)
stack.append(info)
elif (token.kind in ('html_end', 'handlebars_end', 'html_singleton_end',
'django_end', 'handlebars_singleton_end') and
'django_end', 'handlebars_singleton_end',
'jinja2_whitespace_stripped_end') and
(stack[-1]['tag'] != 'pre' or token.tag == 'pre')):
info = stack.pop()
if info['block']: