Several fixes to the completion code.

- Give dictionary completions priority over path completions.
- Always call non-fuzzy completer after fuzzy completer to prevent that some
  completions were missed out if the fuzzy completer doesn't find them.

Author: jonathanslenders

ptpython/completer.py

@@ -42,13 +42,16 @@ class PythonCompleter(Completer):
     """
 
     def __init__(
-        self, get_globals, get_locals, get_enable_dictionary_completion
+        self,
+        get_globals: Callable[[], dict],
+        get_locals: Callable[[], dict],
+        enable_dictionary_completion: Callable[[], bool],
     ) -> None:
         super().__init__()
 
         self.get_globals = get_globals
         self.get_locals = get_locals
-        self.get_enable_dictionary_completion = get_enable_dictionary_completion
+        self.enable_dictionary_completion = enable_dictionary_completion
 
         self._system_completer = SystemCompleter()
         self._jedi_completer = JediCompleter(get_globals, get_locals)
@@ -134,10 +137,10 @@ def _complete_python_while_typing(self, document: Document) -> bool:
         When `complete_while_typing` is set, only return completions when this
         returns `True`.
         """
-        text = document.text_before_cursor.rstrip()
+        text = document.text_before_cursor  # .rstrip()
         char_before_cursor = text[-1:]
         return bool(
-            text and (char_before_cursor.isalnum() or char_before_cursor in "_.(,")
+            text and (char_before_cursor.isalnum() or char_before_cursor in "_.([,")
         )
 
     def get_completions(
@@ -156,22 +159,11 @@ def get_completions(
             )
             return
 
-        # Do Path completions (if there were no dictionary completions).
-        # TODO: not if we have dictionary completions...
-        if complete_event.completion_requested or self._complete_path_while_typing(
-            document
-        ):
-            yield from self._path_completer.get_completions(document, complete_event)
-
+        # Do dictionary key completions.
         if complete_event.completion_requested or self._complete_python_while_typing(
             document
         ):
-            # If we are inside a string, Don't do Python completion.
-            if self._path_completer_grammar.match(document.text_before_cursor):
-                return
-
-            # Do dictionary key completions.
-            if self.get_enable_dictionary_completion():
+            if self.enable_dictionary_completion():
                 has_dict_completions = False
                 for c in self._dictionary_completer.get_completions(
                     document, complete_event
@@ -184,8 +176,23 @@ def get_completions(
                 if has_dict_completions:
                     return
 
-            # Do Jedi Python completions.
-            yield from self._jedi_completer.get_completions(document, complete_event)
+        # Do Path completions (if there were no dictionary completions).
+        if complete_event.completion_requested or self._complete_path_while_typing(
+            document
+        ):
+            yield from self._path_completer.get_completions(document, complete_event)
+
+        # Do Jedi completions.
+        if complete_event.completion_requested or self._complete_python_while_typing(
+            document
+        ):
+            # If we are inside a string, Don't do Jedi completion.
+            if not self._path_completer_grammar.match(document.text_before_cursor):
+
+                # Do Jedi Python completions.
+                yield from self._jedi_completer.get_completions(
+                    document, complete_event
+                )
 
 
 class JediCompleter(Completer):

ptpython/python_input.py

@@ -18,9 +18,11 @@
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.completion import (
     Completer,
+    ConditionalCompleter,
     DynamicCompleter,
     FuzzyCompleter,
     ThreadedCompleter,
+    merge_completers,
 )
 from prompt_toolkit.document import Document
 from prompt_toolkit.enums import DEFAULT_BUFFER, EditingMode
@@ -205,9 +207,20 @@ def __init__(
         )
 
         self._completer = HidePrivateCompleter(
-            FuzzyCompleter(
-                DynamicCompleter(lambda: self.completer),
-                enable_fuzzy=Condition(lambda: self.enable_fuzzy_completion),
+            # If fuzzy is enabled, first do fuzzy completion, but always add
+            # the non-fuzzy completions, if somehow the fuzzy completer didn't
+            # find them. (Due to the way the cursor position is moved in the
+            # fuzzy completer, some completions will not always be found by the
+            # fuzzy completer, but will be found with the normal completer.)
+            merge_completers(
+                [
+                    ConditionalCompleter(
+                        FuzzyCompleter(DynamicCompleter(lambda: self.completer)),
+                        Condition(lambda: self.enable_fuzzy_completion),
+                    ),
+                    DynamicCompleter(lambda: self.completer),
+                ],
+                deduplicate=True,
             ),
             lambda: self.complete_private_attributes,
         )

setup.py

@@ -20,9 +20,8 @@
         "appdirs",
         "importlib_metadata;python_version<'3.8'",
         "jedi>=0.16.0",
-        # Use prompt_toolkit 3.0.12, because of dont_extend_width bugfix when
-        # signature and completion dropdown are displayed together.
-        "prompt_toolkit>=3.0.12,<3.1.0",
+        # Use prompt_toolkit 3.0.16, because of the `DeduplicateCompleter`.
+        "prompt_toolkit>=3.0.16,<3.1.0",
         "pygments",
         "black",
     ],