Skip to content
This repository has been archived by the owner on Aug 17, 2023. It is now read-only.

Newline Fix #75

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

Newline Fix #75

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e889a44
Update nodes.py to fix newlines on Windows
AndrewHawes Dec 6, 2019
2ac9ecb
Update nodes.py
AndrewHawes Dec 20, 2019
7b466d0
Fix newline problem on Windows
AndrewHawes Dec 20, 2019
2c69df4
Deleted white space from empty lines
AndrewHawes Jan 8, 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
10 changes: 10 additions & 0 deletions hamlpy/parser/nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ def read_node(stream, prev, compiler):
if indent:
indent = indent[0] * len(indent)

# empty lines with carriage returns are recorded as newlines on previous node
# if followed by a newline, it is skipped
if stream.text[stream.ptr] == '\r':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think it would be easier to understand this if it was happening at the stream level.. what if we added def is_newline() and def read_newline() to the Stream class?

if prev:
prev.newlines += 1
stream.ptr += 1
if stream.text[stream.ptr] == '\n':
stream.ptr += 1
continue

# empty lines are recorded as newlines on previous node
if stream.text[stream.ptr] == '\n':
if prev:
Expand Down