I changed a bunch of variable names to make things more obvious incalc_screen() andpos2xy(). Plus very mild refactoring once the better names make it obvious which things are the same. It is helpful to me at least.

The one actual change here is movingdisp_str() to_pyrepl.utils because this is where syntax highlighting will live as well. With that move comes a slight performance optimization that will become functionally important later:disp_str() no longer repacks the list of characters into a string (that is later only iterated on anyway incalc_screen()). Additionally, our version ofdisp_str() never had the behavior presented in the docstring, so I replaced it with something more sensible.

That's about it. Tests prove no functional change.

Issue:Syntax highlighting in PyREPL #131507

pythongh-131507: Refactor screen and cursor position calculations

f9f4722

This is based offpython#131509.

ambv requested review frompablogsal andlysnikolaou ascode owners

		offset = len(character_widths) - character_widths.count(0)
		in_wrapped_line = prompt_len + sum(character_widths) >= self.console.width
		prompt_len, char_widths = self.screeninfo[i]
		offset = len(char_widths)

		@@ -560,29 +530,33 @@ def setpos_from_xy(self, x: int, y: int) -> None:

		def pos2xy(self) -> tuple[int, int]:
		"""Return the x, y coordinates of position 'pos'."""
		# this is incomprehensible, yes.

		def disp_str(buffer: str) -> tuple[CharBuffer, CharWidths]:
		r"""Decompose the input buffer into a printable variant.

		Returns a tuple of two lists:
		- the first list is the input buffer, character by character;
		- the second list is the visible width of each character in the input
		buffer.

		Examples:
		>>> utils.disp_str("a = 9")
		(['a', ' ', '=', ' ', '9'], [1, 1, 1, 1, 1])
		"""
		chars: CharBuffer = []
		char_widths: CharWidths = []

		if not buffer:
		return chars, char_widths

		for c in buffer:
		if c == "\x1a": # CTRL-Z on Windows
		chars.append(c)
		char_widths.append(2)
		elif ord(c) < 128:
		chars.append(c)
		char_widths.append(1)
		elif unicodedata.category(c).startswith("C"):
		c = r"\u%04x" % ord(c)
		chars.append(c)
		char_widths.append(len(c))
		else:
		chars.append(c)
		char_widths.append(str_width(c))
		trace("disp_str({buffer}) = {s}, {b}", buffer=repr(buffer), s=chars, b=char_widths)
		return chars, char_widths

	defdisp_str(buffer:str)->tuple[CharBuffer,CharWidths]:
	r"""Decomposetheinputbufferintoaprintablevariant.

	Returnsatupleoftwolists:
	-thefirstlististheinputbuffer,characterbycharacter;
	-thesecondlististhevisiblewidthofeachcharacterintheinput
	buffer.

	Examples:
	>>>utils.disp_str("a = 9")
	(['a',' ','=',' ','9'], [1,1,1,1,1])
	"""
	chars:CharBuffer= []
	char_widths:CharWidths= []

	ifnotbuffer:
	returnchars,char_widths

	forcinbuffer:
	ifc=="\x1a":# CTRL-Z on Windows
	chars.append(c)
	char_widths.append(2)
	eliford(c)<128:
	chars.append(c)
	char_widths.append(1)
	elifunicodedata.category(c).startswith("C"):
	c=r"\u%04x"%ord(c)
	chars.append(c)
	char_widths.append(len(c))
	else:
	chars.append(c)
	char_widths.append(str_width(c))
	trace("disp_str({buffer}) = {s}, {b}",buffer=repr(buffer),s=chars,b=char_widths)
	returnchars,char_widths
	CharBuffer=List[str]
	CharWidths=List[int]

	CTRL_Z="\x1a"
	ASCII_MAX=127
	CTRL_Z_WIDTH=2
	ASCII_WIDTH=1

	@lru_cache(maxsize=1024)
	defcached_category(c:str)->str:
	"""Cache unicodedata.category calls for better performance."""
	returnunicodedata.category(c)

	defdisp_str(buffer:str)->Tuple[CharBuffer,CharWidths]:
	r"""Decomposetheinputbufferintoaprintablevariant.

	Returnsatupleoftwolists:
	-thefirstlististheinputbuffer,characterbycharacter;
	-thesecondlististhevisiblewidthofeachcharacterintheinputbuffer.

	Examples:
	>>>utils.disp_str("a = 9")
	(['a',' ','=',' ','9'], [1,1,1,1,1])
	"""
	# Fast path for empty buffer
	ifnotbuffer:
	return [], []

	# Optimization for common case: pure ASCII text
	ifall(ord(c)<ASCII_MAXforcinbuffer):
	chars=list(buffer)
	char_widths= [ASCII_WIDTH]*len(buffer)
	trace("disp_str({buffer}) = {s}, {b}",buffer=repr(buffer),s=chars,b=char_widths)
	returnchars,char_widths

	chars:CharBuffer= []
	char_widths:CharWidths= []

	# Pre-allocate lists for better performance
	chars= [None]*len(buffer)
	char_widths= [0]*len(buffer)

	fori,cinenumerate(buffer):
	ifc==CTRL_Z:# CTRL-Z on Windows
	chars[i]=c
	char_widths[i]=CTRL_Z_WIDTH
	eliford(c)<ASCII_MAX:
	chars[i]=c
	char_widths[i]=ASCII_WIDTH
	elifcached_category(c).startswith("C"):
	unicode_repr=f"\\u{ord(c):04x}"
	chars[i]=unicode_repr
	char_widths[i]=len(unicode_repr)
	else:
	chars[i]=c
	try:
	char_widths[i]=str_width(c)
	exceptException:
	# Fallback if str_width fails
	char_widths[i]=1

	trace("disp_str({buffer}) = {s}, {b}",buffer=repr(buffer),s=chars,b=char_widths)
	returnchars,char_widths

		ifnot in_wrapped_line:
		offset +=1 #there's a newline in buffer

		pos -=offset

Movatterモバイル変換

Uh oh!

gh-131507: Refactor screen and cursor position calculations#131547

gh-131507: Refactor screen and cursor position calculations#131547

Uh oh!

Conversation

ambv commentedMar 21, 2025• edited by bedevere-appbotLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ambvMar 21, 2025• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pablogsal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

miss-islington-appbot commentedMar 21, 2025

Uh oh!

bedevere-appbot commentedMar 21, 2025

Uh oh!

Uh oh!

ambv commentedMar 21, 2025•
edited by bedevere-appbot
Loading

ambvMar 21, 2025•
edited
Loading