Siklos/blueprint-compiler
1
0
Fork 0
mirror of https://gitlab.gnome.org/jwestman/blueprint-compiler.git synced 2025-05-04 15:59:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formatter: Make tests pass

Browse source
This commit is contained in:
gregorni 2023-09-27 16:34:46 +02:00
parent 31ce6261b7
commit ad1ea4f51f
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
blueprintcompiler/formatter.py
View file

@ -74,10 +74,16 @@ class Format:
)
)
def commit_current_line(line_type=prev_line_type, indent_decrease=False):
def commit_current_line(
line_type=prev_line_type, indent_decrease=False, newlines=1
):
nonlocal end_str, current_line, prev_line_type
whitespace_to_add = "\n" + (indent_levels * indent_item)
whitespace_to_add = (
("\n" * newlines) + (indent_levels * indent_item)
if newlines > 0
else ""
)
if indent_decrease:
end_str = end_str.strip() + whitespace_to_add
@ -134,6 +140,8 @@ class Format:
another_newline(True)
commit_current_line(
LineType.BLOCK_OPEN,
# newlines=2 if prev_line_type in [LineType.CHILD_TYPE, LineType.COMMENT]
# or prev_line_type == LineType.BLOCK_OPEN else 1
)
elif str_item == "]" and is_child_type:
@ -156,9 +164,17 @@ class Format:
)
elif str_item == ";":
if prev_line_type == LineType.BLOCK_CLOSE:
another_newline()
commit_current_line()
if len(current_line) == 1:
newlines=0
elif prev_line_type == LineType.BLOCK_CLOSE:
newlines=2
else:
newlines=1
commit_current_line(
indent_decrease=True,
newlines=newlines
)
elif item.type == TokenType.COMMENT:
commit_current_line(LineType.COMMENT)