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: Make it pass the new tests

Browse source
This commit is contained in:
James Westman 2023-09-28 16:34:08 -05:00
parent abc90d7eae
commit 22ac50b611
1 changed files with 50 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

78
blueprintcompiler/formatter.py
View file

@ -20,7 +20,7 @@
import re import re
from enum import Enum from enum import Enum
from . import tokenizer from . import tokenizer, utils
from .tokenizer import TokenType from .tokenizer import TokenType
OPENING_TOKENS = ("{", "[") OPENING_TOKENS = ("{", "[")
@ -28,12 +28,12 @@ CLOSING_TOKENS = ("}", "]")
NEWLINE_AFTER = tuple(";") + OPENING_TOKENS + CLOSING_TOKENS NEWLINE_AFTER = tuple(";") + OPENING_TOKENS + CLOSING_TOKENS
NO_WHITESPACE_BEFORE = (",", ":", "::", ";", ")", ".", ">", "]") NO_WHITESPACE_BEFORE = (",", ":", "::", ";", ")", ".", ">", "]", "=")
NO_WHITESPACE_AFTER = ("C_", "_", "(") NO_WHITESPACE_AFTER = ("C_", "_", "(", ".", "$", "<", "::", "[", "=")
# NO_WHITESPACE_BEFORE takes precedence over WHITESPACE_AFTER # NO_WHITESPACE_BEFORE takes precedence over WHITESPACE_AFTER
WHITESPACE_AFTER = (":", ",", ">", ")") WHITESPACE_AFTER = (":", ",", ">", ")", "|", "=>")
WHITESPACE_BEFORE = ("{", "$") WHITESPACE_BEFORE = ("{", "|")
class LineType(Enum): class LineType(Enum):
@ -80,31 +80,33 @@ class Format:
if item.type != TokenType.WHITESPACE: if item.type != TokenType.WHITESPACE:
str_item = str(item) str_item = str(item)
if item.type == TokenType.QUOTED and str_item.startswith('"'): if item.type == TokenType.QUOTED and str_item.startswith('"'):
str_item = ( str_item = utils.escape_quote(utils.unescape_quote(str_item))
"'"
+ str_item[1:-1].replace('\\"', '"').replace("'", "\\'")
+ "'"
)
if ( if (
( len(current_line) > 0
and (
str_item in WHITESPACE_BEFORE str_item in WHITESPACE_BEFORE
and str(last_not_whitespace) not in NO_WHITESPACE_AFTER or item.type == TokenType.IDENT
or str(last_not_whitespace) in WHITESPACE_AFTER
or last_not_whitespace.type == TokenType.IDENT
) )
or ( and str_item not in NO_WHITESPACE_BEFORE
( and str(last_not_whitespace) not in NO_WHITESPACE_AFTER
str(last_not_whitespace) in WHITESPACE_AFTER and not (str_item == ":" and current_line.startswith("template "))
or last_not_whitespace.type == TokenType.IDENT and not (
) str_item == "("
and str(last_not_whitespace) not in NO_WHITESPACE_AFTER and not re.match(r"^([A-Za-z_\-])+$", current_line)
and str_item not in NO_WHITESPACE_BEFORE
) )
and len(current_line) > 0
): ):
current_line += " " current_line += " "
current_line += str_item current_line += str_item
if str_item in ["[", "("]:
bracket_tracker.append(str_item)
elif str_item in ["]", ")"]:
bracket_tracker.pop()
if str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT: if str_item in NEWLINE_AFTER or item.type == TokenType.COMMENT:
if str_item in OPENING_TOKENS: if str_item in OPENING_TOKENS:
if str_item == "[": if str_item == "[":
@ -153,17 +155,38 @@ class Format:
) )
elif str_item == ";": elif str_item == ";":
line_type = LineType.STATEMENT
if len(current_line) == 1: if len(current_line) == 1:
newlines = 0 newlines = 0
line_type = LineType.BLOCK_CLOSE
elif prev_line_type == LineType.BLOCK_CLOSE: elif prev_line_type == LineType.BLOCK_CLOSE:
newlines = 2 newlines = 2
else: else:
newlines = 1 newlines = 1
commit_current_line(newlines_before=newlines) commit_current_line(line_type, newlines_before=newlines)
elif item.type == TokenType.COMMENT: elif item.type == TokenType.COMMENT:
commit_current_line(LineType.COMMENT) if str_item.startswith("//"):
newlines = (
2 if prev_line_type == LineType.BLOCK_CLOSE else 1
)
else:
newlines = (
2
if prev_line_type
in [
LineType.BLOCK_CLOSE,
LineType.STATEMENT,
LineType.COMMENT,
]
else 1
)
commit_current_line(
LineType.COMMENT,
newlines_before=newlines,
)
else: else:
commit_current_line() commit_current_line()
@ -177,14 +200,13 @@ class Format:
elif str_item == ")" and watch_parentheses: elif str_item == ")" and watch_parentheses:
parentheses_balance -= 1 parentheses_balance -= 1
if parentheses_balance == 0: if parentheses_balance == 0:
commit_current_line() commit_current_line(
newlines_before=2
if prev_line_type == LineType.BLOCK_CLOSE
else 1
)
watch_parentheses = False watch_parentheses = False
if str_item in ["[", "("]:
bracket_tracker.append(str_item)
elif str_item in ["]", ")"]:
bracket_tracker.pop()
if len(bracket_tracker) > 0: if len(bracket_tracker) > 0:
if bracket_tracker[-1] == "[" and str_item == ",": if bracket_tracker[-1] == "[" and str_item == ",":
if end_str.strip()[-1] not in ["[", ","]: if end_str.strip()[-1] not in ["[", ","]: