Use CLI.vi_state.

Author: jonathanslenders

ptpython/history_browser.py

@@ -424,8 +424,7 @@ def create_key_bindings(python_input, history_mapping):
     manager = KeyBindingManager(
         enable_search=True,
         enable_vi_mode=Condition(lambda cli: python_input.vi_mode),
-        enable_extra_page_navigation=True,
-        get_vi_state=python_input.key_bindings_manager.get_vi_state)
+        enable_extra_page_navigation=True)
     handle = manager.registry.add_binding
 
     @handle(' ', filter=HasFocus(HISTORY_BUFFER))

ptpython/key_bindings.py

@@ -82,8 +82,7 @@ def _(event):
         event.cli.current_buffer.insert_text('    ')
 
     @handle(Keys.ControlJ, filter= ~sidebar_visible & ~has_selection &
-            ~(vi_mode_enabled &
-              ViStateFilter(key_bindings_manager.get_vi_state, InputMode.NAVIGATION)) &
+            ~(vi_mode_enabled & ViStateFilter(InputMode.NAVIGATION)) &
             HasFocus(DEFAULT_BUFFER) & IsMultiline())
     def _(event):
         """

ptpython/layout.py

@@ -339,7 +339,7 @@ def toggle_vi_mode(cli, mouse_event):
 
     token = Token.Toolbar.Status
 
-    mode = python_input.key_bindings_manager.get_vi_state(cli).input_mode
+    mode = cli.vi_state.input_mode
     result = []
     append = result.append
 

ptpython/python_input.py

@@ -626,13 +626,13 @@ def enter_history(self, cli):
         """
         Display the history.
         """
-        self.key_bindings_manager.get_vi_state(cli).input_mode = InputMode.NAVIGATION
+        cli.vi_state.input_mode = InputMode.NAVIGATION
 
         def done(result):
             if result is not None:
                 cli.buffers[DEFAULT_BUFFER].document = result
 
-            self.key_bindings_manager.get_vi_state(cli).input_mode = InputMode.INSERT
+            cli.vi_state.input_mode = InputMode.INSERT
 
         cli.run_sub_application(create_history_application(
             self, cli.buffers[DEFAULT_BUFFER].document), done)