fix format comment (#36)

2bndy5 · web-flow · commit 977eb162ece4 · 2023-11-01T23:50:29.000-07:00
* fix format comments

- make sure that total count of files that need formatting align with the number of files listed
- respect all values of `lines-changed-only` when creating format comment

* ensure clang v12 is installed

Ubuntu-latest runners no longer ship with clang v12

* update pre-commit hooks
diff --git a/.github/workflows/run-dev-tests.yml b/.github/workflows/run-dev-tests.yml
@@ -57,9 +57,6 @@ jobs:
           - os: 'ubuntu-22.04'
             version: '13'
             tools_dir: 'N/A'
-          - os: 'ubuntu-22.04'
-            version: '12'
-            tools_dir: 'N/A'
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -13,12 +13,12 @@ repos:
       - id: mixed-line-ending
         args: ["--fix=lf"]
   - repo: https://github.com/python/black
-    rev: '23.3.0'
+    rev: '23.10.1'
     hooks:
       - id: black
         args: ["--diff"]
   - repo: https://github.com/pycqa/pylint
-    rev: v3.0.0a6
+    rev: v3.0.1
     hooks:
       - id: pylint
         name: pylint (action code)
diff --git a/cpp_linter/run.py b/cpp_linter/run.py
@@ -418,15 +418,14 @@ def create_comment_body(
     if CLANG_FORMAT_XML.exists() and CLANG_FORMAT_XML.stat().st_size:
         parse_format_replacements_xml(PurePath(filename).as_posix())
         if GlobalParser.format_advice and GlobalParser.format_advice[-1].replaced_lines:
-            should_comment = lines_changed_only == 0
-            if not should_comment:
-                for line in [
-                    replacement.line
-                    for replacement in GlobalParser.format_advice[-1].replaced_lines
-                ]:
-                    if line in ranges:
-                        should_comment = True
-                        break
+            should_comment = False
+            for line in [
+                replacement.line
+                for replacement in GlobalParser.format_advice[-1].replaced_lines
+            ]:
+                if (lines_changed_only and line in ranges) or not lines_changed_only:
+                    should_comment = True
+                    break
             if should_comment:
                 Globals.FORMAT_COMMENT += f"- {file_obj['filename']}\n"
 
@@ -478,9 +477,10 @@ def capture_clang_tools_output(
     if Globals.FORMAT_COMMENT or Globals.TIDY_COMMENT:
         Globals.OUTPUT += ":warning:\nSome files did not pass the configured checks!\n"
         if Globals.FORMAT_COMMENT:
+            files_count = Globals.FORMAT_COMMENT.count("\n")
             Globals.OUTPUT += (
                 "\n<details><summary>clang-format reports: <strong>"
-                + f"{len(GlobalParser.format_advice)} file(s) not formatted</strong>"
+                + f"{files_count} file(s) not formatted</strong>"
                 + f"</summary>\n\n{Globals.FORMAT_COMMENT}\n\n</details>"
             )
         if Globals.TIDY_COMMENT:
