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: Better handle nested lists

Browse source
This commit is contained in:
gregorni 2023-09-17 11:46:15 +02:00
parent f777c531e4
commit 025f2d4dae
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
blueprintcompiler/formatter.py
View file

@ -59,6 +59,7 @@ class Format:
indent_item = " " * tab_size if insert_space else "\t" indent_item = " " * tab_size if insert_space else "\t"
watch_parentheses = False watch_parentheses = False
parentheses_balance = 0 parentheses_balance = 0
bracket_tracker = [None]
def another_newline(one_indent_less=False): def another_newline(one_indent_less=False):
nonlocal end_str nonlocal end_str
@ -133,9 +134,6 @@ class Format:
another_newline() another_newline()
last_not_whitespace = item last_not_whitespace = item
continue continue
else:
NEWLINE_AFTER.append(",")
WHITESPACE_AFTER.remove(",")
indent_levels += 1 indent_levels += 1
commit_current_line( commit_current_line(
@ -154,14 +152,10 @@ class Format:
is_child_type = False is_child_type = False
elif str_item in CLOSING_TOKENS: elif str_item in CLOSING_TOKENS:
if str_item == "]": if str_item == "]" and last_not_whitespace != ",":
NEWLINE_AFTER.remove(",") current_line = current_line[:-1]
WHITESPACE_AFTER.append(",") commit_current_line()
current_line = "]"
if last_not_whitespace != ",":
current_line = current_line[:-1]
commit_current_line()
current_line = "]"
indent_levels -= 1 indent_levels -= 1
commit_current_line( commit_current_line(
@ -182,15 +176,23 @@ class Format:
): ):
watch_parentheses = True watch_parentheses = True
parentheses_balance += 1 parentheses_balance += 1
if ")" in WHITESPACE_AFTER:
WHITESPACE_AFTER.remove(")")
elif str_item == ")" and watch_parentheses: elif str_item == ")" and watch_parentheses:
parentheses_balance -= 1 parentheses_balance -= 1
if parentheses_balance == 0: if parentheses_balance == 0:
commit_current_line() commit_current_line()
if ")" not in WHITESPACE_AFTER: watch_parentheses = False
WHITESPACE_AFTER.append(")")
if str_item in ["[", "("]:
bracket_tracker.append(str_item)
elif str_item in ["]", ")"]:
bracket_tracker.pop()
if len(bracket_tracker) > 0:
if bracket_tracker[-1] == "[" and str_item == ",":
if end_str.strip()[-1] not in ["[", ","]:
end_str = end_str.strip()
commit_current_line()
last_not_whitespace = item last_not_whitespace = item