summaryrefslogtreecommitdiffstats
path: root/Lib/_pyrepl
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2024-06-04 18:10:29 (GMT)
committerGitHub <noreply@github.com>2024-06-04 18:10:29 (GMT)
commit8d74eae4d492f23f33757b05f7de2cdbe210760e (patch)
treeb3604489b7eab400f134aa18eba3a46b4c3c62b4 /Lib/_pyrepl
parent2acbdc23ad4dd14b3b6ad22e06d6477dc57b0530 (diff)
downloadcpython-8d74eae4d492f23f33757b05f7de2cdbe210760e.zip
cpython-8d74eae4d492f23f33757b05f7de2cdbe210760e.tar.gz
cpython-8d74eae4d492f23f33757b05f7de2cdbe210760e.tar.bz2
[3.13] gh-120041: Do not use append_to_screen when completions are visible (GH-120042) (#120051)
* gh-120041: Do not use append_to_screen when completions are visible (GH-120042) (cherry picked from commit 8fc7653766b106bdbc4ff6154e0020aea4ab15e6) * gh-120041: Refactor check for visible completion menu in completing_reader (GH-120055) (cherry picked from commit bf8e5e53d0c359a1f9c285d855e7a5e9b6d91375) --------- Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
Diffstat (limited to 'Lib/_pyrepl')
-rw-r--r--Lib/_pyrepl/completing_reader.py23
1 files changed, 15 insertions, 8 deletions
diff --git a/Lib/_pyrepl/completing_reader.py b/Lib/_pyrepl/completing_reader.py
index c11d2da..8df35cc 100644
--- a/Lib/_pyrepl/completing_reader.py
+++ b/Lib/_pyrepl/completing_reader.py
@@ -187,18 +187,20 @@ class complete(commands.Command):
if p:
r.insert(p)
if last_is_completer:
- if not r.cmpltn_menu_visible:
- r.cmpltn_menu_visible = True
+ r.cmpltn_menu_visible = True
+ r.cmpltn_message_visible = False
r.cmpltn_menu, r.cmpltn_menu_end = build_menu(
r.console, completions, r.cmpltn_menu_end,
r.use_brackets, r.sort_in_column)
r.dirty = True
- elif stem + p in completions:
- r.msg = "[ complete but not unique ]"
- r.dirty = True
- else:
- r.msg = "[ not unique ]"
- r.dirty = True
+ elif not r.cmpltn_menu_visible:
+ r.cmpltn_message_visible = True
+ if stem + p in completions:
+ r.msg = "[ complete but not unique ]"
+ r.dirty = True
+ else:
+ r.msg = "[ not unique ]"
+ r.dirty = True
class self_insert(commands.self_insert):
@@ -208,6 +210,9 @@ class self_insert(commands.self_insert):
commands.self_insert.do(self)
+ if r.cmpltn_menu_visible or r.cmpltn_message_visible:
+ r.calc_screen = r.calc_complete_screen
+
if r.cmpltn_menu_visible:
stem = r.get_stem()
if len(stem) < 1:
@@ -236,6 +241,7 @@ class CompletingReader(Reader):
### Instance variables
cmpltn_menu: list[str] = field(init=False)
cmpltn_menu_visible: bool = field(init=False)
+ cmpltn_message_visible: bool = field(init=False)
cmpltn_menu_end: int = field(init=False)
cmpltn_menu_choices: list[str] = field(init=False)
@@ -271,6 +277,7 @@ class CompletingReader(Reader):
def cmpltn_reset(self) -> None:
self.cmpltn_menu = []
self.cmpltn_menu_visible = False
+ self.cmpltn_message_visible = False
self.cmpltn_menu_end = 0
self.cmpltn_menu_choices = []