Use load_key_bindings instead of KeyBindingsManager. (For the latest prompt_toolkit.)

Author: jonathanslenders

ptpython/history_browser.py

@@ -12,7 +12,7 @@
 from prompt_toolkit.document import Document
 from prompt_toolkit.enums import DEFAULT_BUFFER
 from prompt_toolkit.filters import Condition, HasFocus, InFocusStack
-from prompt_toolkit.key_binding.manager import KeyBindingManager
+from prompt_toolkit.key_binding.defaults import load_key_bindings
 from prompt_toolkit.keys import Keys
 from prompt_toolkit.layout.containers import HSplit, VSplit, Window, FloatContainer, Float, ConditionalContainer, Container, ScrollOffsets
 from prompt_toolkit.layout.controls import BufferControl, FillControl
@@ -420,10 +420,10 @@ def create_key_bindings(python_input, history_mapping):
     """
     Key bindings.
     """
-    manager = KeyBindingManager(
+    registry = load_key_bindings(
         enable_search=True,
         enable_extra_page_navigation=True)
-    handle = manager.registry.add_binding
+    handle = registry.add_binding
 
     @handle(' ', filter=HasFocus(HISTORY_BUFFER))
     def _(event):
@@ -517,7 +517,7 @@ def _(event):
         " Suspend to background. "
         event.cli.suspend_to_background()
 
-    return manager.registry
+    return registry
 
 
 def create_history_application(python_input, original_document):

ptpython/key_bindings.py

@@ -4,6 +4,7 @@
 from prompt_toolkit.enums import DEFAULT_BUFFER
 from prompt_toolkit.filters import HasSelection, IsMultiline, Filter, HasFocus, Condition, ViInsertMode, EmacsInsertMode
 from prompt_toolkit.key_binding.vi_state import InputMode
+from prompt_toolkit.key_binding.registry import Registry
 from prompt_toolkit.keys import Keys
 
 __all__ = (
@@ -29,12 +30,14 @@ def __call__(self, cli):
         return bool(b.text and (not before_cursor or before_cursor.isspace()))
 
 
-def load_python_bindings(key_bindings_manager, python_input):
+def load_python_bindings(python_input):
     """
     Custom key bindings.
     """
+    registry = Registry()
+
     sidebar_visible = Condition(lambda cli: python_input.show_sidebar)
-    handle = key_bindings_manager.registry.add_binding
+    handle = registry.add_binding
     has_selection = HasSelection()
     vi_mode_enabled = Condition(lambda cli: python_input.vi_mode)
 
@@ -128,12 +131,16 @@ def _(event):
         """
         python_input.show_exit_confirmation = True
 
+    return registry
+
 
-def load_sidebar_bindings(key_bindings_manager, python_input):
+def load_sidebar_bindings(python_input):
     """
     Load bindings for the navigation in the sidebar.
     """
-    handle = key_bindings_manager.registry.add_binding
+    registry = Registry()
+
+    handle = registry.add_binding
     sidebar_visible = Condition(lambda cli: python_input.show_sidebar)
 
     @handle(Keys.Up, filter=sidebar_visible)
@@ -176,12 +183,16 @@ def _(event):
         " Hide sidebar. "
         python_input.show_sidebar = False
 
+    return registry
 
-def load_confirm_exit_bindings(key_bindings_manager, python_input):
+
+def load_confirm_exit_bindings(python_input):
     """
     Handle yes/no key presses when the exit confirmation is shown.
     """
-    handle = key_bindings_manager.registry.add_binding
+    registry = Registry()
+
+    handle = registry.add_binding
     confirmation_visible = Condition(lambda cli: python_input.show_exit_confirmation)
 
     @handle('y', filter=confirmation_visible)
@@ -200,6 +211,8 @@ def _(event):
         """
         python_input.show_exit_confirmation = False
 
+    return registry
+
 
 def auto_newline(buffer):
     r"""

ptpython/layout.py

@@ -290,7 +290,7 @@ def get_continuation_prompt(cli, width):
                 show_numbers=Condition(lambda cli: python_input.show_line_numbers))
 
 
-def status_bar(key_bindings_manager, python_input):
+def status_bar(python_input):
     """
     Create the `Layout` for the status bar.
     """
@@ -474,7 +474,7 @@ def extra_condition(cli):
         filter=visible)
 
 
-def create_layout(python_input, key_bindings_manager,
+def create_layout(python_input,
                   lexer=PythonLexer,
                   extra_body=None, extra_toolbars=None,
                   extra_buffer_processors=None, input_buffer_height=None):
@@ -592,7 +592,7 @@ def menu_position(cli):
         ]),
     ] + extra_toolbars + [
         VSplit([
-            status_bar(key_bindings_manager, python_input),
+            status_bar(python_input),
             show_sidebar_button_info(python_input),
         ])
     ])

ptpython/python_input.py

@@ -17,8 +17,9 @@
 from prompt_toolkit.filters import Condition, Always
 from prompt_toolkit.history import FileHistory, InMemoryHistory
 from prompt_toolkit.interface import CommandLineInterface, Application, AcceptAction
-from prompt_toolkit.key_binding.manager import KeyBindingManager
+from prompt_toolkit.key_binding.defaults import load_key_bindings_for_prompt, load_mouse_bindings
 from prompt_toolkit.key_binding.vi_state import InputMode
+from prompt_toolkit.key_binding.registry import MergedRegistry, ConditionalRegistry
 from prompt_toolkit.layout.lexers import PygmentsLexer
 from prompt_toolkit.shortcuts import create_output
 from prompt_toolkit.styles import DynamicStyle
@@ -226,22 +227,25 @@ def __init__(self,
         # Code signatures. (This is set asynchronously after a timeout.)
         self.signatures = []
 
-        # Use a KeyBindingManager for loading the key bindings.
-        self.key_bindings_manager = KeyBindingManager(
-            enable_abort_and_exit_bindings=True,
-            enable_search=True,
-            enable_vi_mode=Condition(lambda cli: self.vi_mode),
-            enable_open_in_editor=Condition(lambda cli: self.enable_open_in_editor),
-            enable_system_bindings=Condition(lambda cli: self.enable_system_bindings),
-            enable_auto_suggest_bindings=Condition(lambda cli: self.enable_auto_suggest),
-
-            # Disable all default key bindings when the sidebar or the exit confirmation
-            # are shown.
-            enable_all=Condition(lambda cli: not (self.show_sidebar or self.show_exit_confirmation)))
-
-        load_python_bindings(self.key_bindings_manager, self)
-        load_sidebar_bindings(self.key_bindings_manager, self)
-        load_confirm_exit_bindings(self.key_bindings_manager, self)
+        # Create a Registry for the key bindings.
+        self.key_bindings_registry = MergedRegistry([
+            ConditionalRegistry(
+                registry=load_key_bindings_for_prompt(
+                    enable_abort_and_exit_bindings=True,
+                    enable_search=True,
+                    enable_open_in_editor=Condition(lambda cli: self.enable_open_in_editor),
+                    enable_system_bindings=Condition(lambda cli: self.enable_system_bindings),
+                    enable_auto_suggest_bindings=Condition(lambda cli: self.enable_auto_suggest)),
+
+                # Disable all default key bindings when the sidebar or the exit confirmation
+                # are shown.
+                filter=Condition(lambda cli: not (self.show_sidebar or self.show_exit_confirmation))
+            ),
+            load_mouse_bindings(),
+            load_python_bindings(self),
+            load_sidebar_bindings(self),
+            load_confirm_exit_bindings(self),
+        ])
 
         # Boolean indicating whether we have a signatures thread running.
         # (Never run more than one at the same time.)
@@ -276,10 +280,6 @@ def get_compiler_flags(self):
 
         return flags
 
-    @property
-    def key_bindings_registry(self):
-        return self.key_bindings_manager.registry
-
     @property
     def add_key_binding(self):
         """
@@ -505,7 +505,6 @@ def create_application(self):
         return Application(
             layout=create_layout(
                 self,
-                self.key_bindings_manager,
                 lexer=self._lexer,
                 input_buffer_height=self._input_buffer_height,
                 extra_buffer_processors=self._extra_buffer_processors,
@@ -635,7 +634,6 @@ def run():
         cli.eventloop.run_in_executor(run)
 
     def on_reset(self, cli):
-        self.key_bindings_manager.reset(cli)
         self.signatures = []
 
     def enter_history(self, cli):

ptpython/repl.py

@@ -85,7 +85,6 @@ def _process_document(self, cli, buffer):
             # Append to history and reset.
             cli.search_state.text = ''
             cli.buffers[DEFAULT_BUFFER].reset(append_to_history=True)
-            self.key_bindings_manager.reset(cli)
 
     def _execute(self, cli, line):
         """