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

Highlighting correct span of code when variable of incorrect type is used

Browse Source
This commit is contained in:
Darren Burns
2022-02-03 14:19:54 +00:00
parent c18b1b9fed
commit 33e8bc4584
6 changed files with 180 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/textual/css/_styles_builder.py
View File

@@ -67,7 +67,7 @@ class StylesBuilder:
def process_display(self, name: str, tokens: list[Token], important: bool) -> None: def process_display(self, name: str, tokens: list[Token], important: bool) -> None:
for token in tokens: for token in tokens:
name, value, _, _, location = token name, value, _, _, location, _ = token
if name == "token": if name == "token":
value = value.lower() value = value.lower()
@@ -110,7 +110,7 @@ class StylesBuilder:
self, name: str, tokens: list[Token], important: bool self, name: str, tokens: list[Token], important: bool
) -> None: ) -> None:
for token in tokens: for token in tokens:
name, value, _, _, location = token name, value, _, _, location, _ = token
if name == "token": if name == "token":
value = value.lower() value = value.lower()
if value in VALID_VISIBILITY: if value in VALID_VISIBILITY:
@@ -128,7 +128,7 @@ class StylesBuilder:
space: list[int] = [] space: list[int] = []
append = space.append append = space.append
for token in tokens: for token in tokens:
(token_name, value, _, _, location) = token token_name, value, _, _, location, _ = token
if token_name in ("number", "scalar"): if token_name in ("number", "scalar"):
try: try:
append(int(value)) append(int(value))
@@ -158,7 +158,7 @@ class StylesBuilder:
style_tokens: list[str] = [] style_tokens: list[str] = []
append = style_tokens.append append = style_tokens.append
for token in tokens: for token in tokens:
token_name, value, _, _, _ = token token_name, value, _, _, _, _ = token
if token_name == "token": if token_name == "token":
if value in VALID_BORDER: if value in VALID_BORDER:
border_type = value border_type = value

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

@@ -260,8 +260,13 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
reference_tokens = variables[ref_name] reference_tokens = variables[ref_name]
variable_tokens.extend(reference_tokens) variable_tokens.extend(reference_tokens)
ref_location = token.location ref_location = token.location
ref_length = token.length
for token in reference_tokens: for token in reference_tokens:
yield token.with_location(location=ref_location)
yield token.as_reference(
location=ref_location,
length=ref_length,
)
else: else:
raise _unresolved( raise _unresolved(
variable_name=ref_name, location=token.location variable_name=ref_name, location=token.location
@@ -274,8 +279,12 @@ def substitute_references(tokens: Iterator[Token]) -> Iterable[Token]:
if variable_name in variables: if variable_name in variables:
variable_tokens = variables[variable_name] variable_tokens = variables[variable_name]
ref_location = token.location ref_location = token.location
ref_length = token.length
for token in variable_tokens: for token in variable_tokens:
yield token.with_location(ref_location) yield token.as_reference(
location=ref_location,
length=ref_length,
)
else: else:
raise _unresolved(variable_name=variable_name, location=token.location) raise _unresolved(variable_name=variable_name, location=token.location)
else: else:

5
src/textual/css/stylesheet.py
View File

@@ -47,11 +47,8 @@ class StylesheetErrors:
for rule in self.stylesheet.rules: for rule in self.stylesheet.rules:
for token, message in rule.errors: for token, message in rule.errors:
line_no, col_no = token.location line_no, col_no = token.location
append(highlighter(f"{token.path or '<unknown>'}:{line_no}")) append(highlighter(f"{token.path or '<unknown>'}:{line_no}"))
append( append(self._get_snippet(token.code, line_no, col_no, token.length + 1))
self._get_snippet(token.code, line_no, col_no, len(token.value) + 1)
)
append(highlighter(Text(message, "red"))) append(highlighter(Text(message, "red")))
append("") append("")
return Group(*errors) return Group(*errors)

22
src/textual/css/tokenizer.py
View File

@@ -4,6 +4,7 @@ import re
from typing import NamedTuple from typing import NamedTuple
import rich.repr import rich.repr
from rich.cells import cell_len
class EOFError(Exception): class EOFError(Exception):
@@ -45,9 +46,17 @@ class Token(NamedTuple):
path: str path: str
code: str code: str
location: tuple[int, int] location: tuple[int, int]
length: int
def with_location(self, location: tuple[int, int]) -> "Token": def as_reference(self, location: tuple[int, int], length: int) -> "Token":
return Token(**self, location=location) return Token(
name=self.name,
value=self.value,
path=self.path,
code=self.code,
location=location,
length=length,
)
def __str__(self) -> str: def __str__(self) -> str:
return self.value return self.value
@@ -57,6 +66,7 @@ class Token(NamedTuple):
yield "value", self.value yield "value", self.value
yield "path", self.path yield "path", self.path
yield "location", self.location yield "location", self.location
yield "length", self.length
class Tokenizer: class Tokenizer:
@@ -72,7 +82,9 @@ class Tokenizer:
col_no = self.col_no col_no = self.col_no
if line_no >= len(self.lines): if line_no >= len(self.lines):
if expect._expect_eof: if expect._expect_eof:
return Token("eof", "", self.path, self.code, (line_no, col_no)) return Token(
"eof", "", self.path, self.code, (line_no, col_no), length=0
)
else: else:
raise EOFError() raise EOFError()
line = self.lines[line_no] line = self.lines[line_no]
@@ -90,7 +102,9 @@ class Tokenizer:
if value is not None: if value is not None:
break break
token = Token(name, value, self.path, self.code, (line_no, col_no)) token = Token(
name, value, self.path, self.code, (line_no, col_no), length=cell_len(value)
)
col_no += len(value) col_no += len(value)
if col_no >= len(line): if col_no >= len(line):
line_no += 1 line_no += 1

142
tests/css/test_parse.py
View File

@@ -16,35 +16,35 @@ class TestVariableReferenceSubstitution:
css = "$x: 1; #some-widget{border: $x;}" css = "$x: 1; #some-widget{border: $x;}"
variables = substitute_references(tokenize(css, "")) variables = substitute_references(tokenize(css, ""))
assert list(variables) == [ assert list(variables) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='number', value='1', path='', code=css, location=(0, 4)), Token(name='number', value='1', path='', code=css, location=(0, 4), length=1),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 5)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 5), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 6)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 6), length=1),
Token(name='selector_start_id', value='#some-widget', path='', code=css, location=(0, 7)), Token(name='selector_start_id', value='#some-widget', path='', code=css, location=(0, 7), length=12),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 19)), Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 19), length=1),
Token(name='declaration_name', value='border:', path='', code=css, location=(0, 20)), Token(name='declaration_name', value='border:', path='', code=css, location=(0, 20), length=7),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 27)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 27), length=1),
Token(name='number', value='1', path='', code=css, location=(0, 4)), Token(name='number', value='1', path='', code=css, location=(0, 28), length=2),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 30)), Token(name='declaration_end', value=';', path='', code=css, location=(0, 30), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 31)) Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 31), length=1)
] ]
def test_simple_reference_no_whitespace(self): def test_simple_reference_no_whitespace(self):
css = "$x:1; #some-widget{border: $x;}" css = "$x:1; #some-widget{border: $x;}"
variables = substitute_references(tokenize(css, "")) variables = substitute_references(tokenize(css, ""))
assert list(variables) == [ assert list(variables) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='number', value='1', path='', code=css, location=(0, 3)), Token(name='number', value='1', path='', code=css, location=(0, 3), length=1),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 4)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 4), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), length=1),
Token(name='selector_start_id', value='#some-widget', path='', code=css, location=(0, 6)), Token(name='selector_start_id', value='#some-widget', path='', code=css, location=(0, 6), length=12),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 18)), Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 18), length=1),
Token(name='declaration_name', value='border:', path='', code=css, location=(0, 19)), Token(name='declaration_name', value='border:', path='', code=css, location=(0, 19), length=7),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 26)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 26), length=1),
Token(name='number', value='1', path='', code=css, location=(0, 3)), Token(name='number', value='1', path='', code=css, location=(0, 27), length=2),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 29)), Token(name='declaration_end', value=';', path='', code=css, location=(0, 29), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 30)) Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 30), length=1)
] ]
def test_undefined_variable(self): def test_undefined_variable(self):
@@ -55,59 +55,59 @@ class TestVariableReferenceSubstitution:
def test_transitive_reference(self): def test_transitive_reference(self):
css = "$x: 1\n$y: $x\n.thing { border: $y }" css = "$x: 1\n$y: $x\n.thing { border: $y }"
assert list(substitute_references(tokenize(css, ""))) == [ assert list(substitute_references(tokenize(css, ""))) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='number', value='1', path='', code=css, location=(0, 4)), Token(name='number', value='1', path='', code=css, location=(0, 4), length=1),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 5)), Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 5), length=1),
Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0)), Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), length=1),
Token(name='number', value='1', path='', code=css, location=(0, 4)), Token(name='number', value='1', path='', code=css, location=(1, 4), length=2),
Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 6)), Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 6), length=1),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0)), Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0), length=6),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 6)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 6), length=1),
Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7)), Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 8)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 8), length=1),
Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9)), Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9), length=7),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 16)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 16), length=1),
Token(name='number', value='1', path='', code=css, location=(0, 4)), Token(name='number', value='1', path='', code=css, location=(2, 17), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 19)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 19), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20)) Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20), length=1)
] ]
def test_multi_value_variable(self): def test_multi_value_variable(self):
css = "$x: 2 4\n$y: 6 $x 2\n.thing { border: $y }" css = "$x: 2 4\n$y: 6 $x 2\n.thing { border: $y }"
assert list(substitute_references(tokenize(css, ""))) == [ assert list(substitute_references(tokenize(css, ""))) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='number', value='2', path='', code=css, location=(0, 4)), Token(name='number', value='2', path='', code=css, location=(0, 4), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), length=1),
Token(name='number', value='4', path='', code=css, location=(0, 6)), Token(name='number', value='4', path='', code=css, location=(0, 6), length=1),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 7)), Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 7), length=1),
Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0)), Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), length=1),
Token(name='number', value='6', path='', code=css, location=(1, 4)), Token(name='number', value='6', path='', code=css, location=(1, 4), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(1, 5), length=1),
Token(name='number', value='2', path='', code=css, location=(0, 4)), Token(name='number', value='2', path='', code=css, location=(1, 6), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(1, 6), length=2),
Token(name='number', value='4', path='', code=css, location=(0, 6)), Token(name='number', value='4', path='', code=css, location=(1, 6), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 8)), Token(name='whitespace', value=' ', path='', code=css, location=(1, 8), length=1),
Token(name='number', value='2', path='', code=css, location=(1, 9)), Token(name='number', value='2', path='', code=css, location=(1, 9), length=1),
Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 10)), Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 10), length=1),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0)), Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0), length=6),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 6)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 6), length=1),
Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7)), Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 8)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 8), length=1),
Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9)), Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9), length=7),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 16)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 16), length=1),
Token(name='number', value='6', path='', code=css, location=(1, 4)), Token(name='number', value='6', path='', code=css, location=(2, 17), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 17), length=2),
Token(name='number', value='2', path='', code=css, location=(0, 4)), Token(name='number', value='2', path='', code=css, location=(2, 17), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 17), length=2),
Token(name='number', value='4', path='', code=css, location=(0, 6)), Token(name='number', value='4', path='', code=css, location=(2, 17), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 8)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 17), length=2),
Token(name='number', value='2', path='', code=css, location=(1, 9)), Token(name='number', value='2', path='', code=css, location=(2, 17), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 19)), Token(name='whitespace', value=' ', path='', code=css, location=(2, 19), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20)) Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20), length=1)
] ]

