Merge pull request #13861 from jtherrmann/fix-vi-mode-escape-delay

Carreau · web-flow · commit e35bdfbf5a64 · 2023-01-03T12:42:57.000+01:00
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
@@ -68,10 +68,15 @@ def reformat_and_execute(event):
         reformat_text_before_cursor(event.current_buffer, event.current_buffer.document, shell)
         event.current_buffer.validate_and_handle()
 
-    kb.add('escape', 'enter', filter=(has_focus(DEFAULT_BUFFER)
-                            & ~has_selection
-                            & insert_mode
-                                      ))(reformat_and_execute)
+    @Condition
+    def ebivim():
+        return shell.emacs_bindings_in_vi_insert_mode
+
+    kb.add(
+        "escape",
+        "enter",
+        filter=(has_focus(DEFAULT_BUFFER) & ~has_selection & insert_mode & ebivim),
+    )(reformat_and_execute)
 
     kb.add("c-\\")(quit)
 
@@ -333,10 +338,6 @@ def _(event):
     if sys.platform == "win32":
         kb.add("c-v", filter=(has_focus(DEFAULT_BUFFER) & ~vi_mode))(win_paste)
 
-    @Condition
-    def ebivim():
-        return shell.emacs_bindings_in_vi_insert_mode
-
     focused_insert_vi = has_focus(DEFAULT_BUFFER) & vi_insert_mode
 
     @kb.add("end", filter=has_focus(DEFAULT_BUFFER) & (ebivim | ~vi_insert_mode))
