Insert "import" only when module name is complete

Author: loic-simon

Lib/_pyrepl/_module_completer.py

@@ -115,9 +115,9 @@ def complete(
             path, prefix = self.get_path_and_prefix(from_name)
             modules = self.find_modules(path, prefix)
             names = [self.format_completion(path, module) for module in modules]
-            if len(names) == 1:
-                # One match: insert a space to allow for "import" suggestion
-                names[0] = f"{names[0]} "
+            if names == [from_name]:
+                # Exact match already written: continue with import statement
+                names = [f"{from_name} import "]
             # These are always modules, use dummy values to get the right color
             values = [sys] * len(names) if include_values else []
             return names, values, None
@@ -353,7 +353,7 @@ class ImportParser:
         - `import foo`          -> Result(from_name=None, name='foo')
         - `import foo.`         -> Result(from_name=None, name='foo.')
         - `from foo`            -> Result(from_name='foo', name=None)
-        - `from foo `           -> Result(from_name='foo', name=None, end_space=True)
+        - `from foo `           -> Result(from_name='foo', name=None, space_end=True)
         - `from foo import bar` -> Result(from_name='foo', name='bar')
         - `from .foo import (`  -> Result(from_name='.foo', name='')
 

Lib/test/test_pyrepl/test_pyrepl.py

@@ -1230,17 +1230,20 @@ def test_completions(self):
             ("import importlib.resources.\t\ta\t\n", "import importlib.resources.abc"),
             ("import foo, impo\t\n", "import foo, importlib"),
             ("import foo as bar, impo\t\n", "import foo as bar, importlib"),
-            ("from impo\t\n", "from importlib "),
+            ("from impo\t\n", "from importlib"),
             ("from impo\t\t\n", "from importlib import "),
+            ("from impo\t\t\t\n", "from importlib import "),
             ("from impo \t\n", "from impo import "),
-            ("from importlib.res\t\n", "from importlib.resources "),
-            ("from importlib.\t\tres\t\n", "from importlib.resources "),
+            ("from importlib\t\n", "from importlib import "),
+            ("from importlib.res\t\n", "from importlib.resources"),
+            ("from importlib.\t\tres\t\n", "from importlib.resources"),
             ("from importlib.res\t\t\n", "from importlib.resources import "),
             ("from importlib.res \t\n", "from importlib.res import "),
-            ("from importlib.resources.ab\t\n", "from importlib.resources.abc "),
+            ("from importlib.resources\t\n", "from importlib.resources import "),
+            ("from importlib.resources.ab\t\n", "from importlib.resources.abc"),
             ("from importlib import mac\t\n", "from importlib import machinery"),
             ("from importlib import res\t\n", "from importlib import resources"),
-            ("from importlib.res\timport a\t\n", "from importlib.resources import abc"),
+            ("from importlib.res\t import a\t\n", "from importlib.resources import abc"),
             ("from importlib.res\t\ta\t\n", "from importlib.resources import abc"),
             ("from __phello__ import s\t\n", "from __phello__ import spam"),  # frozen module
         )
@@ -1258,10 +1261,10 @@ def test_private_completions(self):
         cases = (
             # Return public methods by default
             ("import \t\n", "import public"),
-            ("from \t\n", "from public "),
+            ("from \t\n", "from public"),
             # Return private methods if explicitly specified
             ("import _\t\n", "import _private"),
-            ("from _\t\n", "from _private "),
+            ("from _\t\n", "from _private"),
         )
         for code, expected in cases:
             with self.subTest(code=code):
@@ -1294,7 +1297,7 @@ def test_sub_module_private_completions(self):
     def test_builtin_completion_top_level(self):
         cases = (
             ("import bui\t\n", "import builtins"),
-            ("from bui\t\n", "from builtins "),
+            ("from bui\t\n", "from builtins"),
         )
         for code, expected in cases:
             with self.subTest(code=code):
@@ -1307,11 +1310,11 @@ def test_relative_completions(self):
         cases = (
             (None, "from .readl\t\n", "from .readl"),
             (None, "from . import readl\t\n", "from . import readl"),
-            ("_pyrepl", "from .readl\t\n", "from .readline "),
+            ("_pyrepl", "from .readl\t\n", "from .readline"),
             ("_pyrepl", "from . import readl\t\n", "from . import readline"),
             ("_pyrepl", "from .readline import mul\t\n", "from .readline import multiline_input"),
             ("_pyrepl", "from .. import toodeep\t\n", "from .. import toodeep"),
-            ("concurrent", "from .futures.i\t\n", "from .futures.interpreter "),
+            ("concurrent", "from .futures.i\t\n", "from .futures.interpreter"),
         )
         for package, code, expected in cases:
             with self.subTest(code=code):