utils: checkstyle.py: Fix color bleed

If issue.line is None, the the terminal color is never reset back to
normal. This causes the yellow color to bleed.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Tomi Valkeinen 2022-05-30 10:22:28 +03:00 committed by Laurent Pinchart
parent 30d55d584a
commit b4bb5ce629

View file

@ -760,9 +760,11 @@ def check_file(top_level, commit, filename):
if len(issues):
issues = sorted(issues, key=lambda i: i.line_number)
for issue in issues:
print('%s#%u: %s' % (Colours.fg(Colours.Yellow), issue.line_number, issue.msg))
print('%s#%u: %s%s' % (Colours.fg(Colours.Yellow), issue.line_number,
issue.msg, Colours.reset()))
if issue.line is not None:
print('+%s%s' % (issue.line.rstrip(), Colours.reset()))
print('%s+%s%s' % (Colours.fg(Colours.Yellow), issue.line.rstrip(),
Colours.reset()))
return len(formatted_diff) + len(issues)