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

Adapted new formatting file in main.py

Browse source
This commit is contained in:
gregorni 2023-07-20 18:43:36 +02:00
parent 81734ed3a1
commit 40ea102067
1 changed files with 4 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

33
blueprintcompiler/main.py
View file

@ -26,6 +26,7 @@ import typing as T
from . import decompiler, interactive_port, parser, tokenizer from . import decompiler, interactive_port, parser, tokenizer
from .errors import CompilerBugError, MultipleErrors, PrintableError, report_bug from .errors import CompilerBugError, MultipleErrors, PrintableError, report_bug
from .formatter import Format
from .gir import add_typelib_search_path from .gir import add_typelib_search_path
from .lsp import LanguageServer from .lsp import LanguageServer
from .outputs import XmlOutput from .outputs import XmlOutput
@ -182,15 +183,8 @@ class BlueprintApp:
formatted_files = 0 formatted_files = 0
newline_after = [";", "]"]
opening_tokens = ["{"]
closing_tokens = ["}"]
for file in input_files: for file in input_files:
data = file.read() data = file.read()
indent_levels = 0
try: try:
xml, warnings = self._compile(data) xml, warnings = self._compile(data)
@ -198,34 +192,15 @@ class BlueprintApp:
for warning in warnings: for warning in warnings:
warning.pretty_print(file.name, data, stream=sys.stderr) warning.pretty_print(file.name, data, stream=sys.stderr)
tokens = tokenizer.tokenize(data) formatted_str = Format.format(data)
tokenized_str = "" if data != formatted_str:
for index, item in enumerate(tokens):
if item.type != tokenizer.TokenType.WHITESPACE:
tokenized_str += str(item)
if str(item) in opening_tokens:
indent_levels += 1
try:
if str(tokens[index + 1]) in closing_tokens:
indent_levels -= 1
except:
pass
if str(item) in newline_after + closing_tokens + opening_tokens:
tokenized_str += "\n"
tokenized_str += indent_levels * " "
else:
tokenized_str += " "
if data != tokenized_str:
happened = "Would reformat" happened = "Would reformat"
if not opts.check: if not opts.check:
file.seek(0) file.seek(0)
file.truncate() file.truncate()
file.write(tokenized_str) file.write(formatted_str)
happened = "Reformatted" happened = "Reformatted"
print(f"{Colors.BOLD}{happened} {file.name}{Colors.CLEAR}") print(f"{Colors.BOLD}{happened} {file.name}{Colors.CLEAR}")