Merge pull request #13501 from ltrujello/fix_vi_cursor

Fixes  #13472 by restoring user's terminal cursor after exiting IPython

IPython/core/interactiveshell.py

@@ -3702,6 +3702,10 b' class InteractiveShell(SingletonConfigurable):'
                 pass
         del self.tempdirs
 
+        # Restore user's cursor
+        if hasattr(self, "editing_mode") and self.editing_mode == "vi":
+            sys.stdout.write("\x1b[0 q")
+            sys.stdout.flush()
 
     def cleanup(self):
         self.restore_sys_module_state()

IPython/terminal/shortcuts.py

@@ -338,12 +338,7 b' def create_ipython_shortcuts(shell):'
         shape = {InputMode.NAVIGATION: 2, InputMode.REPLACE: 4}.get(mode, 6)
         cursor = "\x1b[{} q".format(shape)
 
-        if hasattr(sys.stdout, "_cli"):
-            write = sys.stdout._cli.output.write_raw
-        else:
-            write = sys.stdout.write
-
-        write(cursor)
+        sys.stdout.write(cursor)
         sys.stdout.flush()
 
         self._input_mode = mode