152
tests/css/test_tokenize.py
View File

@@ -20,67 +20,65 @@ VALID_VARIABLE_NAMES = [
def test_variable_declaration_valid_names(name): def test_variable_declaration_valid_names(name):
css = f"${name}: black on red;" css = f"${name}: black on red;"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token( Token(name='variable_name', value=f'${name}:', path='', code=css, location=(0, 0), length=14),
name="variable_name", value=f"${name}:", path="", code=css, location=(0, 0) Token(name='whitespace', value=' ', path='', code=css, location=(0, 14), length=1),
), Token(name='token', value='black', path='', code=css, location=(0, 15), length=5),
Token(name="whitespace", value=" ", path="", code=css, location=(0, 14)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 20), length=1),
Token(name="token", value="black", path="", code=css, location=(0, 15)), Token(name='token', value='on', path='', code=css, location=(0, 21), length=2),
Token(name="whitespace", value=" ", path="", code=css, location=(0, 20)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 23), length=1),
Token(name="token", value="on", path="", code=css, location=(0, 21)), Token(name='token', value='red', path='', code=css, location=(0, 24), length=3),
Token(name="whitespace", value=" ", path="", code=css, location=(0, 23)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 27), length=1),
Token(name="token", value="red", path="", code=css, location=(0, 24)),
Token(name="variable_value_end", value=";", path="", code=css, location=(0, 27)),
] ]
def test_variable_declaration_multiple_values(): def test_variable_declaration_multiple_values():
css = "$x: 2vw\t4% 6s red;" css = "$x: 2vw\t4% 6s red;"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='scalar', value='2vw', path='', code=css, location=(0, 4)), Token(name='scalar', value='2vw', path='', code=css, location=(0, 4), length=3),
Token(name='whitespace', value='\t', path='', code=css, location=(0, 7)), Token(name='whitespace', value='\t', path='', code=css, location=(0, 7), length=0),
Token(name='scalar', value='4%', path='', code=css, location=(0, 8)), Token(name='scalar', value='4%', path='', code=css, location=(0, 8), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 10)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 10), length=1),
Token(name='duration', value='6s', path='', code=css, location=(0, 11)), Token(name='duration', value='6s', path='', code=css, location=(0, 11), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 13)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 13), length=2),
Token(name='token', value='red', path='', code=css, location=(0, 15)), Token(name='token', value='red', path='', code=css, location=(0, 15), length=3),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 18)) Token(name='variable_value_end', value=';', path='', code=css, location=(0, 18), length=1),
] ]
def test_variable_declaration_comment_ignored(): def test_variable_declaration_comment_ignored():
css = "$x: red; /* comment */" css = "$x: red; /* comment */"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='token', value='red', path='', code=css, location=(0, 4)), Token(name='token', value='red', path='', code=css, location=(0, 4), length=3),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 7)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 7), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 8)) Token(name='whitespace', value=' ', path='', code=css, location=(0, 8), length=1),
] ]
def test_variable_declaration_comment_interspersed_ignored(): def test_variable_declaration_comment_interspersed_ignored():
css = "$x: re/* comment */d;" css = "$x: re/* comment */d;"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='token', value='re', path='', code=css, location=(0, 4)), Token(name='token', value='re', path='', code=css, location=(0, 4), length=2),
Token(name='token', value='d', path='', code=css, location=(0, 19)), Token(name='token', value='d', path='', code=css, location=(0, 19), length=1),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 20)) Token(name='variable_value_end', value=';', path='', code=css, location=(0, 20), length=1),
] ]
def test_variable_declaration_no_semicolon(): def test_variable_declaration_no_semicolon():
css = "$x: 1\n$y: 2" css = "$x: 1\n$y: 2"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name="variable_name", value="$x:", code=css, path="", location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name="whitespace", value=" ", code=css, path="", location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name="number", value="1", code=css, path="", location=(0, 4)), Token(name='number', value='1', path='', code=css, location=(0, 4), length=1),
Token(name="variable_value_end", value="\n", code=css, path="", location=(0, 5)), Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 5), length=1),
Token(name="variable_name", value="$y:", code=css, path="", location=(1, 0)), Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), length=3),
Token(name="whitespace", value=" ", code=css, path="", location=(1, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), length=1),
Token(name="number", value="2", code=css, path="", location=(1, 4)), Token(name='number', value='2', path='', code=css, location=(1, 4), length=1),
] ]
@@ -94,68 +92,68 @@ def test_variables_declarations_amongst_rulesets():
css = "$x:1; .thing{text:red;} $y:2;" css = "$x:1; .thing{text:red;} $y:2;"
tokens = list(tokenize(css, "")) tokens = list(tokenize(css, ""))
assert tokens == [ assert tokens == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='number', value='1', path='', code=css, location=(0, 3)), Token(name='number', value='1', path='', code=css, location=(0, 3), length=1),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 4)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 4), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), length=1),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(0, 6)), Token(name='selector_start_class', value='.thing', path='', code=css, location=(0, 6), length=6),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 12)), Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 12), length=1),
Token(name='declaration_name', value='text:', path='', code=css, location=(0, 13)), Token(name='declaration_name', value='text:', path='', code=css, location=(0, 13), length=5),
Token(name='token', value='red', path='', code=css, location=(0, 18)), Token(name='token', value='red', path='', code=css, location=(0, 18), length=3),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 21)), Token(name='declaration_end', value=';', path='', code=css, location=(0, 21), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 22)), Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 22), length=1),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 23)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 23), length=1),
Token(name='variable_name', value='$y:', path='', code=css, location=(0, 24)), Token(name='variable_name', value='$y:', path='', code=css, location=(0, 24), length=3),
Token(name='number', value='2', path='', code=css, location=(0, 27)), Token(name='number', value='2', path='', code=css, location=(0, 27), length=1),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 28)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 28), length=1),
] ]
def test_variables_reference_in_rule_declaration_value(): def test_variables_reference_in_rule_declaration_value():
css = ".warn{text: $warning;}" css = ".warn{text: $warning;}"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='selector_start_class', value='.warn', path='', code=css, location=(0, 0)), Token(name='selector_start_class', value='.warn', path='', code=css, location=(0, 0), length=5),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 5)), Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 5), length=1),
Token(name='declaration_name', value='text:', path='', code=css, location=(0, 6)), Token(name='declaration_name', value='text:', path='', code=css, location=(0, 6), length=5),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 11)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 11), length=1),
Token(name='variable_ref', value='$warning', path='', code=css, location=(0, 12)), Token(name='variable_ref', value='$warning', path='', code=css, location=(0, 12), length=8),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 20)), Token(name='declaration_end', value=';', path='', code=css, location=(0, 20), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 21)), Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 21), length=1),
] ]
def test_variables_reference_in_rule_declaration_value_multiple(): def test_variables_reference_in_rule_declaration_value_multiple():
css = ".card{padding: $pad-y $pad-x;}" css = ".card{padding: $pad-y $pad-x;}"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='selector_start_class', value='.card', path='', code=css, location=(0, 0)), Token(name='selector_start_class', value='.card', path='', code=css, location=(0, 0), length=5),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 5)), Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 5), length=1),
Token(name='declaration_name', value='padding:', path='', code=css, location=(0, 6)), Token(name='declaration_name', value='padding:', path='', code=css, location=(0, 6), length=8),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 14)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 14), length=1),
Token(name='variable_ref', value='$pad-y', path='', code=css, location=(0, 15)), Token(name='variable_ref', value='$pad-y', path='', code=css, location=(0, 15), length=6),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 21)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 21), length=1),
Token(name='variable_ref', value='$pad-x', path='', code=css, location=(0, 22)), Token(name='variable_ref', value='$pad-x', path='', code=css, location=(0, 22), length=6),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 28)), Token(name='declaration_end', value=';', path='', code=css, location=(0, 28), length=1),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 29)), Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 29), length=1)
] ]
def test_variables_reference_in_variable_declaration(): def test_variables_reference_in_variable_declaration():
css = "$x: $y;" css = "$x: $y;"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='variable_ref', value='$y', path='', code=css, location=(0, 4)), Token(name='variable_ref', value='$y', path='', code=css, location=(0, 4), length=2),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 6)), Token(name='variable_value_end', value=';', path='', code=css, location=(0, 6), length=1)
] ]
def test_variable_references_in_variable_declaration_multiple(): def test_variable_references_in_variable_declaration_multiple():
css = "$x: $y $z\n" css = "$x: $y $z\n"
assert list(tokenize(css, "")) == [ assert list(tokenize(css, "")) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0)), Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), length=3),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), length=1),
Token(name='variable_ref', value='$y', path='', code=css, location=(0, 4)), Token(name='variable_ref', value='$y', path='', code=css, location=(0, 4), length=2),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 6)), Token(name='whitespace', value=' ', path='', code=css, location=(0, 6), length=2),
Token(name='variable_ref', value='$z', path='', code=css, location=(0, 8)), Token(name='variable_ref', value='$z', path='', code=css, location=(0, 8), length=2),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 10)), Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 10), length=1)
] ]