Highlight FuzzyWordCompleter matches.

Author: jonathanslenders

prompt_toolkit/completion/fuzzy_completer.py

@@ -74,7 +74,40 @@ def sort_key(fuzzy_match):
  yield Completion(
  match.word,
  -len(word_before_cursor),
- display_meta=display_meta)
+ display_meta=display_meta,
+ display=self._get_display(match, word_before_cursor))
+
+ def _get_display(self, fuzzy_match, word_before_cursor):
+ """
+ Generate formatted text for the display label.
+ """
+ m = fuzzy_match
+
+ if m.match_length == 0:
+ # No highlighting when we have zero length matches (no input text).
+ return m.word
+
+ result = []
+
+ # Text before match.
+ result.append(('class:fuzzymatch.outside', m.word[:m.start_pos]))
+
+ # The match itself.
+ characters = list(word_before_cursor)
+
+ for c in m.word[m.start_pos:m.start_pos + m.match_length]:
+ classname = 'class:fuzzymatch.inside'
+ if characters and c == characters[0]:
+ classname += '.character'
+ del characters[0]
+
+ result.append((classname, c))
+
+ # Text after match.
+ result.append(
+ ('class:fuzzymatch.outside', m.word[m.start_pos + m.match_length:]))
+
+ return result
 
 
 _FuzzyMatch = namedtuple('_FuzzyMatch', 'match_length start_pos word')

prompt_toolkit/key_binding/bindings/completion.py

@@ -106,8 +106,9 @@ def display(page):
  for c in range(column_count):
  try:
  completion = page_columns[c][r]
+ style = 'class:readline-like-completions.completion ' + (completion.style or '')
 
- result.extend(to_formatted_text(completion.display, style=completion.style))
+ result.extend(to_formatted_text(completion.display, style=style))
 
  # Add padding.
  padding = max_compl_width - get_cwidth(completion.display_text)
@@ -116,7 +117,7 @@ def display(page):
  pass
  result.append(('', '\n'))
 
- app.print_text(result)
+ app.print_text(to_formatted_text(result, 'class:readline-like-completions'))
 
  # User interaction through an application generator function.
  def run_compl():

prompt_toolkit/styles/defaults.py

@@ -79,6 +79,20 @@
  ('completion-menu.meta.completion.current', 'bg:#aaaaaa #000000'),
  ('completion-menu.multi-column-meta', 'bg:#aaaaaa #000000'),
 
+ # Fuzzy matches in completion menu (for FuzzyCompleter).
+ ('completion-menu.completion fuzzymatch.outside', 'fg:#444444'),
+ ('completion-menu.completion fuzzymatch.inside', 'bold'),
+ ('completion-menu.completion fuzzymatch.inside.character', 'underline'),
+ ('completion-menu.completion.current fuzzymatch.outside', 'fg:default'),
+ ('completion-menu.completion.current fuzzymatch.inside', 'nobold'),
+
+ # Styling of readline-like completions.
+ ('readline-like-completions', ''),
+ ('readline-like-completions.completion', ''),
+ ('readline-like-completions.completion fuzzymatch.outside', '#888888'),
+ ('readline-like-completions.completion fuzzymatch.inside', ''),
+ ('readline-like-completions.completion fuzzymatch.inside.character', 'underline'),
+
  # Scrollbars.
  ('scrollbar.background', 'bg:#aaaaaa'),
  ('scrollbar.button', 'bg:#444444'),