Restore winsaveview

Author: hkupty

plugin/iron.vim

@@ -1,5 +1,7 @@
-map <silent> <Plug>(iron-send-motion) :<c-u>set opfunc=IronSendMotion<CR>g@
-vmap <silent> <Plug>(iron-send-motion) :<c-u>call IronSendMotion('visual')<CR>
+map <silent> <Plug>(iron-send-motion) 
+      \ :<c-u>let b:iron_cursor_pos = winsaveview() \| set opfunc=IronSendMotion<CR>g@
+vmap <silent> <Plug>(iron-send-motion)
+      \ :<c-u>let b:iron_cursor_pos = winsaveview() \| call IronSendMotion('visual')<CR>
 
 "Call previous command again
 map <silent> <Plug>(iron-repeat-cmd) :call IronSend("\u001b\u005b\u0041")<CR>

rplugin/python3/iron/__init__.py

@@ -109,17 +109,22 @@ def mapping_send(self, args):
     @neovim.function("IronSendMotion", range=True)
     def send_motion_to_repl(self, args, rng=None):
         logger.debug("Supplied data: {}".format(", ".join(args)))
+        cur_buf = self.nvim.current.buffer
+
+        if not 'iron_cursor_pos' in cur_buf.vars:
+            # Probably repeating, so setting the position manually
+            cur_buf.vars['iron_cursor_pos'] = self.call('winsaveview')
 
         if args[0] == 'visual':
-            init = self.nvim.current.buffer.mark('<')
-            end = self.nvim.current.buffer.mark('>')
+            init = cur_buf.mark('<')
+            end = cur_buf.mark('>')
         else:
-            init = self.nvim.current.buffer.mark('[')
-            end = self.nvim.current.buffer.mark(']')
+            init = cur_buf.mark('[')
+            end = cur_buf.mark(']')
 
         end[1] += 1
 
-        text = self.nvim.current.buffer[init[0]-1:end[0]]
+        text = cur_buf[init[0]-1:end[0]]
 
         logger.debug("Gathered: {} - {}: {}".format(
             init, end, "\n".join(text)))
@@ -133,6 +138,9 @@ def send_motion_to_repl(self, args, rng=None):
 
             logger.debug("Stripped: {}".format("\n".join(text)))
 
+        self.call('winrestview', cur_buf.vars['iron_cursor_pos'])
+        del cur_buf.vars['iron_cursor_pos']
+
         return self.send_to_repl(["\n".join(text)])
 
     @neovim.function("IronSend")