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: No newline between comments and opening tokens

Browse source
This commit is contained in:
gregorni 2023-09-17 14:43:11 +02:00
parent 2851dffe06
commit 91e00ee6ac
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
blueprintcompiler/formatter.py
View file

@ -45,6 +45,7 @@ class LineType(Enum):
BLOCK_OPEN = 1 BLOCK_OPEN = 1
BLOCK_CLOSE = 2 BLOCK_CLOSE = 2
CHILD_TYPE = 3 CHILD_TYPE = 3
COMMENT = 3
class Format: class Format:
@ -142,7 +143,7 @@ class Format:
indent_levels += 1 indent_levels += 1
commit_current_line( commit_current_line(
not ( not (
prev_line_type == LineType.CHILD_TYPE prev_line_type in [LineType.CHILD_TYPE, LineType.COMMENT]
or last_added_char in OPENING_TOKENS or last_added_char in OPENING_TOKENS
), ),
LineType.BLOCK_OPEN, LineType.BLOCK_OPEN,
@ -167,11 +168,14 @@ class Format:
indent_decrease=True, indent_decrease=True,
) )
elif str_item == ";" and len(end_str) > 0: elif str_item == ";":
commit_current_line( commit_current_line(
two_newlines=prev_line_type == LineType.BLOCK_CLOSE two_newlines=prev_line_type == LineType.BLOCK_CLOSE
) )
elif item.type == tokenizer.TokenType.COMMENT:
commit_current_line(line_type=LineType.COMMENT)
else: else:
commit_current_line() commit_current_line()