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

Error handling

Browse Source
This commit is contained in:
Darren Burns
2022-02-04 11:43:35 +00:00
parent d50e2e1b0d
commit bb8b4e89d3
7 changed files with 215 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
tests/css/test_parse.py
View File

@@ -6,7 +6,7 @@ from textual.css.parse import substitute_references
from textual.css.scalar import Scalar, Unit
from textual.css.stylesheet import Stylesheet, StylesheetParseError
from textual.css.tokenize import tokenize
from textual.css.tokenizer import Token, ReferencedAt
from textual.css.tokenizer import Token, ReferencedBy
from textual.css.transition import Transition
from textual.layouts.dock import DockLayout
@@ -16,38 +16,39 @@ 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), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_at=None),
Token(name='number', value='1', path='', code=css, location=(0, 4), referenced_at=None),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 5), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 6), referenced_at=None),
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 4), referenced_by=None),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 5), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 6), referenced_by=None),
Token(name='selector_start_id', value='#some-widget', path='', code=css, location=(0, 7),
referenced_at=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 19), referenced_at=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(0, 20), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 27), referenced_at=None),
referenced_by=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 19), referenced_by=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(0, 20), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 27), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 4),
referenced_at=ReferencedAt(name='x', location=(0, 28), length=2)),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 30), referenced_at=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 31), referenced_at=None)
referenced_by=ReferencedBy(name='x', location=(0, 28), length=2)),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 30), referenced_by=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 31), referenced_by=None)
]
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), referenced_at=None),
Token(name='number', value='1', path='', code=css, location=(0, 3), referenced_at=None),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 4), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), referenced_at=None),
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 3), referenced_by=None),
Token(name='variable_value_end', value=';', path='', code=css, location=(0, 4), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), referenced_by=None),
Token(name='selector_start_id', value='#some-widget', path='', code=css, location=(0, 6),
referenced_at=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 18), referenced_at=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(0, 19), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 26), referenced_at=None),
Token(name='number', value='1', path='', code=css, location=(0, 3), referenced_at=ReferencedAt(name='x', location=(0, 27), length=2)),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 29), referenced_at=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 30), referenced_at=None)
referenced_by=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(0, 18), referenced_by=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(0, 19), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 26), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 3),
referenced_by=ReferencedBy(name='x', location=(0, 27), length=2)),
Token(name='declaration_end', value=';', path='', code=css, location=(0, 29), referenced_by=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(0, 30), referenced_by=None)
]
def test_undefined_variable(self):
@@ -58,69 +59,93 @@ 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), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_at=None),
Token(name='number', value='1', path='', code=css, location=(0, 4), referenced_at=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 5), referenced_at=None),
Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), referenced_at=None),
Token(name='number', value='1', path='', code=css, location=(0, 4), referenced_at=ReferencedAt(name='x', location=(1, 4), length=2)),
Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 6), referenced_at=None),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 6), referenced_at=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 8), referenced_at=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 16), referenced_at=None),
Token(name='number', value='1', path='', code=css, location=(0, 4), referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 19), referenced_at=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20), referenced_at=None)
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 4), referenced_by=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 5), referenced_by=None),
Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 4),
referenced_by=ReferencedBy(name='x', location=(1, 4), length=2)),
Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 6), referenced_by=None),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 6), referenced_by=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 8), referenced_by=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 16), referenced_by=None),
Token(name='number', value='1', path='', code=css, location=(0, 4),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 19), referenced_by=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20), referenced_by=None)
]
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), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_at=None),
Token(name='number', value='2', path='', code=css, location=(0, 4), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), referenced_at=None),
Token(name='number', value='4', path='', code=css, location=(0, 6), referenced_at=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 7), referenced_at=None),
Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), referenced_at=None),
Token(name='number', value='6', path='', code=css, location=(1, 4), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 5), referenced_at=None),
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_by=None),
Token(name='number', value='2', path='', code=css, location=(0, 4), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5), referenced_by=None),
Token(name='number', value='4', path='', code=css, location=(0, 6), referenced_by=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 7), referenced_by=None),
Token(name='variable_name', value='$y:', path='', code=css, location=(1, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 3), referenced_by=None),
Token(name='number', value='6', path='', code=css, location=(1, 4), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 5), referenced_by=None),
Token(name='number', value='2', path='', code=css, location=(0, 4),
referenced_at=ReferencedAt(name='x', location=(1, 6), length=2)),
referenced_by=ReferencedBy(name='x', location=(1, 6), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5),
referenced_at=ReferencedAt(name='x', location=(1, 6), length=2)),
referenced_by=ReferencedBy(name='x', location=(1, 6), length=2)),
Token(name='number', value='4', path='', code=css, location=(0, 6),
referenced_at=ReferencedAt(name='x', location=(1, 6), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 8), referenced_at=None),
Token(name='number', value='2', path='', code=css, location=(1, 9), referenced_at=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 10), referenced_at=None),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 6), referenced_at=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 8), referenced_at=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9), referenced_at=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 16), referenced_at=None),
referenced_by=ReferencedBy(name='x', location=(1, 6), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 8), referenced_by=None),
Token(name='number', value='2', path='', code=css, location=(1, 9), referenced_by=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(1, 10), referenced_by=None),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(2, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 6), referenced_by=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(2, 7), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 8), referenced_by=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(2, 9), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 16), referenced_by=None),
Token(name='number', value='6', path='', code=css, location=(1, 4),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 5),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='number', value='2', path='', code=css, location=(0, 4),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 5),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='number', value='4', path='', code=css, location=(0, 6),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 8),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='number', value='2', path='', code=css, location=(1, 9),
referenced_at=ReferencedAt(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 19), referenced_at=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20), referenced_at=None)
referenced_by=ReferencedBy(name='y', location=(2, 17), length=2)),
Token(name='whitespace', value=' ', path='', code=css, location=(2, 19), referenced_by=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(2, 20), referenced_by=None)
]
def test_variable_used_inside_property_value(self):
css = "$x: red\n.thing { border: on $x; }"
assert list(substitute_references(tokenize(css, ""))) == [
Token(name='variable_name', value='$x:', path='', code=css, location=(0, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(0, 3), referenced_by=None),
Token(name='token', value='red', path='', code=css, location=(0, 4), referenced_by=None),
Token(name='variable_value_end', value='\n', path='', code=css, location=(0, 7), referenced_by=None),
Token(name='selector_start_class', value='.thing', path='', code=css, location=(1, 0), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 6), referenced_by=None),
Token(name='declaration_set_start', value='{', path='', code=css, location=(1, 7), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 8), referenced_by=None),
Token(name='declaration_name', value='border:', path='', code=css, location=(1, 9), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 16), referenced_by=None),
Token(name='token', value='on', path='', code=css, location=(1, 17), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 19), referenced_by=None),
Token(name='token', value='red', path='', code=css, location=(0, 4),
referenced_by=ReferencedBy(name='x', location=(1, 20), length=2)),
Token(name='declaration_end', value=';', path='', code=css, location=(1, 22), referenced_by=None),
Token(name='whitespace', value=' ', path='', code=css, location=(1, 23), referenced_by=None),
Token(name='declaration_set_end', value='}', path='', code=css, location=(1, 24), referenced_by=None)
]