fix: skipped tags falsely reported as uncovered when not at start of line

When a tag ({% endif %}, {% endfor %}, {% else %}, etc.) is not at the
start of a line, the preceding TEXT token ends with a whitespace-only
fragment with no newline terminator. That partial line is not executable
content but was incorrectly added to source_lines.

Extends the endblock fix to apply universally — built-in and user-defined
end tags are all covered by the same condition.

Author: marcgibbons

django_coverage_plugin/plugin.py

@@ -349,10 +349,10 @@ def lines(self):
                 if lines[0].isspace():
                     lineno += 1
                     num_lines -= 1
-                # When {% endblock %} is not at the start of a line, the
-                # preceding TEXT token ends with whitespace and no newline.
+                # When a tag is not at the start of a line, the preceding
+                # TEXT token ends with whitespace and no newline.
                 # That partial line is not executable content.
-                if inblock and num_lines > 0 and (
+                if num_lines > 0 and (
                     lines[-1].isspace() and not lines[-1].endswith(("\n", "\r"))
                 ):
                     num_lines -= 1

tests/test_flow.py

@@ -25,6 +25,29 @@ def test_if(self):
         self.assertEqual(text.strip(), '')
         self.assert_analysis([1, 2], [2])
 
+    def test_endif_not_at_start_of_line(self):
+        self.make_template("""\
+            {% if foo %}
+            Hello
+              {% endif %}
+            After
+            """)
+        text = self.run_django_coverage(context={'foo': False})
+        self.assertEqual(text.strip(), 'After')
+        self.assert_analysis([1, 2, 4], missing=[2])
+
+    def test_else_not_at_start_of_line(self):
+        self.make_template("""\
+            {% if foo %}
+            Hello
+              {% else %}
+            Goodbye
+            {% endif %}
+            """)
+        text = self.run_django_coverage(context={'foo': True})
+        self.assertEqual(text.strip(), 'Hello')
+        self.assert_analysis([1, 2, 4], missing=[4])
+
     def test_if_else(self):
         self.make_template("""\
             {% if foo %}
@@ -84,6 +107,17 @@ def test_loop(self):
         self.assertEqual(text, "Before\n\nAfter\n")
         self.assert_analysis([1, 2, 3, 5], [3])
 
+    def test_endfor_not_at_start_of_line(self):
+        self.make_template("""\
+            {% for item in items %}
+            {{ item }}
+              {% endfor %}
+            After
+            """)
+        text = self.run_django_coverage(context={'items': []})
+        self.assertEqual(text.strip(), 'After')
+        self.assert_analysis([1, 2, 4], missing=[2])
+
     def test_loop_with_empty_clause(self):
         self.make_template("""\
             Before
@@ -135,7 +169,7 @@ def test_regroup(self):
                 <ul><li>New York: 20</li><li>Chicago: 7</li></ul></li><li>Japan
                 <ul><li>Tokyo: 33</li></ul></li></ul>
             """))
-        self.assert_analysis([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13])
+        self.assert_analysis([1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 13])
 
 
 class IfChangedTest(DjangoPluginTestCase):
@@ -154,7 +188,7 @@ def test_ifchanged(self):
             'items': [("A", "X"), ("A", "Y"), ("B", "Z"), ("B", "W")],
         })
         self.assertEqual(squashed(text), 'AXYBZW')
-        self.assert_analysis([1, 2, 3, 4, 5])
+        self.assert_analysis([1, 2, 3, 5])
 
     def test_ifchanged_variable(self):
         self.make_template("""\
@@ -170,7 +204,7 @@ def test_ifchanged_variable(self):
             'items': [("A", "X"), ("A", "Y"), ("B", "Z"), ("B", "W")],
         })
         self.assertEqual(squashed(text), 'AXYBZW')
-        self.assert_analysis([1, 2, 3, 4, 5])
+        self.assert_analysis([1, 2, 3, 5])
 
 
 @django_stop_before(4, 0)

tests/test_simple.py

@@ -238,6 +238,16 @@ def test_with(self):
         self.assertEqual(text, "\nalpha = 1, beta = 2.\n\n")
         self.assert_analysis([1, 2])
 
+    def test_endwith_not_at_start_of_line(self):
+        self.make_template("""\
+            {% with alpha=1 %}
+            {{ alpha }}
+              {% endwith %}
+            """)
+        text = self.run_django_coverage()
+        self.assertEqual(text.strip(), '1')
+        self.assert_analysis([1, 2])
+
 
 class StringTemplateTest(DjangoPluginTestCase):