test fixes

Author: willmcgugan

src/textual/binding.py

@@ -126,9 +126,6 @@ def __iter__(self) -> Iterator[tuple[str, Binding]]:
                 for binding in bindings
             ]
         )
-        # for key, bindings in self.keys.items():
-        #     for binding in bindings:
-        #         yield key, binding
 
     @classmethod
     def from_keys(cls, keys: dict[str, list[Binding]]) -> BindingsMap:
@@ -198,16 +195,18 @@ def bind(
         """
         all_keys = [key.strip() for key in keys.split(",")]
         for key in all_keys:
-            self.keys[key] = Binding(
-                key,
-                action,
-                description,
-                show=bool(description and show),
-                key_display=key_display,
-                priority=priority,
+            self.keys.setdefault(key, []).append(
+                Binding(
+                    key,
+                    action,
+                    description,
+                    show=bool(description and show),
+                    key_display=key_display,
+                    priority=priority,
+                )
             )
 
-    def get_key(self, key: str) -> Binding:
+    def get_key(self, key: str) -> list[Binding]:
         """Get a binding if it exists.
 
         Args:

src/textual/dom.py

@@ -610,7 +610,7 @@ def _merge_bindings(cls) -> BindingsMap:
         keys: dict[str, list[Binding]] = {}
         for bindings_ in bindings:
             for key, key_bindings in bindings_.keys.items():
-                keys.setdefault(key, []).extend(key_bindings)
+                keys[key] = key_bindings
 
         new_bindings = BindingsMap().from_keys(keys)
         return new_bindings

tests/test_binding.py

@@ -27,16 +27,16 @@ def more_bindings():
 
 
 def test_bindings_get_key(bindings):
-    assert bindings.get_key("b") == Binding(
-        "b", action="action1", description="description1"
-    )
-    assert bindings.get_key("c") == BINDING2
+    assert bindings.get_key("b") == [
+        Binding("b", action="action1", description="description1")
+    ]
+    assert bindings.get_key("c") == [BINDING2]
     with pytest.raises(NoBinding):
         bindings.get_key("control+meta+alt+shift+super+hyper+t")
 
 
 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")[0].action == more_bindings.get_key("e")[0].action
 
 
 def test_bindings_merge_simple(bindings):
@@ -51,8 +51,11 @@ def test_bindings_merge_overlap():
         "a", action="another_action", description="another_description"
     )
     assert BindingsMap.merge([left, BindingsMap([another_binding])]).keys == {
-        "a": another_binding,
-        "b": Binding("b", action="action1", description="description1"),
+        "a": [
+            Binding("a", action="action1", description="description1"),
+            another_binding,
+        ],
+        "b": [Binding("b", action="action1", description="description1")],
     }
 
 
@@ -64,12 +67,9 @@ def test_bad_binding_tuple():
 
 
 def test_binding_from_tuples():
-    assert (
-        BindingsMap(((BINDING2.key, BINDING2.action, BINDING2.description),)).get_key(
-            "c"
-        )
-        == BINDING2
-    )
+    assert BindingsMap(
+        ((BINDING2.key, BINDING2.action, BINDING2.description),)
+    ).get_key("c") == [BINDING2]
 
 
 def test_shown():

tests/test_binding_inheritance.py

@@ -43,7 +43,7 @@ async def test_just_app_no_bindings() -> None:
             "ctrl+c",
             "ctrl+backslash",
         ]
-        assert pilot.app._bindings.get_key("ctrl+c").priority is True
+        assert pilot.app._bindings.get_key("ctrl+c")[0].priority is True
 
 
 ##############################################################################
@@ -67,8 +67,8 @@ async def test_just_app_alpha_binding() -> None:
         assert sorted(pilot.app._bindings.keys.keys()) == sorted(
             ["ctrl+c", "ctrl+backslash", "a"]
         )
-        assert pilot.app._bindings.get_key("ctrl+c").priority is True
-        assert pilot.app._bindings.get_key("a").priority is True
+        assert pilot.app._bindings.get_key("ctrl+c")[0].priority is True
+        assert pilot.app._bindings.get_key("a")[0].priority is True
 
 
 ##############################################################################
@@ -91,8 +91,8 @@ async def test_just_app_low_priority_alpha_binding() -> None:
         assert sorted(pilot.app._bindings.keys.keys()) == sorted(
             ["ctrl+c", "ctrl+backslash", "a"]
         )
-        assert pilot.app._bindings.get_key("ctrl+c").priority is True
-        assert pilot.app._bindings.get_key("a").priority is False
+        assert pilot.app._bindings.get_key("ctrl+c")[0].priority is True
+        assert pilot.app._bindings.get_key("a")[0].priority is False
 
 
 ##############################################################################
@@ -121,7 +121,7 @@ def on_mount(self) -> None:
 async def test_app_screen_with_bindings() -> None:
     """Test a screen with a single key binding defined."""
     async with AppWithScreenThatHasABinding().run_test() as pilot:
-        assert pilot.app.screen._bindings.get_key("a").priority is True
+        assert pilot.app.screen._bindings.get_key("a")[0].priority is True
 
 
 ##############################################################################
@@ -150,7 +150,7 @@ def on_mount(self) -> None:
 async def test_app_screen_with_low_bindings() -> None:
     """Test a screen with a single low-priority key binding defined."""
     async with AppWithScreenThatHasALowBinding().run_test() as pilot:
-        assert pilot.app.screen._bindings.get_key("a").priority is False
+        assert pilot.app.screen._bindings.get_key("a")[0].priority is False
 
 
 ##############################################################################