From d9fac2897ffbe5645c71ba929b7a8afb43a76d10 Mon Sep 17 00:00:00 2001 From: gregorni Date: Wed, 23 Aug 2023 23:53:51 +0200 Subject: [PATCH] Formatter: String default to single quotes --- blueprintcompiler/formatter.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/blueprintcompiler/formatter.py b/blueprintcompiler/formatter.py index 2664c27..6a1f255 100644 --- a/blueprintcompiler/formatter.py +++ b/blueprintcompiler/formatter.py @@ -57,14 +57,14 @@ class Format: if indent_decrease: tokenized_str = tokenized_str.strip() + "\n" + (indent_levels * " ") - current_line += "\n" + (indent_levels * " ") - tokenized_str += ( - current_line - if extra_newlines == 0 - else ("\n" * extra_newlines) - + (" " * (indent_levels - 1)) - + current_line - ) + if extra_newlines > 0: + tokenized_str = ( + tokenized_str.strip() + + ("\n" * (extra_newlines + 1)) + + (" " * (indent_levels - 1)) + ) + + tokenized_str += current_line + "\n" + (indent_levels * " ") current_line = "" prev_line_type = line_type @@ -72,6 +72,8 @@ class Format: for item in tokens: 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('\\"', '"') if ( str_item in WHITESPACE_BEFORE