fix filename matching for tidy annotations

2bndy5 · 2bndy5 · commit 2103998e5f64 · 2023-11-06T15:44:43.000-08:00
also adjust unit test to use a src that triggers tidy annotations
diff --git a/cpp_linter/run.py b/cpp_linter/run.py
@@ -597,15 +597,16 @@ def make_annotations(
                 count += 1
     for note in GlobalParser.tidy_notes:
         if lines_changed_only:
-            filename = note.filename.replace("\\", "/")
+            filename = note.filename.replace("\\", "/").lstrip("/")
             line_filter = []
             for file in files:
+                print(filename, "?=", file["filename"])
                 if filename == file["filename"]:
                     line_filter = cast(
                         List[int], range_of_changed_lines(file, lines_changed_only)
                     )
                     break
-            else:
+            else: # filename match not found; treat line_filter as empty list
                 continue
             if note.line in line_filter or not line_filter:
                 count += 1
diff --git a/tests/capture_tools_output/test_tools_output.py b/tests/capture_tools_output/test_tools_output.py
@@ -264,7 +264,7 @@ def test_tidy_annotations(
     prep_tmp_dir(
         tmp_path,
         monkeypatch,
-        **TEST_REPO_COMMIT_PAIRS[0],
+        **TEST_REPO_COMMIT_PAIRS[3],
         copy_configs=False,
         lines_changed_only=lines_changed_only,
     )

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ def test_tidy_annotations(`
`264`	`264`	`prep_tmp_dir(`
`265`	`265`	`tmp_path,`
`266`	`266`	`monkeypatch,`
`267`		`- **TEST_REPO_COMMIT_PAIRS[0],`
	`267`	`+ **TEST_REPO_COMMIT_PAIRS[3],`
`268`	`268`	`copy_configs=False,`
`269`	`269`	`lines_changed_only=lines_changed_only,`
`270`	`270`	`)`