floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 6fefbb82e8 into dc65bb6a66

This commit is contained in:
Om Patel 2024-06-18 16:48:43 +02:00 committed by GitHub
parent dc65bb6a66 6fefbb82e8
commit 13d617ad92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/_pytest/_code/code.py
View File

@ -1258,11 +1258,35 @@ class ReprEntry(TerminalRepr):
else: else:
indents.append(line[:indent_size]) indents.append(line[:indent_size])
source_lines.append(line[indent_size:]) source_lines.append(line[indent_size:])
tw._write_source(source_lines, indents) tw._write_source(source_lines, indents)
# failure lines are always completely red and bold # failure lines are always completely red and bold
for i in range(len(failure_lines)):
line_list = failure_lines[i].split()
# This will swap the extra comma in the multiline string with the position of the starting bracket
if len(line_list) == 3 and line_list[2] == "," and line_list[1] == "-":
prev_arg = failure_lines[i - 1]
failure_lines[i - 1] = failure_lines[i]
failure_lines[i] = prev_arg
for line in failure_lines: for line in failure_lines:
line_list = line.split()
# multiline case seems to be an issue with just an added ','
# These are edge cases for empty lists
if len(line_list) == 3 and line_list[2] == "," and line_list[1] == "-":
line = line.replace(",", "[]")
# This is to remove the extra whitespace between '-' and '[]'
line_list = list(line)
extra_wp_i = line_list.index("-") + 1
line_list.pop(extra_wp_i)
line = "".join(line_list)
elif len(line_list) == 3 and line_list[2] == "," and line_list[1] == "+":
line = line.replace(",", "[]")
# This is to remove the extra whitespace between '+' and '[]'
line_list = list(line)
extra_wp_i = line_list.index("+") + 1
line_list.pop(extra_wp_i)
line = "".join(line_list)
tw.line(line, bold=True, red=True) tw.line(line, bold=True, red=True)
def toterminal(self, tw: TerminalWriter) -> None: def toterminal(self, tw: TerminalWriter) -> None: