OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

scripts: ci: Fix clang-format notice at file beginning/end 

The clang-format check outputs a git diff with surrounding context. It
naively removed the first and last 3 lines, but this does not work if
there are less lines.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
This commit is contained in:
Pieter De Gendt 2024-08-23 09:08:26 +02:00 committed by Carles Cufí
parent 15f5e2de07
commit fda5ca34c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/ci/check_compliance.py
View File

@ -303,11 +303,14 @@ class ClangFormatCheck(ComplianceTest):
for patch in patchset:
for hunk in patch:
# Strip the before and after context
msg = "".join([str(l) for l in hunk[3:-3]])
before = next(i for i,v in enumerate(hunk) if str(v).startswith('-'))
after = next(i for i,v in enumerate(reversed(hunk)) if str(v).startswith('+'))
msg = "".join([str(l) for l in hunk[before:-after or None]])
# show the hunk at the last line
self.fmtd_failure("notice",
"You may want to run clang-format on this change",
file, line=hunk.source_start + hunk.source_length - 3,
file, line=hunk.source_start + hunk.source_length - after,
desc=f'\r\n{msg}')