Made text objects of the Vi 'n' and 'N' search bindings. This allows searching in selection mode, and it will handle key bindings like cn, cN, dn, dN, yn, yN.

Author: jonathanslenders

prompt_toolkit/buffer.py

@@ -1094,6 +1094,21 @@ def document_for_search(self, search_state):
  working_index, cursor_position = search_result
  return Document(self._working_lines[working_index], cursor_position)
 
+ def get_search_position(self, search_state, include_current_position=True, count=1):
+ """
+ Get the cursor position for this search.
+ (This operation won't change the `working_index`. It's won't go through
+ the history. Vi text objects can't span multiple items.)
+ """
+ search_result = self._search(
+ search_state, include_current_position=include_current_position, count=count)
+
+ if search_result is None:
+ return self.cursor_position
+ else:
+ working_index, cursor_position = search_result
+ return cursor_position
+
  def apply_search(self, search_state, include_current_position=True, count=1):
  """
  Apply search. If something is found, set `working_index` and

prompt_toolkit/key_binding/bindings/vi.py

@@ -476,24 +476,6 @@ def _(event):
  " Join selected lines without space. "
  event.current_buffer.join_selected_lines(separator='')
 
- @handle('n', filter=navigation_mode)
- def _(event): # XXX: use `text_object`
- """
- Search next.
- """
- event.current_buffer.apply_search(
- get_search_state(event.cli), include_current_position=False,
- count=event.arg)
-
- @handle('N', filter=navigation_mode)
- def _(event): # TODO: use `text_object`
- """
- Search previous.
- """
- event.current_buffer.apply_search(
- ~get_search_state(event.cli), include_current_position=False,
- count=event.arg)
-
  @handle('p', filter=navigation_mode)
  def _(event):
  """
@@ -1336,6 +1318,38 @@ def _(event):
  pos = len(b.document.text_after_cursor)
  return TextObject(pos, type=TextObjectType.LINEWISE)
 
+ @text_object('n', no_move_handler=True)
+ def _(event):
+ " Search next. "
+ buff = event.current_buffer
+ cursor_position = buff.get_search_position(
+ get_search_state(event.cli), include_current_position=False,
+ count=event.arg)
+ return TextObject(cursor_position - buff.cursor_position)
+
+ @handle('n', filter=navigation_mode)
+ def _(event):
+ " Search next in navigation mode. (This goes through the history.) "
+ event.current_buffer.apply_search(
+ get_search_state(event.cli), include_current_position=False,
+ count=event.arg)
+
+ @text_object('N', no_move_handler=True)
+ def _(event):
+ " Search previous. "
+ buff = event.current_buffer
+ cursor_position = buff.get_search_position(
+ ~get_search_state(event.cli), include_current_position=False,
+ count=event.arg)
+ return TextObject(cursor_position - buff.cursor_position)
+
+ @handle('N', filter=navigation_mode)
+ def _(event):
+ " Search previous in navigation mode. (This goes through the history.) "
+ event.current_buffer.apply_search(
+ ~get_search_state(event.cli), include_current_position=False,
+ count=event.arg)
+
  @handle('z', '+', filter=navigation_mode|selection_mode)
  @handle('z', 't', filter=navigation_mode|selection_mode)
  @handle('z', Keys.ControlJ, filter=navigation_mode|selection_mode)