From be8e107ca74a0cd9c9de698fc669bf4c7538d768 Mon Sep 17 00:00:00 2001
From: kieferro <81773954+kieferro@users.noreply.github.com>
Date: Wed, 27 Sep 2023 02:49:37 +0200
Subject: [PATCH] Account for file deletions in git diff parsing (#277)

When a file gets deleted, we get /dev/null as added filename and therefore shouldn't assume that we always have a valid filename when there are no added lines
---
 coverage_comment/coverage.py |  8 ++++----
 tests/unit/test_coverage.py  | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/coverage_comment/coverage.py b/coverage_comment/coverage.py
index 75c43bf9..29d4bb05 100644
--- a/coverage_comment/coverage.py
+++ b/coverage_comment/coverage.py
@@ -288,11 +288,11 @@ def parse_diff_output(diff: str) -> dict[pathlib.Path, list[int]]:
             current_file = pathlib.Path(line.removeprefix(added_filename_prefix))
             continue
         if line.startswith("@@"):
-            if current_file is None:
-                raise ValueError(f"Unexpected diff output format: \n{diff}")
             lines = parse_line_number_diff_line(line)
-            result.setdefault(current_file, []).extend(lines)
-            continue
+            if len(lines) > 0:
+                if current_file is None:
+                    raise ValueError(f"Unexpected diff output format: \n{diff}")
+                result.setdefault(current_file, []).extend(lines)
 
     return result
 
diff --git a/tests/unit/test_coverage.py b/tests/unit/test_coverage.py
index 7d30c317..05ab09ed 100644
--- a/tests/unit/test_coverage.py
+++ b/tests/unit/test_coverage.py
@@ -246,7 +246,15 @@ def test_parse_line_number_diff_line(git, line_number_diff_line, expected):
 
 
 def test_parse_diff_output(git):
-    diff = """diff --git a/README.md b/README.md
+    diff = """diff --git a/action.yml b/action.yml
+deleted file mode 100644
+index 42249d1..0000000
+--- a/action.yml
++++ /dev/null
+@@ -1,2 +0,0 @@
+-name: Python Coverage Comment
+-branding:
+diff --git a/README.md b/README.md
 index 1f1d9a4..e69de29 100644
 --- a/README.md
 +++ b/README.md
@@ -268,11 +276,14 @@ def test_parse_diff_output(git):
 +++ b/bar.txt
 @@ -8 +7,0 @@
 -foo
+diff --git a/coverage_comment/annotations.py b/coverage_comment/annotations2.py
+similarity index 100%
+rename from coverage_comment/annotations.py
+rename to coverage_comment/annotations2.py
 """
     git.register("git fetch origin main --depth=1000")()
     git.register("git diff --unified=0 FETCH_HEAD -- .")(stdout=diff)
     assert coverage.parse_diff_output(diff=diff) == {
         pathlib.Path("README.md"): [1, 3, 4, 5, 6],
         pathlib.Path("foo.txt"): [1],
-        pathlib.Path("bar.txt"): [],
     }