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.py: simplify functions

Browse source
This commit is contained in:
gregorni 2023-09-25 14:59:31 +02:00
parent 4acc05cfda
commit 31ce6261b7
1 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

35
blueprintcompiler/formatter.py
View file

@ -74,9 +74,7 @@ class Format:
) )
) )
def commit_current_line( def commit_current_line(line_type=prev_line_type, indent_decrease=False):
two_newlines=False, line_type=prev_line_type, indent_decrease=False
):
nonlocal end_str, current_line, prev_line_type nonlocal end_str, current_line, prev_line_type
whitespace_to_add = "\n" + (indent_levels * indent_item) whitespace_to_add = "\n" + (indent_levels * indent_item)
@ -84,11 +82,6 @@ class Format:
if indent_decrease: if indent_decrease:
end_str = end_str.strip() + whitespace_to_add end_str = end_str.strip() + whitespace_to_add
if two_newlines:
another_newline(
not (current_line[-1] == ";" and prev_line_type == LineType.BLOCK_CLOSE)
)
end_str += current_line + whitespace_to_add end_str += current_line + whitespace_to_add
current_line = "" current_line = ""
@ -134,19 +127,19 @@ class Format:
continue continue
indent_levels += 1 indent_levels += 1
commit_current_line( if not (
not ( prev_line_type in [LineType.CHILD_TYPE, LineType.COMMENT]
prev_line_type
in [LineType.CHILD_TYPE, LineType.COMMENT]
or prev_line_type == LineType.BLOCK_OPEN or prev_line_type == LineType.BLOCK_OPEN
), ):
another_newline(True)
commit_current_line(
LineType.BLOCK_OPEN, LineType.BLOCK_OPEN,
) )
elif str_item == "]" and is_child_type: elif str_item == "]" and is_child_type:
commit_current_line( commit_current_line(
line_type=LineType.CHILD_TYPE, LineType.CHILD_TYPE,
indent_decrease=False, False,
) )
is_child_type = False is_child_type = False
@ -158,17 +151,17 @@ class Format:
indent_levels -= 1 indent_levels -= 1
commit_current_line( commit_current_line(
line_type=LineType.BLOCK_CLOSE, LineType.BLOCK_CLOSE,
indent_decrease=True, True,
) )
elif str_item == ";": elif str_item == ";":
commit_current_line( if prev_line_type == LineType.BLOCK_CLOSE:
two_newlines=prev_line_type == LineType.BLOCK_CLOSE another_newline()
) commit_current_line()
elif item.type == TokenType.COMMENT: elif item.type == TokenType.COMMENT:
commit_current_line(line_type=LineType.COMMENT) commit_current_line(LineType.COMMENT)
else: else:
commit_current_line() commit_current_line()