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: Remove another_newline()

Browse source
This commit is contained in:
gregorni 2023-09-28 17:52:45 +02:00
parent d740c73530
commit a28c6b23a3
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
blueprintcompiler/formatter.py
View file

@ -60,14 +60,6 @@ class Format:
def another_newline(one_indent_less=False): # TODO: Try to remove this function def another_newline(one_indent_less=False): # TODO: Try to remove this function
nonlocal end_str nonlocal end_str
end_str = (
end_str.strip()
+ "\n\n"
+ (
indent_item
* (indent_levels - 1 if one_indent_less else indent_levels)
)
)
def commit_current_line( def commit_current_line(
line_type=prev_line_type, redo_whitespace=False, newlines_before=1 line_type=prev_line_type, redo_whitespace=False, newlines_before=1
@ -122,7 +114,11 @@ class Format:
is_child_type = current_line.startswith("[") is_child_type = current_line.startswith("[")
if is_child_type: if is_child_type:
if str(last_not_whitespace) not in OPENING_TOKENS: if str(last_not_whitespace) not in OPENING_TOKENS:
another_newline() end_str = (
end_str.strip()
+ "\n\n"
+ (indent_item * indent_levels)
)
last_not_whitespace = item last_not_whitespace = item
continue continue
@ -131,9 +127,11 @@ class Format:
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( end_str = (
True end_str.strip()
) # TODO: Do this in the commit_current_line() below + "\n\n"
+ (indent_item * (indent_levels - 1))
)
commit_current_line( commit_current_line(
LineType.BLOCK_OPEN, LineType.BLOCK_OPEN,
) )