2024-05-05 16:32:23 -03:00
|
|
|
# Copyright 2000-2010 Michael Hudson-Doyle <micahel@gmail.com>
|
|
|
|
# Antonio Cuni
|
|
|
|
#
|
|
|
|
# All Rights Reserved
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Permission to use, copy, modify, and distribute this software and
|
|
|
|
# its documentation for any purpose is hereby granted without fee,
|
|
|
|
# provided that the above copyright notice appear in all copies and
|
|
|
|
# that both that copyright notice and this permission notice appear in
|
|
|
|
# supporting documentation.
|
|
|
|
#
|
|
|
|
# THE AUTHOR MICHAEL HUDSON DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
|
|
|
# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
|
|
# AND FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL,
|
|
|
|
# INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
|
|
|
|
# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
|
|
|
|
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
|
|
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
from dataclasses import dataclass, field
|
|
|
|
|
|
|
|
import re
|
|
|
|
from . import commands, console, reader
|
|
|
|
from .reader import Reader
|
|
|
|
|
|
|
|
|
|
|
|
# types
|
|
|
|
Command = commands.Command
|
|
|
|
if False:
|
2024-05-21 23:36:01 -03:00
|
|
|
from .types import KeySpec, CommandName
|
2024-05-05 16:32:23 -03:00
|
|
|
|
|
|
|
|
|
|
|
def prefix(wordlist: list[str], j: int = 0) -> str:
|
|
|
|
d = {}
|
|
|
|
i = j
|
|
|
|
try:
|
|
|
|
while 1:
|
|
|
|
for word in wordlist:
|
|
|
|
d[word[i]] = 1
|
|
|
|
if len(d) > 1:
|
|
|
|
return wordlist[0][j:i]
|
|
|
|
i += 1
|
|
|
|
d = {}
|
|
|
|
except IndexError:
|
|
|
|
return wordlist[0][j:i]
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
STRIPCOLOR_REGEX = re.compile(r"\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[m|K]")
|
|
|
|
|
|
|
|
def stripcolor(s: str) -> str:
|
|
|
|
return STRIPCOLOR_REGEX.sub('', s)
|
|
|
|
|
|
|
|
|
|
|
|
def real_len(s: str) -> int:
|
|
|
|
return len(stripcolor(s))
|
|
|
|
|
|
|
|
|
|
|
|
def left_align(s: str, maxlen: int) -> str:
|
|
|
|
stripped = stripcolor(s)
|
|
|
|
if len(stripped) > maxlen:
|
|
|
|
# too bad, we remove the color
|
|
|
|
return stripped[:maxlen]
|
|
|
|
padding = maxlen - len(stripped)
|
|
|
|
return s + ' '*padding
|
|
|
|
|
|
|
|
|
|
|
|
def build_menu(
|
|
|
|
cons: console.Console,
|
|
|
|
wordlist: list[str],
|
|
|
|
start: int,
|
|
|
|
use_brackets: bool,
|
|
|
|
sort_in_column: bool,
|
|
|
|
) -> tuple[list[str], int]:
|
|
|
|
if use_brackets:
|
|
|
|
item = "[ %s ]"
|
|
|
|
padding = 4
|
|
|
|
else:
|
|
|
|
item = "%s "
|
|
|
|
padding = 2
|
|
|
|
maxlen = min(max(map(real_len, wordlist)), cons.width - padding)
|
|
|
|
cols = int(cons.width / (maxlen + padding))
|
|
|
|
rows = int((len(wordlist) - 1)/cols + 1)
|
|
|
|
|
|
|
|
if sort_in_column:
|
|
|
|
# sort_in_column=False (default) sort_in_column=True
|
|
|
|
# A B C A D G
|
|
|
|
# D E F B E
|
|
|
|
# G C F
|
|
|
|
#
|
2024-08-12 01:16:41 -03:00
|
|
|
# "fill" the table with empty words, so we always have the same amount
|
2024-05-05 16:32:23 -03:00
|
|
|
# of rows for each column
|
|
|
|
missing = cols*rows - len(wordlist)
|
|
|
|
wordlist = wordlist + ['']*missing
|
|
|
|
indexes = [(i % cols) * rows + i // cols for i in range(len(wordlist))]
|
|
|
|
wordlist = [wordlist[i] for i in indexes]
|
|
|
|
menu = []
|
|
|
|
i = start
|
|
|
|
for r in range(rows):
|
|
|
|
row = []
|
|
|
|
for col in range(cols):
|
|
|
|
row.append(item % left_align(wordlist[i], maxlen))
|
|
|
|
i += 1
|
|
|
|
if i >= len(wordlist):
|
|
|
|
break
|
|
|
|
menu.append(''.join(row))
|
|
|
|
if i >= len(wordlist):
|
|
|
|
i = 0
|
|
|
|
break
|
|
|
|
if r + 5 > cons.height:
|
|
|
|
menu.append(" %d more... " % (len(wordlist) - i))
|
|
|
|
break
|
|
|
|
return menu, i
|
|
|
|
|
|
|
|
# this gets somewhat user interface-y, and as a result the logic gets
|
|
|
|
# very convoluted.
|
|
|
|
#
|
|
|
|
# To summarise the summary of the summary:- people are a problem.
|
|
|
|
# -- The Hitch-Hikers Guide to the Galaxy, Episode 12
|
|
|
|
|
|
|
|
#### Desired behaviour of the completions commands.
|
|
|
|
# the considerations are:
|
|
|
|
# (1) how many completions are possible
|
|
|
|
# (2) whether the last command was a completion
|
|
|
|
# (3) if we can assume that the completer is going to return the same set of
|
|
|
|
# completions: this is controlled by the ``assume_immutable_completions``
|
|
|
|
# variable on the reader, which is True by default to match the historical
|
|
|
|
# behaviour of pyrepl, but e.g. False in the ReadlineAlikeReader to match
|
|
|
|
# more closely readline's semantics (this is needed e.g. by
|
|
|
|
# fancycompleter)
|
|
|
|
#
|
|
|
|
# if there's no possible completion, beep at the user and point this out.
|
|
|
|
# this is easy.
|
|
|
|
#
|
|
|
|
# if there's only one possible completion, stick it in. if the last thing
|
|
|
|
# user did was a completion, point out that he isn't getting anywhere, but
|
|
|
|
# only if the ``assume_immutable_completions`` is True.
|
|
|
|
#
|
|
|
|
# now it gets complicated.
|
|
|
|
#
|
|
|
|
# for the first press of a completion key:
|
|
|
|
# if there's a common prefix, stick it in.
|
|
|
|
|
|
|
|
# irrespective of whether anything got stuck in, if the word is now
|
|
|
|
# complete, show the "complete but not unique" message
|
|
|
|
|
|
|
|
# if there's no common prefix and if the word is not now complete,
|
|
|
|
# beep.
|
|
|
|
|
|
|
|
# common prefix -> yes no
|
|
|
|
# word complete \/
|
|
|
|
# yes "cbnu" "cbnu"
|
|
|
|
# no - beep
|
|
|
|
|
|
|
|
# for the second bang on the completion key
|
|
|
|
# there will necessarily be no common prefix
|
|
|
|
# show a menu of the choices.
|
|
|
|
|
|
|
|
# for subsequent bangs, rotate the menu around (if there are sufficient
|
|
|
|
# choices).
|
|
|
|
|
|
|
|
|
|
|
|
class complete(commands.Command):
|
|
|
|
def do(self) -> None:
|
|
|
|
r: CompletingReader
|
|
|
|
r = self.reader # type: ignore[assignment]
|
|
|
|
last_is_completer = r.last_command_is(self.__class__)
|
|
|
|
immutable_completions = r.assume_immutable_completions
|
|
|
|
completions_unchangable = last_is_completer and immutable_completions
|
|
|
|
stem = r.get_stem()
|
|
|
|
if not completions_unchangable:
|
|
|
|
r.cmpltn_menu_choices = r.get_completions(stem)
|
|
|
|
|
|
|
|
completions = r.cmpltn_menu_choices
|
|
|
|
if not completions:
|
|
|
|
r.error("no matches")
|
|
|
|
elif len(completions) == 1:
|
|
|
|
if completions_unchangable and len(completions[0]) == len(stem):
|
|
|
|
r.msg = "[ sole completion ]"
|
|
|
|
r.dirty = True
|
|
|
|
r.insert(completions[0][len(stem):])
|
|
|
|
else:
|
|
|
|
p = prefix(completions, len(stem))
|
|
|
|
if p:
|
|
|
|
r.insert(p)
|
|
|
|
if last_is_completer:
|
2024-06-04 13:09:31 -03:00
|
|
|
r.cmpltn_menu_visible = True
|
|
|
|
r.cmpltn_message_visible = False
|
2024-05-05 16:32:23 -03:00
|
|
|
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
|
2024-06-04 13:09:31 -03:00
|
|
|
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
|
2024-05-05 16:32:23 -03:00
|
|
|
|
|
|
|
|
|
|
|
class self_insert(commands.self_insert):
|
|
|
|
def do(self) -> None:
|
|
|
|
r: CompletingReader
|
|
|
|
r = self.reader # type: ignore[assignment]
|
|
|
|
|
|
|
|
commands.self_insert.do(self)
|
2024-05-21 23:35:44 -03:00
|
|
|
if r.cmpltn_menu_visible:
|
2024-05-05 16:32:23 -03:00
|
|
|
stem = r.get_stem()
|
|
|
|
if len(stem) < 1:
|
|
|
|
r.cmpltn_reset()
|
|
|
|
else:
|
|
|
|
completions = [w for w in r.cmpltn_menu_choices
|
|
|
|
if w.startswith(stem)]
|
|
|
|
if completions:
|
|
|
|
r.cmpltn_menu, r.cmpltn_menu_end = build_menu(
|
|
|
|
r.console, completions, 0,
|
|
|
|
r.use_brackets, r.sort_in_column)
|
|
|
|
else:
|
|
|
|
r.cmpltn_reset()
|
|
|
|
|
|
|
|
|
|
|
|
@dataclass
|
|
|
|
class CompletingReader(Reader):
|
|
|
|
"""Adds completion support"""
|
|
|
|
|
|
|
|
### Class variables
|
|
|
|
# see the comment for the complete command
|
|
|
|
assume_immutable_completions = True
|
|
|
|
use_brackets = True # display completions inside []
|
|
|
|
sort_in_column = False
|
|
|
|
|
|
|
|
### Instance variables
|
|
|
|
cmpltn_menu: list[str] = field(init=False)
|
2024-05-21 23:35:44 -03:00
|
|
|
cmpltn_menu_visible: bool = field(init=False)
|
2024-06-04 13:09:31 -03:00
|
|
|
cmpltn_message_visible: bool = field(init=False)
|
2024-05-05 16:32:23 -03:00
|
|
|
cmpltn_menu_end: int = field(init=False)
|
|
|
|
cmpltn_menu_choices: list[str] = field(init=False)
|
|
|
|
|
|
|
|
def __post_init__(self) -> None:
|
|
|
|
super().__post_init__()
|
|
|
|
self.cmpltn_reset()
|
|
|
|
for c in (complete, self_insert):
|
|
|
|
self.commands[c.__name__] = c
|
|
|
|
self.commands[c.__name__.replace('_', '-')] = c
|
|
|
|
|
|
|
|
def collect_keymap(self) -> tuple[tuple[KeySpec, CommandName], ...]:
|
|
|
|
return super().collect_keymap() + (
|
|
|
|
(r'\t', 'complete'),)
|
|
|
|
|
|
|
|
def after_command(self, cmd: Command) -> None:
|
|
|
|
super().after_command(cmd)
|
|
|
|
if not isinstance(cmd, (complete, self_insert)):
|
|
|
|
self.cmpltn_reset()
|
|
|
|
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 13:42:10 -03:00
|
|
|
def calc_screen(self) -> list[str]:
|
|
|
|
screen = super().calc_screen()
|
2024-05-21 23:35:44 -03:00
|
|
|
if self.cmpltn_menu_visible:
|
2024-05-05 16:32:23 -03:00
|
|
|
ly = self.lxy[1]
|
|
|
|
screen[ly:ly] = self.cmpltn_menu
|
|
|
|
self.screeninfo[ly:ly] = [(0, [])]*len(self.cmpltn_menu)
|
|
|
|
self.cxy = self.cxy[0], self.cxy[1] + len(self.cmpltn_menu)
|
|
|
|
return screen
|
|
|
|
|
|
|
|
def finish(self) -> None:
|
|
|
|
super().finish()
|
|
|
|
self.cmpltn_reset()
|
|
|
|
|
|
|
|
def cmpltn_reset(self) -> None:
|
|
|
|
self.cmpltn_menu = []
|
2024-05-21 23:35:44 -03:00
|
|
|
self.cmpltn_menu_visible = False
|
2024-06-04 13:09:31 -03:00
|
|
|
self.cmpltn_message_visible = False
|
2024-05-05 16:32:23 -03:00
|
|
|
self.cmpltn_menu_end = 0
|
|
|
|
self.cmpltn_menu_choices = []
|
|
|
|
|
|
|
|
def get_stem(self) -> str:
|
|
|
|
st = self.syntax_table
|
|
|
|
SW = reader.SYNTAX_WORD
|
|
|
|
b = self.buffer
|
|
|
|
p = self.pos - 1
|
|
|
|
while p >= 0 and st.get(b[p], SW) == SW:
|
|
|
|
p -= 1
|
|
|
|
return ''.join(b[p+1:self.pos])
|
|
|
|
|
|
|
|
def get_completions(self, stem: str) -> list[str]:
|
|
|
|
return []
|