Implemented the difference between backward-kill-word an unix-word-rubout.

jonathanslenders · jonathanslenders · commit 44e571b68e84 · 2016-12-04T19:31:46.000+01:00
diff --git a/prompt_toolkit/key_binding/bindings/emacs.py b/prompt_toolkit/key_binding/bindings/emacs.py
@@ -58,8 +58,8 @@ def _(event):
     handle(Keys.Escape, 'l', filter=insert_mode)(get_by_name('downcase-word'))
     handle(Keys.Escape, 'u', filter=insert_mode)(get_by_name('uppercase-word'))
     handle(Keys.Escape, 'y', filter=insert_mode)(get_by_name('yank-pop'))
-    handle(Keys.Escape, Keys.ControlH, filter=insert_mode)(get_by_name('unix-word-rubout'))
-    handle(Keys.Escape, Keys.Backspace, filter=insert_mode)(get_by_name('unix-word-rubout'))
+    handle(Keys.Escape, Keys.ControlH, filter=insert_mode)(get_by_name('backward-kill-word'))
+    handle(Keys.Escape, Keys.Backspace, filter=insert_mode)(get_by_name('backward-kill-word'))
     handle(Keys.Escape, '\\', filter=insert_mode)(get_by_name('delete-horizontal-space'))
 
     handle(Keys.ControlUnderscore, save_before=(lambda e: False), filter=insert_mode)(
diff --git a/prompt_toolkit/key_binding/bindings/named_commands.py b/prompt_toolkit/key_binding/bindings/named_commands.py
@@ -302,13 +302,13 @@ def kill_word(event):
 
 
 @register('unix-word-rubout')
-@register('backward-kill-word')  # XXX: backward-kill-word is actually slightly different.
-def unix_word_rubout(event):
+def unix_word_rubout(event, WORD=True):
     """
-    Kill the word behind point. Word boundaries are the same as backward-word.
+    Kill the word behind point, using whitespace as a word boundary.
+    Usually bound to ControlW.
     """
     buff = event.current_buffer
-    pos = buff.document.find_start_of_previous_word(count=event.arg)
+    pos = buff.document.find_start_of_previous_word(count=event.arg, WORD=WORD)
 
     if pos is None:
         # Nothing found? delete until the start of the document.  (The
@@ -330,6 +330,15 @@ def unix_word_rubout(event):
         event.cli.output.bell()
 
 
+@register('backward-kill-word')
+def backward_kill_word(event):
+    """
+    Kills the word before point, using “not a letter nor a digit” as a word boundary.
+    Usually bound to M-Del or M-Backspace.
+    """
+    unix_word_rubout(event, WORD=False)
+
+
 @register('delete-horizontal-space')
 def delete_horizontal_space(event):
     " Delete all spaces and tabs around point. "
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -252,14 +252,30 @@ def test_emacs_other_bindings():
     result, cli = _feed_cli_with_input('hello\x1b[D\x1b[D\x15X\n')
     assert result.text == 'Xlo'
 
-    # Delete word before the cursor.
+    # unix-word-rubout: delete word before the cursor.
+    # (ControlW).
     result, cli = _feed_cli_with_input('hello world test\x17X\n')
     assert result.text == 'hello world X'
 
+    result, cli = _feed_cli_with_input('hello world /some/very/long/path\x17X\n')
+    assert result.text == 'hello world X'
+
     # (with argument.)
     result, cli = _feed_cli_with_input('hello world test\x1b2\x17X\n')
     assert result.text == 'hello X'
 
+    result, cli = _feed_cli_with_input('hello world /some/very/long/path\x1b2\x17X\n')
+    assert result.text == 'hello X'
+
+    # backward-kill-word: delete word before the cursor.
+    # (Esc-ControlH).
+    result, cli = _feed_cli_with_input('hello world /some/very/long/path\x1b\x08X\n')
+    assert result.text == 'hello world /some/very/long/X'
+
+    # (with arguments.)
+    result, cli = _feed_cli_with_input('hello world /some/very/long/path\x1b3\x1b\x08X\n')
+    assert result.text == 'hello world /some/very/X'
+
 
 def test_controlx_controlx():
     # At the end: go to the start of the line.
