Fixes #13472 by restoring user's terminal cursor

ltrujello · Carreau · commit 16451266fc75 · 2022-02-08T12:36:52.000+01:00
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -3679,6 +3679,10 @@ def atexit_operations(self):
                 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()
diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py
@@ -336,12 +336,7 @@ def set_input_mode(self, mode):
         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
