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

Revert "Formatter: Make tests pass"

Browse source 
This reverts commit be133eaab2.
This commit is contained in:
gregorni 2023-09-27 16:36:19 +02:00
parent be133eaab2
commit 17ab8156fd
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
blueprintcompiler/formatter.py
View file

@ -140,8 +140,8 @@ class Format:
another_newline(True) another_newline(True)
commit_current_line( commit_current_line(
LineType.BLOCK_OPEN, LineType.BLOCK_OPEN,
newlines=2 if prev_line_type in [LineType.CHILD_TYPE, LineType.COMMENT] # newlines=2 if prev_line_type in [LineType.CHILD_TYPE, LineType.COMMENT]
or prev_line_type == LineType.BLOCK_OPEN else 1 # or prev_line_type == LineType.BLOCK_OPEN else 1
) )
elif str_item == "]" and is_child_type: elif str_item == "]" and is_child_type:
@ -165,13 +165,16 @@ class Format:
elif str_item == ";": elif str_item == ";":
if len(current_line) == 1: if len(current_line) == 1:
newlines = 0 newlines=0
elif prev_line_type == LineType.BLOCK_CLOSE: elif prev_line_type == LineType.BLOCK_CLOSE:
newlines = 2 newlines=2
else: else:
newlines = 1 newlines=1
commit_current_line(indent_decrease=True, newlines=newlines) commit_current_line(
indent_decrease=True,
newlines=newlines
)
elif item.type == TokenType.COMMENT: elif item.type == TokenType.COMMENT:
commit_current_line(LineType.COMMENT) commit_current_line(LineType.COMMENT)