alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Trimming leading whitespace from variable definitions when storing their tokens

Browse Source
This commit is contained in:
Darren Burns
2022-02-03 10:17:46 +00:00
parent 62d24650c4
commit 04181dc0b1
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/textual/css/parse.py
View File

@@ -232,6 +232,8 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
but with variables resolved.
"""
variables: dict[str, list[Token]] = defaultdict(list)
# TODO: Trim whitespace before inserting into variables dict instead
# of on reading from it.
while tokens:
token = next(tokens, None)
if token is None:
@@ -241,22 +243,23 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
yield token
# Lookahead for the variable value tokens
leading_whitespace = True
while True:
token = next(tokens, None)
if not token:
break
if token.name == "variable_value_end":
elif leading_whitespace and token.name == "whitespace":
yield token
leading_whitespace = False
elif token.name == "variable_value_end":
yield token
break
# For variables referring to other variables
if token.name == "variable_ref":
elif token.name == "variable_ref":
ref_name = token.value[1:]
if ref_name in variables:
variables[variable_name].extend(variables[ref_name])
variable_tokens = dropwhile(
_is_whitespace,
variables[ref_name],
)
variable_tokens = variables[variable_name]
variable_tokens.extend(variables[ref_name])
yield from variable_tokens
else:
raise _unresolved(
@@ -268,11 +271,7 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
elif token.name == "variable_ref":
variable_name = token.value[1:] # Trim the $, so $x -> x
if variable_name in variables:
variable_tokens = dropwhile(
_is_whitespace,
variables[variable_name],
)
yield from variable_tokens
yield from variables[variable_name]
else:
raise _unresolved(variable_name=variable_name, location=token.location)
else: