Skip to content

gh-130472: Use fancycompleter in import completions #148188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogsal merged 13 commits into from
May 5, 2026
Merged

gh-130472: Use fancycompleter in import completions #148188

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
89dde8f
Extract safe_getattr into a separate function
tomasr8 Apr 6, 2026
2b05c47
Extract colorize methods into reusable functions
tomasr8 Apr 6, 2026
8e75eb6
Colorize import completions
tomasr8 Apr 6, 2026
3b20cf3
Add tests
tomasr8 Apr 6, 2026
9e9d9d8
Simplify logic
tomasr8 Apr 6, 2026
a1576a0
Improve tests
tomasr8 Apr 6, 2026
7c95992
Restore original test name
tomasr8 Apr 6, 2026
f7dc27b
Use consistent type annotations
tomasr8 Apr 8, 2026
fe605cf
Attributes come first
tomasr8 Apr 8, 2026
30c576d
Make mypy happy
tomasr8 Apr 8, 2026
94e783c
Add a test
tomasr8 Apr 8, 2026
04b5d42
Add news entry
tomasr8 Apr 8, 2026
0b29824
fixup! Add news entry
pablogsal May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve tests
  • Loading branch information
@tomasr8
tomasr8 committed Apr 6, 2026
commit a1576a0ac80b40d3cc00f487b44c1012def46d21
46 changes: 23 additions & 23 deletions Lib/test/test_pyrepl/test_pyrepl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@
multiline_input,
code_to_events,
)
from _colorize import ANSIColors, get_theme
from _pyrepl.console import Event
from _pyrepl.completing_reader import stripcolor
from _pyrepl._module_completer import (
ImportParser,
ModuleCompleter,
HARDCODED_SUBMODULES,
)
from _pyrepl.fancycompleter import Completer as FancyCompleter
from _pyrepl.fancycompleter import Completer as FancyCompleter, colorize_matches
import _pyrepl.readline as pyrepl_readline
from _pyrepl.readline import (
ReadlineAlikeReader,
Expand Down Expand Up @@ -1642,38 +1643,37 @@ def test_suggestions_and_messages(self) -> None:
self.assertSetEqual(new_imports, expected_imports)

def test_colorize_import_completions(self) -> None:
from _colorize import get_theme
from _pyrepl.fancycompleter import colorize_matches
from _pyrepl.completing_reader import stripcolor

theme = get_theme()
type_color = theme.fancycompleter.type
module_color = theme.fancycompleter.module
R = ANSIColors.RESET

colorize = lambda names, values: colorize_matches(names, values, theme)
config = ReadlineConfig(colorize_completions=colorize)

reader = ReadlineAlikeReader(
console=FakeConsole(events=[]),
config=config,
)

# Multiple completions should be colorized (contain ANSI codes)
reader.buffer = list("from collections import d")
# "from collections import de" -> defaultdict (type) and deque (type)
reader.buffer = list("from collections import de")
reader.pos = len(reader.buffer)
result = reader.get_module_completions()
self.assertIsNotNone(result)
names, action = result
self.assertTrue(len(names) > 1)
# Colorized names contain ANSI escape sequences
self.assertTrue(any(name != stripcolor(name) for name in names
if name.strip()))

# Single completion should NOT be colorized
reader.buffer = list("from collections import Order")
names, action = reader.get_module_completions()
self.assertEqual(names, [
f"{type_color}defaultdict{R}",
f"{type_color}deque{R}",
])
self.assertIsNone(action)

# "from importlib.m" has submodule completions colored as modules
reader.buffer = list("from importlib.m")
reader.pos = len(reader.buffer)
result = reader.get_module_completions()
self.assertIsNotNone(result)
names, action = result
self.assertEqual(len(names), 1)
self.assertEqual(names[0], stripcolor(names[0]))
names, action = reader.get_module_completions()
self.assertEqual(names, [
f"{module_color}importlib.machinery{R}",
f"{module_color}importlib.metadata{R}",
])
self.assertIsNone(action)

Comment thread
pablogsal marked this conversation as resolved.

# Audit hook used to check for stdlib modules import side-effects
Expand Down