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

Small change to reduce nesting in variable substitution

Browse Source
This commit is contained in:
Darren Burns
2022-02-02 15:52:04 +00:00
parent 65a6b8d261
commit 62d24650c4
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,27 +245,26 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
token = next(tokens, None)
if not token:
break
if token.name != "variable_value_end":
# For variables referring to other variables
if 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],
)
yield from variable_tokens
else:
raise _unresolved(
variable_name=ref_name, location=token.location
)
else:
variables[variable_name].append(token)
yield token
else:
if token.name == "variable_value_end":
yield token
break
# For variables referring to other variables
if 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],
)
yield from variable_tokens
else:
raise _unresolved(
variable_name=ref_name, location=token.location
)
else:
variables[variable_name].append(token)
yield token
elif token.name == "variable_ref":
variable_name = token.value[1:] # Trim the $, so $x -> x
if variable_name in variables: