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

Revert "formatter.py: bundle adding to end string into function"

Browse source 
This reverts commit d53e027610.
This commit is contained in:
gregorni 2023-08-23 00:01:02 +02:00
parent c9ba06b4a4
commit aee36ca48b
1 changed files with 23 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

49
blueprintcompiler/formatter.py
View file

@ -75,7 +75,7 @@ class Format:
and str(last_not_whitespace) not in NO_WHITESPACE_AFTER and str(last_not_whitespace) not in NO_WHITESPACE_AFTER
and item_as_string not in NO_WHITESPACE_BEFORE and item_as_string not in NO_WHITESPACE_BEFORE
): ):
current_line += " " current_line = current_line + " "
current_line += item_as_string current_line += item_as_string
@ -84,40 +84,27 @@ class Format:
or item.type == tokenizer.TokenType.COMMENT or item.type == tokenizer.TokenType.COMMENT
): ):
if item_as_string in OPENING_TOKENS: if item_as_string in OPENING_TOKENS:
# num_newlines = 1 if prev_line_type == LineType.CHILD_TYPE else 2 # tokenized_str += (
# prev_line_type = LineType.BLOCK_OPEN # ("\n" * num_newlines) + (indent_levels * " ") + current_line
# tokenized_str = (
# tokenized_str.strip()
# + (num_newlines * "\n")
# + (indent_levels * " ")
# ) # )
# current_line += "\n" + (indent_levels * " ")
# tokenized_str += current_line
# current_line = "" # current_line = ""
commit_current_line( num_newlines = 1 if prev_line_type == LineType.CHILD_TYPE else 2
0 if prev_line_type == LineType.CHILD_TYPE else 1, prev_line_type = LineType.BLOCK_OPEN
LineType.BLOCK_OPEN, tokenized_str = (
indent_levels + 1, tokenized_str.strip()
+ (num_newlines * "\n")
+ (indent_levels * " ")
) )
indent_levels += 1 indent_levels += 1
elif item_as_string in CLOSING_TOKENS: elif item_as_string in CLOSING_TOKENS:
# tokenized_str = ( indent_levels -= 1
# tokenized_str.strip() + "\n" + (indent_levels * " ") tokenized_str = (
# ) tokenized_str.strip() + "\n" + (indent_levels * " ")
# current_line += "\n" + (indent_levels * " ") )
# tokenized_str += current_line # tokenized_str += current_line
# current_line = "" # current_line = ""
indent_levels -= 1
commit_current_line(
0,
# LineType.CHILD_TYPE
# if current_line.strip().startswith("[")
# else LineType.BLOCK_CLOSE,
LineType.BLOCK_CLOSE,
indent_levels - 1,
)
# indent_levels -= 1
# prev_line_type = ( # prev_line_type = (
# LineType.CHILD_TYPE # LineType.CHILD_TYPE
@ -125,11 +112,15 @@ class Format:
# else LineType.BLOCK_CLOSE # else LineType.BLOCK_CLOSE
# ) # )
else: current_line += "\n" + (indent_levels * " ")
commit_current_line(0, prev_line_type, indent_levels) tokenized_str += current_line
current_line = ""
last_not_whitespace = item last_not_whitespace = item
# else:
# current_line = current_line.strip() + " "
print(tokenized_str) # TODO: Remove this when the MR is ready to be merged print(tokenized_str) # TODO: Remove this when the MR is ready to be merged
return tokenized_str return tokenized_str