PyREPL: fix completion inserted if spaces in import statements

Fix `from math .<tab>` inserting `from math .ath.integer` instead of `from math.integer`

Author: loic-simon

Lib/_pyrepl/_module_completer.py

@@ -11,9 +11,9 @@
 from io import StringIO
 from contextlib import contextmanager
 from dataclasses import dataclass
-from itertools import chain
+from itertools import chain, takewhile
 from tokenize import TokenInfo
-
+from .trace import trace
 TYPE_CHECKING = False
 
 if TYPE_CHECKING:
@@ -82,7 +82,9 @@ def get_completions(self, line: str) -> tuple[list[str], CompletionAction | None
         if not result:
             return None
         try:
-            return self.complete(*result)
+            names, action = self.complete(*result)
+            names = [self._remove_separated_words(line, c) for c in names]
+            return names, action
         except Exception:
             # Some unexpected error occurred, make it look like
             # no completions are available
@@ -300,6 +302,26 @@ def _do_import() -> str | None:
 
         return (prompt, _do_import)
 
+    def _remove_separated_words(self, line: str, completion: str) -> str:
+        """Remove completion parts imputed as separate words.
+
+        Needed because the completer insert any completion provided
+        by replacing the stem (eg. word) currently imputed, if any.
+
+        Examples:
+            - 'import foo.', 'foo.bar'    -> 'foo.bar'
+            - 'import foo  .', 'foo.bar'  -> '.bar'
+            - 'from foo import ', 'bar'   -> 'bar'
+            - 'import x.x .x.', 'x.x.x.x' -> '.x.x'
+        """
+        last_word = line.split(" ")[-1]
+        if not last_word:
+            return completion
+        index = completion.rfind(last_word)
+        if index > 0:
+            return completion[index:]
+        return completion
+
 
 class ImportParser:
     """

Lib/test/test_pyrepl/test_pyrepl.py

@@ -1176,6 +1176,12 @@ def test_completions(self):
             ("from importlib import res\t\n", "from importlib import resources"),
             ("from importlib.res\t import a\t\n", "from importlib.resources import abc"),
             ("from __phello__ import s\t\n", "from __phello__ import spam"),  # frozen module
+            ("import importlib .res\t\n", "import importlib .resources"),
+            ("import importlib. res\t\n", "import importlib. resources"),
+            ("import importlib . res\t\n", "import importlib . resources"),
+            ("import importlib  .metadata.\t\n", "import importlib  .metadata.diagnose"),
+            ("import importlib .metadata   .\t\n", "import importlib .metadata   .diagnose"),
+            ("from importlib .resources .a\t\n", "from importlib .resources .abc"),
         )
         for code, expected in cases:
             with self.subTest(code=code):
@@ -1564,8 +1570,13 @@ def test_parse(self):
             ('import a.b.c, foo.bar, ', (None, '')),
             ('from foo', ('foo', None)),
             ('from a.', ('a.', None)),
+            ('from a .', ('a.', None)),
+            ('from a   .', ('a.', None)),
+            ('from a .', ('a.', None)),
             ('from a.b', ('a.b', None)),
             ('from a.b.', ('a.b.', None)),
+            ('from a. b.', ('a.b.', None)),
+            ('from a  .  b  .', ('a.b.', None)),
             ('from a.b.c', ('a.b.c', None)),
             ('from foo import ', ('foo', '')),
             ('from foo import a', ('foo', 'a')),

Misc/NEWS.d/next/Core_and_Builtins/2026-04-15-21-55-45.gh-issue-69605.NwoP6l.rst

@@ -0,0 +1,2 @@
+Fix :term:`REPL` completions inserted incorrectly when there was spaces in
+import statements.