Rooba
/
rich
mirror of https://github.com/Textualize/rich.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[syntax] silently clamp the column index of stylised ranges to the maximum possible value

This commit is contained in:
Olivier Philippon 2022-06-24 15:54:10 +01:00
parent b6a4cfab5a
commit 6e634705b7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rich/syntax.py
View File

@ -803,7 +803,8 @@ def _get_code_index_for_syntax_position(
Returns:
Optional[int]: The index of the code string for this position, or `None`
if the position is out of range.
if the given position's line number is out of range (if it's the column that is out of range
we silently clamp its value so that it reaches the end of the line)
"""
lines_count = len(newlines_offsets)
@ -812,8 +813,8 @@ def _get_code_index_for_syntax_position(
return None # `line_number` is out of range
line_index = line_number - 1
line_length = newlines_offsets[line_index + 1] - newlines_offsets[line_index] - 1
if line_length < column_index:
return None # `column_index` is out of range
# If `column_index` is out of range: let's silently clamp it:
column_index = min(line_length, column_index)
return newlines_offsets[line_index] + column_index

11
tests/test_syntax.py
View File

File diff suppressed because one or more lines are too long