Fix cursor position after :substitute with line number

Author: lieryan

pyvim/commands/commands.py

@@ -719,6 +719,7 @@ def substitute(editor, range_start, range_end, search, replace, flags):
     current_row = buffer.document.cursor_position_row
 
     if not range_end:
+        current_row = (int(range_start) - 1) if range_start else current_row
         range_end = range_start
     if range_start and range_end:
         line_index_iterator = range(int(range_start) - 1, int(range_end))

tests/test_substitute.py

@@ -41,9 +41,8 @@ def test_substitute_single_line(editor, editor_buffer):
     assert 'Roses are red,' in editor_buffer.buffer.text
     assert 'Violet is blue,' in editor_buffer.buffer.text
     assert 'And so are you.' in editor_buffer.buffer.text
-    # FIXME: vim would have set the cursor position on the substituted line
-    # assert editor_buffer.buffer.cursor_position \
-    #    == editor_buffer.buffer.text.index('Violet')
+    assert editor_buffer.buffer.cursor_position \
+        == editor_buffer.buffer.text.index('Violet')
 
 
 def test_substitute_range(editor, editor_buffer):