Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Record start_line end_line into node build with token tagged "data" #1132

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Record start_line end_line into node build with token tagged "data" #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff84099
Add end_line attribute to node build with token tagged "data"
Thomasb81 Jan 25, 2020
b3e788a
Fix regression
Thomasb81 Jan 25, 2020
19e16bb
Fix style
Thomasb81 Jan 25, 2020
8ac9714
Merge remote-tracking branch 'origin/master' into master-remote
Thomasb81 Jul 24, 2020
32d0893
Fix style
Thomasb81 Jul 24, 2020
dfa8f88
Merge remote-tracking branch 'origin/master' into master-remote
Thomasb81 Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/jinja2/nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class Node(metaclass=NodeType):
"""

fields = ()
attributes = ("lineno", "environment")
attributes = ("lineno", "environment", "end_line")
abstract = True

def __init__(self, *fields, **attributes):
Expand Down
8 changes: 7 additions & 1 deletion src/jinja2/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,13 @@ def subparse(self, end_tokens=None):
def flush_data():
if data_buffer:
lineno = data_buffer[0].lineno
body.append(nodes.Output(data_buffer[:], lineno=lineno))
if hasattr(data_buffer[0], "data"):
end_line = lineno + data_buffer[0].data.count("\n")
body.append(
nodes.Output(data_buffer[:], lineno=lineno, end_line=end_line)
)
else:
body.append(nodes.Output(data_buffer[:], lineno=lineno))
del data_buffer[:]

try:
Expand Down