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: Insert newline before some child types

Browse source
This commit is contained in:
gregorni 2023-08-24 17:05:25 +02:00
parent 35e96964da
commit afba576da0
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
blueprintcompiler/formatter.py
View file

@ -48,19 +48,20 @@ class Format:
last_not_whitespace = tokens[0] last_not_whitespace = tokens[0]
current_line = "" current_line = ""
prev_line_type = None prev_line_type = None
is_child_type = False
def commit_current_line( def commit_current_line(
extra_newlines=0, line_type=prev_line_type, indent_decrease=False extra_newlines=1, line_type=prev_line_type, indent_decrease=False
): ):
nonlocal tokenized_str, current_line, prev_line_type nonlocal tokenized_str, current_line, prev_line_type
if indent_decrease: if indent_decrease:
tokenized_str = tokenized_str.strip() + "\n" + (indent_levels * " ") tokenized_str = tokenized_str.strip() + "\n" + (indent_levels * " ")
if extra_newlines > 0: if extra_newlines > 1:
tokenized_str = ( tokenized_str = (
tokenized_str.strip() tokenized_str.strip()
+ ("\n" * (extra_newlines + 1)) + ("\n" * (extra_newlines))
+ (" " * (indent_levels - 1)) + (" " * (indent_levels - 1))
) )
@ -99,6 +100,12 @@ class Format:
is_child_type = (current_line + "[").startswith("[") is_child_type = (current_line + "[").startswith("[")
if is_child_type: if is_child_type:
NO_WHITESPACE_BEFORE.append("]") NO_WHITESPACE_BEFORE.append("]")
if str(last_not_whitespace) not in OPENING_TOKENS:
tokenized_str = (
tokenized_str.strip()
+ "\n\n"
+ (indent_levels * " ")
)
last_not_whitespace = item last_not_whitespace = item
continue continue
else: else:
@ -107,7 +114,7 @@ class Format:
indent_levels += 1 indent_levels += 1
commit_current_line( commit_current_line(
0 if prev_line_type == LineType.CHILD_TYPE else 1, 1 if prev_line_type == LineType.CHILD_TYPE else 2,
LineType.BLOCK_OPEN, LineType.BLOCK_OPEN,
) )
@ -115,7 +122,6 @@ class Format:
if str_item == "]": if str_item == "]":
if is_child_type: if is_child_type:
NO_WHITESPACE_BEFORE.remove("]") NO_WHITESPACE_BEFORE.remove("]")
is_child_type = False
indent_levels += 1 indent_levels += 1
else: else:
WHITESPACE_AFTER.append(",") WHITESPACE_AFTER.append(",")
@ -123,13 +129,15 @@ class Format:
indent_levels -= 1 indent_levels -= 1
commit_current_line( commit_current_line(
0, 1,
LineType.CHILD_TYPE LineType.CHILD_TYPE
if current_line.startswith("[") if is_child_type
else LineType.BLOCK_CLOSE, else LineType.BLOCK_CLOSE,
True, not is_child_type,
) )
is_child_type = False
else: else:
commit_current_line() commit_current_line()

3
blueprintcompiler/main.py
View file

@ -207,6 +207,7 @@ class BlueprintApp:
a_lines = data.splitlines(keepends=True) a_lines = data.splitlines(keepends=True)
b_lines = formatted_str.splitlines(keepends=True) b_lines = formatted_str.splitlines(keepends=True)
diff_lines = [] diff_lines = []
for line in difflib.unified_diff( for line in difflib.unified_diff(
a_lines, b_lines, fromfile=file.name, tofile=file.name, n=5 a_lines, b_lines, fromfile=file.name, tofile=file.name, n=5
): ):
@ -220,7 +221,7 @@ class BlueprintApp:
diff_lines.append("\\ No newline at end of file\n") diff_lines.append("\\ No newline at end of file\n")
print( print(
f"\n{Colors.BOLD}{happened} {file.name}{Colors.CLEAR}:\n\n"+ "".join(diff_lines) f"{''.join(diff_lines)}\n{Colors.BOLD}{happened} {file.name}{Colors.CLEAR}\n"
) )
formatted_files += 1 formatted_files += 1