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: adapt to unittest

Browse source
This commit is contained in:
gregorni 2023-09-08 09:56:52 +02:00
parent 13b66e2875
commit 825f6e3b15
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
blueprintcompiler/formatter.py
View file

@ -26,11 +26,17 @@ CLOSING_TOKENS = ["}", "]"]
NEWLINE_AFTER = [";"] + OPENING_TOKENS + CLOSING_TOKENS
NO_WHITESPACE_BEFORE = [",", ":", ";", ")", "."]
NO_WHITESPACE_BEFORE = [",", ":", "::", ";", ")", ".", ">"]
NO_WHITESPACE_AFTER = ["C_", "_", "("]
WHITESPACE_AFTER = [":", ","]
WHITESPACE_BEFORE = ["{"]
# NO_WHITESPACE_BEFORE takes precedence over WHITESPACE_AFTER
WHITESPACE_AFTER = [
":",
",",
">",
")",
]
WHITESPACE_BEFORE = ["{", "$"]
class LineType(Enum):
@ -77,7 +83,11 @@ class Format:
if item.type != tokenizer.TokenType.WHITESPACE:
str_item = str(item)
if item.type == tokenizer.TokenType.QUOTED and str_item.startswith('"'):
str_item = ("'" + str_item[1:-1] + "'").replace('\\"', '"')
str_item = (
"'"
+ str_item[1:-1].replace('\\"', '"').replace("'", "\\'")
+ "'"
)
if (
str_item in WHITESPACE_BEFORE
@ -117,7 +127,10 @@ class Format:
indent_levels += 1
commit_current_line(
1 if prev_line_type == LineType.CHILD_TYPE else 2,
1
if prev_line_type == LineType.CHILD_TYPE
or tokenized_str.strip()[-1] == "{"
else 2,
LineType.BLOCK_OPEN,
)