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

Merge branch 'css' into docs-intro

Browse Source
This commit is contained in:
Will McGugan
2022-08-19 11:39:55 +01:00
parent a6e4db6ff2 afdac156a4
commit cccf0bd51b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox/darren/just_a_box.css
View File

@@ -4,7 +4,7 @@ Screen {
#left_pane { #left_pane {
background: red; background: red;
width: 20; width: 20
overflow: scroll scroll; overflow: scroll scroll;
} }

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

@@ -12,6 +12,7 @@ import rich.repr
from rich.syntax import Syntax from rich.syntax import Syntax
from rich.text import Text from rich.text import Text
from ._error_tools import friendly_list
from .._loop import loop_last from .._loop import loop_last
@@ -203,11 +204,13 @@ class Tokenizer:
line = self.lines[line_no] line = self.lines[line_no]
match = expect.match(line, col_no) match = expect.match(line, col_no)
if match is None: if match is None:
expected = friendly_list(" ".join(name.split("_")) for name in expect.names)
message = f"Expected one of {expected}.; Did you forget a semicolon at the end of a line?"
raise TokenError( raise TokenError(
self.path, self.path,
self.code, self.code,
(line_no, col_no), (line_no, col_no),
"expected " + ", ".join(name.upper() for name in expect.names), message,
) )
iter_groups = iter(match.groups()) iter_groups = iter(match.groups())
next(iter_groups) next(iter_groups)