mirror of
https://github.com/Textualize/textual.git
synced 2025-10-17 02:38:12 +03:00
check for empty bindings
This commit is contained in:
@@ -19,6 +19,10 @@ class NoBinding(Exception):
|
|||||||
"""A binding was not found."""
|
"""A binding was not found."""
|
||||||
|
|
||||||
|
|
||||||
|
class InvalidBinding(Exception):
|
||||||
|
"""Binding key is in an invalid format."""
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
class Binding:
|
class Binding:
|
||||||
"""The configuration of a key binding."""
|
"""The configuration of a key binding."""
|
||||||
@@ -71,10 +75,14 @@ class Bindings:
|
|||||||
# into a (potential) collection of Binding instances.
|
# into a (potential) collection of Binding instances.
|
||||||
for key in binding.key.split(","):
|
for key in binding.key.split(","):
|
||||||
key = key.strip()
|
key = key.strip()
|
||||||
|
if not key:
|
||||||
|
raise InvalidBinding(
|
||||||
|
f"Can not bind empty string in {binding.key!r}"
|
||||||
|
)
|
||||||
if len(key) == 1:
|
if len(key) == 1:
|
||||||
key = _character_to_key(key)
|
key = _character_to_key(key)
|
||||||
yield Binding(
|
yield Binding(
|
||||||
key=key.strip(),
|
key=key,
|
||||||
action=binding.action,
|
action=binding.action,
|
||||||
description=binding.description,
|
description=binding.description,
|
||||||
show=binding.show,
|
show=binding.show,
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ from string import ascii_lowercase
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from textual.binding import Bindings, Binding, BindingError, NoBinding
|
from textual.app import App
|
||||||
|
from textual.binding import Bindings, Binding, BindingError, NoBinding, InvalidBinding
|
||||||
|
|
||||||
BINDING1 = Binding("a,b", action="action1", description="description1")
|
BINDING1 = Binding("a,b", action="action1", description="description1")
|
||||||
BINDING2 = Binding("c", action="action2", description="description2")
|
BINDING2 = Binding("c", action="action2", description="description2")
|
||||||
@@ -13,45 +14,78 @@ BINDING3 = Binding(" d , e ", action="action3", description="description3")
|
|||||||
def bindings():
|
def bindings():
|
||||||
yield Bindings([BINDING1, BINDING2])
|
yield Bindings([BINDING1, BINDING2])
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def more_bindings():
|
def more_bindings():
|
||||||
yield Bindings([BINDING1, BINDING2, BINDING3])
|
yield Bindings([BINDING1, BINDING2, BINDING3])
|
||||||
|
|
||||||
|
|
||||||
def test_bindings_get_key(bindings):
|
def test_bindings_get_key(bindings):
|
||||||
assert bindings.get_key("b") == Binding("b", action="action1", description="description1")
|
assert bindings.get_key("b") == Binding(
|
||||||
|
"b", action="action1", description="description1"
|
||||||
|
)
|
||||||
assert bindings.get_key("c") == BINDING2
|
assert bindings.get_key("c") == BINDING2
|
||||||
with pytest.raises(NoBinding):
|
with pytest.raises(NoBinding):
|
||||||
bindings.get_key("control+meta+alt+shift+super+hyper+t")
|
bindings.get_key("control+meta+alt+shift+super+hyper+t")
|
||||||
|
|
||||||
|
|
||||||
def test_bindings_get_key_spaced_list(more_bindings):
|
def test_bindings_get_key_spaced_list(more_bindings):
|
||||||
assert more_bindings.get_key("d").action == more_bindings.get_key("e").action
|
assert more_bindings.get_key("d").action == more_bindings.get_key("e").action
|
||||||
|
|
||||||
|
|
||||||
def test_bindings_merge_simple(bindings):
|
def test_bindings_merge_simple(bindings):
|
||||||
left = Bindings([BINDING1])
|
left = Bindings([BINDING1])
|
||||||
right = Bindings([BINDING2])
|
right = Bindings([BINDING2])
|
||||||
assert Bindings.merge([left, right]).keys == bindings.keys
|
assert Bindings.merge([left, right]).keys == bindings.keys
|
||||||
|
|
||||||
|
|
||||||
def test_bindings_merge_overlap():
|
def test_bindings_merge_overlap():
|
||||||
left = Bindings([BINDING1])
|
left = Bindings([BINDING1])
|
||||||
another_binding = Binding("a", action="another_action", description="another_description")
|
another_binding = Binding(
|
||||||
|
"a", action="another_action", description="another_description"
|
||||||
|
)
|
||||||
assert Bindings.merge([left, Bindings([another_binding])]).keys == {
|
assert Bindings.merge([left, Bindings([another_binding])]).keys == {
|
||||||
"a": another_binding,
|
"a": another_binding,
|
||||||
"b": Binding("b", action="action1", description="description1"),
|
"b": Binding("b", action="action1", description="description1"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def test_bad_binding_tuple():
|
def test_bad_binding_tuple():
|
||||||
with pytest.raises(BindingError):
|
with pytest.raises(BindingError):
|
||||||
_ = Bindings((("a", "action"),))
|
_ = Bindings((("a", "action"),))
|
||||||
with pytest.raises(BindingError):
|
with pytest.raises(BindingError):
|
||||||
_ = Bindings((("a", "action", "description","too much"),))
|
_ = Bindings((("a", "action", "description", "too much"),))
|
||||||
|
|
||||||
|
|
||||||
def test_binding_from_tuples():
|
def test_binding_from_tuples():
|
||||||
assert Bindings((( BINDING2.key, BINDING2.action, BINDING2.description),)).get_key("c") == BINDING2
|
assert (
|
||||||
|
Bindings(((BINDING2.key, BINDING2.action, BINDING2.description),)).get_key("c")
|
||||||
|
== BINDING2
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_shown():
|
def test_shown():
|
||||||
bindings = Bindings([
|
bindings = Bindings(
|
||||||
Binding(
|
[
|
||||||
key, action=f"action_{key}", description=f"Emits {key}",show=bool(ord(key)%2)
|
Binding(
|
||||||
) for key in ascii_lowercase
|
key,
|
||||||
])
|
action=f"action_{key}",
|
||||||
assert len(bindings.shown_keys)==(len(ascii_lowercase)/2)
|
description=f"Emits {key}",
|
||||||
|
show=bool(ord(key) % 2),
|
||||||
|
)
|
||||||
|
for key in ascii_lowercase
|
||||||
|
]
|
||||||
|
)
|
||||||
|
assert len(bindings.shown_keys) == (len(ascii_lowercase) / 2)
|
||||||
|
|
||||||
|
|
||||||
|
def test_invalid_binding():
|
||||||
|
with pytest.raises(InvalidBinding):
|
||||||
|
|
||||||
|
class BrokenApp(App):
|
||||||
|
BINDINGS = [(",,,", "foo", "Broken")]
|
||||||
|
|
||||||
|
with pytest.raises(InvalidBinding):
|
||||||
|
|
||||||
|
class BrokenApp(App):
|
||||||
|
BINDINGS = [(", ,", "foo", "Broken")]
|
||||||
|
|||||||
Reference in New Issue
Block a user