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: Handle item (a, b, c) syntax

Browse source
This commit is contained in:
gregorni 2023-09-16 15:52:23 +02:00
parent 8dc0abd0ca
commit 8d7103dbe5
1 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
blueprintcompiler/formatter.py
View file

@ -17,6 +17,7 @@
# #
# SPDX-License-Identifier: LGPL-3.0-or-later # SPDX-License-Identifier: LGPL-3.0-or-later
import re
from enum import Enum from enum import Enum
from . import tokenizer from . import tokenizer
@ -56,6 +57,8 @@ class Format:
prev_line_type = None prev_line_type = None
is_child_type = False is_child_type = False
indent_item = " " * tab_size if insert_space else "\t" indent_item = " " * tab_size if insert_space else "\t"
watch_parentheses = False
parentheses_balance = 0
def another_newline(one_indent_less=False): def another_newline(one_indent_less=False):
nonlocal end_str nonlocal end_str
@ -100,15 +103,19 @@ class Format:
) )
if ( if (
str_item in WHITESPACE_BEFORE
and str(last_not_whitespace) not in NO_WHITESPACE_AFTER
) or (
( (
str(last_not_whitespace) in WHITESPACE_AFTER str_item in WHITESPACE_BEFORE
or last_not_whitespace.type == tokenizer.TokenType.IDENT and str(last_not_whitespace) not in NO_WHITESPACE_AFTER
) )
and str(last_not_whitespace) not in NO_WHITESPACE_AFTER or (
and str_item not in NO_WHITESPACE_BEFORE (
str(last_not_whitespace) in WHITESPACE_AFTER
or last_not_whitespace.type == tokenizer.TokenType.IDENT
)
and str(last_not_whitespace) not in NO_WHITESPACE_AFTER
and str_item not in NO_WHITESPACE_BEFORE
)
and len(current_line) > 0
): ):
current_line += " " current_line += " "
@ -172,6 +179,21 @@ class Format:
else: else:
commit_current_line() commit_current_line()
elif str_item == "(" and (
re.match("^([A-Za-z_\-])+\s*\(", current_line) or watch_parentheses
):
watch_parentheses = True
parentheses_balance += 1
if ")" in WHITESPACE_AFTER:
WHITESPACE_AFTER.remove(")")
elif str_item == ")" and watch_parentheses:
parentheses_balance -= 1
if parentheses_balance == 0:
commit_current_line()
if ")" not in WHITESPACE_AFTER:
WHITESPACE_AFTER.append(")")
last_not_whitespace = item last_not_whitespace = item
return end_str return end_str