Formatter: Improve indent handling

This commit is contained in:
gregorni 2023-07-26 19:25:23 +02:00
parent fcba91def2
commit 1f999c3405

View file

@ -32,15 +32,13 @@ class Format:
tokenized_str = "" tokenized_str = ""
for index, item in enumerate(tokens): for index, item in enumerate(tokens):
if item.type != tokenizer.TokenType.WHITESPACE: if item.type != tokenizer.TokenType.WHITESPACE:
tokenized_str += str(item)
if str(item) in opening_tokens: if str(item) in opening_tokens:
indent_levels += 1 indent_levels += 1
elif str(item) in closing_tokens:
tokenized_str = tokenized_str[:-2]
indent_levels -= 1
try: tokenized_str += str(item)
if str(tokens[index + 1]) in closing_tokens:
indent_levels -= 1
except:
pass
if str(item) in newline_after + closing_tokens + opening_tokens: if str(item) in newline_after + closing_tokens + opening_tokens:
tokenized_str += "\n" tokenized_str += "\n"