Loosen grammar to allow for missing parentheses

prompt-toolkit · Mar 6, 2020 · 44937c5 · 44937c5
1 parent 5e45d33
commit 44937c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/pyvim/commands/grammar.py b/pyvim/commands/grammar.py
@@ -12,7 +12,7 @@
     \s*
     (
         # Substitute command
-        ((?P<range_start>\d+)(,(?P<range_end>\d+))?)?  (?P<command>s|substitute) \s* / (?P<search>[^/]*) / (?P<replace>[^/]*) (?P<flags> /(g)? )?    |
+        ((?P<range_start>\d+)(,(?P<range_end>\d+))?)?  (?P<command>s|substitute) \s* / (?P<search>[^/]*) ( / (?P<replace>[^/]*) (?P<flags> /(g)? )? )?   |
 
         # Commands accepting a location.
         (?P<command>%(commands_taking_locations)s)(?P<force>!?)  \s+   (?P<location>[^\s]+)   |

diff --git a/tests/test_substitute.py b/tests/test_substitute.py
@@ -80,7 +80,7 @@ def test_substitute_from_search_history(editor, editor_buffer):
 
 
 def test_substitute_from_substitute_search_history(editor, editor_buffer):
-    given_sample_text(editor_buffer, 'Violet is Violet')
+    given_sample_text(editor_buffer, 'Violet is Violet\n')
 
     handle_command(editor, ':s/Violet/Rose')
     assert 'Rose is Violet' in editor_buffer.buffer.text
@@ -100,6 +100,20 @@ def test_substitute_with_repeat_last_substitution(editor, editor_buffer):
     assert 'Rose is Rose' in editor_buffer.buffer.text
 
 
+def test_substitute_without_replacement_text(editor, editor_buffer):
+    given_sample_text(editor_buffer, 'Violet Violet Violet \n')
+    editor.application.current_search_state.text = 'Lily'
+
+    handle_command(editor, ':s/Violet/')
+    assert ' Violet Violet \n' in editor_buffer.buffer.text
+
+    handle_command(editor, ':s/Violet')
+    assert '  Violet \n' in editor_buffer.buffer.text
+
+    handle_command(editor, ':s/')
+    assert '   \n' in editor_buffer.buffer.text
+
+
 def test_substitute_with_repeat_last_substitution_without_previous_substitution(editor, editor_buffer):
     original_text = 'Violet is blue\n'
     given_sample_text(editor_buffer, original_text)
@@ -118,6 +132,7 @@ def test_substitute_flags_empty_flags(editor, editor_buffer):
     handle_command(editor, ':s/Violet/Rose/')
     assert 'Rose is Violet' in editor_buffer.buffer.text
 
+
 def test_substitute_flags_g(editor, editor_buffer):
     given_sample_text(editor_buffer, 'Violet is Violet\n')
     handle_command(editor, ':s/Violet/Rose/g')