[fix] Only count directly changed lines as misses when intended changes is specified (#1037)

Author: rohitvinnakota-codecov

graphql_api/tests/test_impacted_file.py

@@ -1,5 +1,6 @@
 import hashlib
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from typing import Callable
 from unittest.mock import PropertyMock, patch
 
 from django.test import TransactionTestCase
@@ -211,6 +212,7 @@
 class MockSegment:
     has_diff_changes: bool = False
     has_unintended_changes: bool = False
+    remove_unintended_changes: Callable[[], None] = field(default=lambda: None)
 
 
 class MockFileComparison(object):

graphql_api/types/impacted_file/impacted_file.py

@@ -98,8 +98,12 @@ def resolve_segments(
         # segments with no diff changes and at least 1 unintended change
         segments = [segment for segment in segments if segment.has_unintended_changes]
     elif filters.get("has_unintended_changes") is False:
-        # segments with at least 1 diff change
-        segments = [segment for segment in segments if segment.has_diff_changes]
+        new_segments = []
+        for segment in segments:
+            if segment.has_diff_changes:
+                segment.remove_unintended_changes()
+                new_segments.append(segment)
+        segments = new_segments
 
     return SegmentComparisons(results=segments)
 

services/comparison.py

@@ -481,6 +481,15 @@ def has_unintended_changes(self):
                 return True
         return False
 
+    def remove_unintended_changes(self):
+        filtered = []
+        for line in self._lines:
+            base_cov = line.coverage["base"]
+            head_cov = line.coverage["head"]
+            if (line.added or line.removed) or (base_cov == head_cov):
+                filtered.append(line)
+        self._lines = filtered
+
 
 class FileComparison:
     def __init__(

services/tests/test_comparison.py

@@ -36,6 +36,7 @@
     LineComparison,
     MissingComparisonReport,
     PullRequestComparison,
+    Segment,
 )
 
 # Pulled from shared.django_apps.core.tests.factories.CommitFactory files.
@@ -1784,6 +1785,21 @@ def test_file_has_changes(self):
         )
         assert file.has_changes is True
 
+    def test_remove_unintended_changes(self):
+        lines = [
+            LineComparison([1, "", [], 0, 0], [1, "", [], 0, 0], 1, 1, "line1", False),
+            LineComparison([1, "", [], 0, 0], [0, "", [], 0, 0], 2, 2, "line2", False),
+            LineComparison(None, [0, "", [], 0, 0], None, 3, "+line3", True),
+            LineComparison([0, "", [], 0, 0], None, 4, None, "-line4", True),
+            LineComparison([1, "", [], 0, 0], [0, "", [], 0, 0], 5, 5, "line5", False),
+        ]
+
+        segment = Segment(lines)
+        segment.remove_unintended_changes()
+
+        assert len(segment.lines) == 3
+        assert [line.value for line in segment.lines] == ["line1", "+line3", "-line4"]
+
 
 class CommitComparisonTests(TestCase):
     def setUp(self):