Formatter: String default to single quotes

This commit is contained in:
gregorni 2023-08-23 23:53:51 +02:00
parent aa4f23e08b
commit d9fac2897f

View file

@ -57,14 +57,14 @@ class Format:
if indent_decrease: if indent_decrease:
tokenized_str = tokenized_str.strip() + "\n" + (indent_levels * " ") tokenized_str = tokenized_str.strip() + "\n" + (indent_levels * " ")
current_line += "\n" + (indent_levels * " ") if extra_newlines > 0:
tokenized_str += ( tokenized_str = (
current_line tokenized_str.strip()
if extra_newlines == 0 + ("\n" * (extra_newlines + 1))
else ("\n" * extra_newlines) + (" " * (indent_levels - 1))
+ (" " * (indent_levels - 1)) )
+ current_line
) tokenized_str += current_line + "\n" + (indent_levels * " ")
current_line = "" current_line = ""
prev_line_type = line_type prev_line_type = line_type
@ -72,6 +72,8 @@ class Format:
for item in tokens: for item in tokens:
if item.type != tokenizer.TokenType.WHITESPACE: if item.type != tokenizer.TokenType.WHITESPACE:
str_item = str(item) str_item = str(item)
if item.type == tokenizer.TokenType.QUOTED and str_item.startswith('"'):
str_item = ("'" + str_item[1:-1] + "'").replace('\\"', '"')
if ( if (
str_item in WHITESPACE_BEFORE str_item in WHITESPACE_BEFORE