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

142
tests/css/test_parse.py
View File

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