Fix behavior of enter key in VI_MODE

news/vi_mode_enter.rst

@@ -0,0 +1,24 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* Hitting ``Enter`` while ``$VI_MODE=True`` now executes the current code block
+  irrespective of cursor position
+
+**Security:**
+
+* <news item>

xonsh/ptk2/key_bindings.py

@@ -304,8 +304,8 @@ def load_xonsh_bindings(key_bindings):
         b.validate_and_handle()
         xonsh_exit([])
 
-    @handle(Keys.ControlJ, filter=IsMultiline())
-    @handle(Keys.ControlM, filter=IsMultiline())
+    @handle(Keys.ControlJ, filter=IsMultiline() & insert_mode)
+    @handle(Keys.ControlM, filter=IsMultiline() & insert_mode)
     def multiline_carriage_return(event):
         """ Wrapper around carriage_return multiline parser """
         b = event.cli.current_buffer