failed WRONG_FIX wrong_fix · 28 tool calls · 71 s · Textualize/rich
Fixed exception in append_tokens Fixes https://github.com/Textualize/rich/issues/3014
| # | Tool | Arguments | Result |
|---|---|---|---|
| 1 | run_command | {
"command": "grep -rn \"append_tokens\" . | head -20"
} | {"status": "ok", "stdout": "./CHANGELOG.md:1194:- Added Text.append_tokens for fast appending of string + Style pairs\n./CHANGELOG.md:1196:- Added Text.append_tfull{"status": "ok", "stdout": "./CHANGELOG.md:1194:- Added Text.append_tokens for fast appending of string + Style pairs\n./CHANGELOG.md:1196:- Added Text.append_tokens\n./rich/syntax.py:521: text.append_tokens(tokens_to_spans())\n./rich/syntax.py:524: text.append_tokens(\n./rich/text.py:1028: def append_tokens(\n", "exit_code": 0} |
| 2 | read_file | {
"filepath": "rich/text.py",
"start_line": 1028,
"end_line": 1100
} | {"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"full{"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"Append iterable of str and style. Style may be a Style instance or a str style definition.\n\n Args:\n tokens (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.\n\n Returns:\n Text: Returns self for chaining.\n \"\"\"\n append_text = self._text.append\n append_span = self._spans.append\n _Span = Span\n offset = len(self)\n for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)\n self._length = offset\n return self\n\n def copy_styles(self, text: \"Text\") -> None:\n \"\"\"Copy styles from another Text instance.\n\n Args:\n text (Text): A Text instance to copy styles from, must be the same length.\n \"\"\"\n self._spans.extend(text._spans)\n\n def split(\n self,\n separator: str = \"\\n\",\n *,\n include_separator: bool = False,\n allow_blank: bool = False,\n ) -> Lines:\n \"\"\"Split rich text in to lines, preserving styles.\n\n Args:\n separator (str, optional): String to split on. Defaults to \"\\\\\\\\n\".\n include_separator (bool, optional): Include the separator in the lines. Defaults to False.\n allow_blank (bool, optional): Return a blank line if the text ends with a separator. Defaults to False.\n\n Returns:\n List[RichText]: A list of rich text, one per line of the original.\n \"\"\"\n assert separator, \"separator must not be empty\"\n\n text = self.plain\n if separator not in text:\n return Lines([self.copy()])\n\n |
| 3 | run_command | {
"command": "grep -rn \"append_tokens\" rich/syntax.py"
} | {"status": "ok", "stdout": "521: text.append_tokens(tokens_to_spans())\n524: text.append_tokens(\n", "exit_code": 0}full{"status": "ok", "stdout": "521: text.append_tokens(tokens_to_spans())\n524: text.append_tokens(\n", "exit_code": 0} |
| 4 | read_file | {
"end_line": 540,
"filepath": "rich/syntax.py",
"start_line": 500
} | {"status": "ok", "filepath": "rich/syntax.py", "content": " tokens = iter(line_tokenize())\n line_no = 0\n _line_start = line_start - 1 if line_start else 0\n\nfull{"status": "ok", "filepath": "rich/syntax.py", "content": " tokens = iter(line_tokenize())\n line_no = 0\n _line_start = line_start - 1 if line_start else 0\n\n # Skip over tokens until line start\n while line_no < _line_start:\n try:\n _token_type, token = next(tokens)\n except StopIteration:\n break\n yield (token, None)\n if token.endswith(\"\\n\"):\n line_no += 1\n # Generate spans until line end\n for token_type, token in tokens:\n yield (token, _get_theme_style(token_type))\n if token.endswith(\"\\n\"):\n line_no += 1\n if line_end and line_no >= line_end:\n break\n\n text.append_tokens(tokens_to_spans())\n\n else:\n text.append_tokens(\n (token, _get_theme_style(token_type))\n for token_type, token in lexer.get_tokens(code)\n )\n if self.background_color is not None:\n text.stylize(f\"on {self.background_color}\")\n\n if self._stylized_ranges:\n self._apply_stylized_ranges(text)\n\n return text\n\n def stylize_range(\n self, style: StyleType, start: SyntaxPosition, end: SyntaxPosition\n ) -> None:\n \"\"\"\n Adds a custom style on a part of the code, that will be applied to the syntax display when it's rendered.\n", "start_line": 500, "end_line": 540, "total_lines": 955, "is_truncated": false} |
| 5 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('hello', None), (' world', 'bold')]); print(t)\""
} | {"status": "ok", "stdout": "hello world\n", "exit_code": 0}full{"status": "ok", "stdout": "hello world\n", "exit_code": 0} |
| 6 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([]); print(t)\""
} | {"status": "ok", "stdout": "\n", "exit_code": 0}full{"status": "ok", "stdout": "\n", "exit_code": 0} |
| 7 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('hello', None), (' world', 'bold'), ('!', None)]); print(t)\""
} | {"status": "ok", "stdout": "hello world!\n", "exit_code": 0}full{"status": "ok", "stdout": "hello world!\n", "exit_code": 0} |
| 8 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('', 'bold')]); print(f'length: {len(t)}, plain: {t.plain}')\""
} | {"status": "ok", "stdout": "length: 0, plain: \n", "exit_code": 0}full{"status": "ok", "stdout": "length: 0, plain: \n", "exit_code": 0} |
| 9 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text('start'); t.append_tokens([('', 'bold')]); print(f'length: {len(t)}, plain: {t.plain}')\""
} | {"status": "ok", "stdout": "length: 5, plain: start\n", "exit_code": 0}full{"status": "ok", "stdout": "length: 5, plain: start\n", "exit_code": 0} |
| 10 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text('start'); t.append_tokens([('middle', 'bold'), ('', 'red'), ('end', None)]); print(f'plain: {t.plain}, spans: {t._spans}')\""
} | {"status": "ok", "stdout": "plain: startmiddleend, spans: [Span(5, 11, 'bold'), Span(11, 11, 'red')]\n", "exit_code": 0}full{"status": "ok", "stdout": "plain: startmiddleend, spans: [Span(5, 11, 'bold'), Span(11, 11, 'red')]\n", "exit_code": 0} |
| 11 | run_command | {
"command": "grep -r \"append_tokens\" ."
} | {"status": "ok", "stdout": "./CHANGELOG.md:- Added Text.append_tokens for fast appending of string + Style pairs\n./CHANGELOG.md:- Added Text.append_tokens\n./rfull{"status": "ok", "stdout": "./CHANGELOG.md:- Added Text.append_tokens for fast appending of string + Style pairs\n./CHANGELOG.md:- Added Text.append_tokens\n./rich/syntax.py: text.append_tokens(tokens_to_spans())\n./rich/syntax.py: text.append_tokens(\n./rich/text.py: def append_tokens(\n", "exit_code": 0} |
| 12 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([(None, 'bold')]); print('done')\""
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "Traceback (most recenfull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "Traceback (most recent call last):\n File \"<string>\", line 1, in <module>\n from rich.text import Text; t = Text(); t.append_tokens([(None, 'bold')]); print('done')\n ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^\n File \"/workspace/rich/text.py\", line 1046, in append_tokens\n append_span(_Span(offset, offset + len(content), style))\n ~~~^^^^^^^^^\nTypeError: object of type 'NoneType' has no len()\n", "exit_code": 1}} |
| 13 | read_file | {
"end_line": 1048,
"filepath": "rich/text.py",
"start_line": 1028
} | {"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"full{"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"Append iterable of str and style. Style may be a Style instance or a str style definition.\n\n Args:\n tokens (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.\n\n Returns:\n Text: Returns self for chaining.\n \"\"\"\n append_text = self._text.append\n append_span = self._spans.append\n _Span = Span\n offset = len(self)\n for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)\n self._length = offset\n", "start_line": 1028, "end_line": 1048, "total_lines": 1357, "is_truncated": false} |
| 14 | edit_file | {
"filepath": "rich/text.py",
"new_string": " for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)",
"old_string": " for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)"
} | {"status": "ok", "filepath": "rich/text.py", "occurrences": 1, "strategy": "exact", "diff": "", "is_truncated": false}full{"status": "ok", "filepath": "rich/text.py", "occurrences": 1, "strategy": "exact", "diff": "", "is_truncated": false} |
| 15 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([(None, 'bold')]); print('done')\""
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "Traceback (most recenfull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "Traceback (most recent call last):\n File \"<string>\", line 1, in <module>\n from rich.text import Text; t = Text(); t.append_tokens([(None, 'bold')]); print('done')\n ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^\n File \"/workspace/rich/text.py\", line 1046, in append_tokens\n append_span(_Span(offset, offset + len(content), style))\n ~~~^^^^^^^^^\nTypeError: object of type 'NoneType' has no len()\n", "exit_code": 1}} |
| 16 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append('hello'); t.append(None); print(f'len: {len(t)}, plain: {t.plain}')\""
} | {"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "Traceback (most recenfull{"status": "error", "error_type": "CommandError", "error_message": "Command failed with exit code 1", "details": {"stdout": "", "stderr": "Traceback (most recent call last):\n File \"<string>\", line 1, in <module>\n from rich.text import Text; t = Text(); t.append('hello'); t.append(None); print(f'len: {len(t)}, plain: {t.plain}')\n ~~~~~~~~^^^^^^\n File \"/workspace/rich/text.py\", line 976, in append\n raise TypeError(\"Only str or Text can be appended to Text\")\nTypeError: Only str or Text can be appended to Text\n", "exit_code": 1}} |
| 17 | read_file | {
"end_line": 1048,
"filepath": "rich/text.py",
"start_line": 1028
} | {"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"full{"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"Append iterable of str and style. Style may be a Style instance or a str style definition.\n\n Args:\n tokens (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.\n\n Returns:\n Text: Returns self for chaining.\n \"\"\"\n append_text = self._text.append\n append_span = self._spans.append\n _Span = Span\n offset = len(self)\n for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)\n self._length = offset\n", "start_line": 1028, "end_line": 1048, "total_lines": 1357, "is_truncated": false} |
| 18 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('', 'bold')]); print(f'length: {len(t)}, plain: {t.plain}')\""
} | {"status": "ok", "stdout": "length: 0, plain: \n", "exit_code": 0}full{"status": "ok", "stdout": "length: 0, plain: \n", "exit_code": 0} |
| 19 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('', 'bold')]); print(f'spans: {t._spans}')\""
} | {"status": "ok", "stdout": "spans: [Span(0, 0, 'bold')]\n", "exit_code": 0}full{"status": "ok", "stdout": "spans: [Span(0, 0, 'bold')]\n", "exit_code": 0} |
| 20 | run_command | {
"command": "grep -rn \"append_tokens\" ."
} | {"status": "ok", "stdout": "./CHANGELOG.md:1194:- Added Text.append_tokens for fast appending of string + Style pairs\n./CHANGELOG.md:1196:- Added Text.append_tfull{"status": "ok", "stdout": "./CHANGELOG.md:1194:- Added Text.append_tokens for fast appending of string + Style pairs\n./CHANGELOG.md:1196:- Added Text.append_tokens\n./rich/syntax.py:521: text.append_tokens(tokens_to_spans())\n./rich/syntax.py:524: text.append_tokens(\n./rich/text.py:1028: def append_tokens(\n", "exit_code": 0} |
| 21 | read_file | {
"end_line": 530,
"filepath": "rich/syntax.py",
"start_line": 510
} | {"status": "ok", "filepath": "rich/syntax.py", "content": " yield (token, None)\n if token.endswith(\"\\n\"):\n line_no += 1\n # Generate spans until line end\nfull{"status": "ok", "filepath": "rich/syntax.py", "content": " yield (token, None)\n if token.endswith(\"\\n\"):\n line_no += 1\n # Generate spans until line end\n for token_type, token in tokens:\n yield (token, _get_theme_style(token_type))\n if token.endswith(\"\\n\"):\n line_no += 1\n if line_end and line_no >= line_end:\n break\n\n text.append_tokens(tokens_to_spans())\n\n else:\n text.append_tokens(\n (token, _get_theme_style(token_type))\n for token_type, token in lexer.get_tokens(code)\n )\n if self.background_color is not None:\n text.stylize(f\"on {self.background_color}\")\n\n", "start_line": 510, "end_line": 530, "total_lines": 955, "is_truncated": false} |
| 22-23 ×2 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('a', None), ('', 'bold')]); print(f'plain: {t.plain}, spans: {t._spans}')\""
} | {"status": "ok", "stdout": "plain: a, spans: [Span(1, 1, 'bold')]\n", "exit_code": 0}full{"status": "ok", "stdout": "plain: a, spans: [Span(1, 1, 'bold')]\n", "exit_code": 0} |
| 24 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('', None)]); print(f'plain: {t.plain}, spans: {t._spans}')\""
} | {"status": "ok", "stdout": "plain: , spans: []\n", "exit_code": 0}full{"status": "ok", "stdout": "plain: , spans: []\n", "exit_code": 0} |
| 25 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([('a', 'bold'), ('', 'red'), ('b', 'bold')]); print(f'plain: {t.plain}, spans: {t._spans}')\""
} | {"status": "ok", "stdout": "plain: ab, spans: [Span(0, 1, 'bold'), Span(1, 1, 'red'), Span(1, 2, 'bold')]\n", "exit_code": 0}full{"status": "ok", "stdout": "plain: ab, spans: [Span(0, 1, 'bold'), Span(1, 1, 'red'), Span(1, 2, 'bold')]\n", "exit_code": 0} |
| 26 | read_file | {
"end_line": 1048,
"filepath": "rich/text.py",
"start_line": 1028
} | {"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"full{"status": "ok", "filepath": "rich/text.py", "content": " def append_tokens(\n self, tokens: Iterable[Tuple[str, Optional[StyleType]]]\n ) -> \"Text\":\n \"\"\"Append iterable of str and style. Style may be a Style instance or a str style definition.\n\n Args:\n tokens (Iterable[Tuple[str, Optional[StyleType]]]): An iterable of tuples containing str content and style.\n\n Returns:\n Text: Returns self for chaining.\n \"\"\"\n append_text = self._text.append\n append_span = self._spans.append\n _Span = Span\n offset = len(self)\n for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)\n self._length = offset\n", "start_line": 1028, "end_line": 1048, "total_lines": 1357, "is_truncated": false} |
| 27 | edit_file | {
"filepath": "rich/text.py",
"new_string": " for content, style in tokens:\n if content is None:\n continue\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)",
"old_string": " for content, style in tokens:\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n offset += len(content)"
} | {"status": "ok", "filepath": "rich/text.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/rich/text.py\n+++ b/rich/text.py\n@@ -1041,6 +1041,8 @@\n _Spfull{"status": "ok", "filepath": "rich/text.py", "occurrences": 1, "strategy": "exact", "diff": "--- a/rich/text.py\n+++ b/rich/text.py\n@@ -1041,6 +1041,8 @@\n _Span = Span\n offset = len(self)\n for content, style in tokens:\n+ if content is None:\n+ continue\n append_text(content)\n if style:\n append_span(_Span(offset, offset + len(content), style))\n", "is_truncated": false} |
| 28 | run_command | {
"command": "python3 -c \"from rich.text import Text; t = Text(); t.append_tokens([(None, 'bold')]); print('done')\""
} | {"status": "ok", "stdout": "done\n", "exit_code": 0}full{"status": "ok", "stdout": "done\n", "exit_code": 0} |
| 29 | submit_patch | [] | {"status": "ok", "patch_size": 438, "files_changed": 1}full{"status": "ok", "patch_size": 438, "files_changed": 1} |
diff --git a/rich/text.py b/rich/text.py
index 7b32967f..9605671d 100644
--- a/rich/text.py
+++ b/rich/text.py
@@ -1041,6 +1041,8 @@ class Text(JupyterMixin):
_Span = Span
offset = len(self)
for content, style in tokens:
+ if content is None:
+ continue
append_text(content)
if style:
append_span(_Span(offset, offset + len(content), style))
........................................................................ [ 66%]
...................................F
=================================== FAILURES ===================================
______________________________ test_append_tokens ______________________________
def test_append_tokens() -> None:
"""Regression test for https://github.com/Textualize/rich/issues/3014"""
console = Console()
t = Text().append_tokens(
[
(
"long text that will be wrapped with a control code \r\n",
"red",
),
]
)
with console.capture() as capture:
> console.print(t, width=40)
tests/test_text.py:999:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
rich/console.py:1710: in print
extend(render(renderable, render_options))
rich/console.py:1331: in render
for render_output in iter_render:
rich/text.py:694: in __rich_console__
lines = self.wrap(
rich/text.py:1236: in wrap
new_lines = line.divide(offsets)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
self = <text 'long text that will be wrapped with a control code ' [Span(0, 52, 'red')]>
offsets = [38]
def divide(self, offsets: Iterable[int]) -> Lines:
"""Divide text in to a number of lines at given offsets.
Args:
offsets (Iterable[int]): Offsets used to divide text.
Returns:
Lines: New RichText instances between offsets.
"""
_offsets = list(offsets)
if not _offsets:
return Lines([self.copy()])
text = self.plain
text_length = len(text)
divide_offsets = [0, *_offsets, text_length]
line_ranges = list(zip(divide_offsets, divide_offsets[1:]))
style = self.style
justify = self.justify
overflow = self.overflow
_Text = Text
new_lines = Lines(
_Text(
text[start:end],
style=style,
justify=justify,
overflow=overflow,
)
for start, end in line_ranges
)
if not self._spans:
return new_lines
_line_appends = [line._spans.append for line in new_lines._lines]
line_count = len(line_ranges)
_Span = Span
for span_start, span_end, style in self._spans:
lower_bound = 0
upper_bound = line_count
start_line_no = (lower_bound + upper_bound) // 2
while True:
line_start, line_end = line_ranges[start_line_no]
if span_start < line_start:
upper_bound = start_line_no - 1
elif span_start > line_end:
lower_bound = start_line_no + 1
else:
break
start_line_no = (lower_bound + upper_bound) // 2
if span_end < line_end:
end_line_no = start_line_no
else:
end_line_no = lower_bound = start_line_no
upper_bound = line_count
while True:
> line_start, line_end = line_ranges[end_line_no]
E IndexError: list index out of range
rich/text.py:1166: IndexError
!!!!!!!!!!!!!!!!!!!!!!!!!! stopping after 1 failures !!!!!!!!!!!!!!!!!!!!!!!!!!!
1 failed, 107 passed in 0.38s