Support {% verbatim %}

Author: nedbat

django_coverage_plugin/plugin.py

@@ -13,6 +13,11 @@
     Lexer, TextNode,
     TOKEN_BLOCK, TOKEN_MAPPING, TOKEN_TEXT, TOKEN_VAR,
     )
+try:
+    from django.template.defaulttags import VerbatimNode
+except ImportError:
+    # Django 1.4 didn't have VerbatimNode
+    VerbatimNode = None
 
 
 SHOW_PARSING = False
@@ -98,10 +103,14 @@ def line_number_range(self, frame):
             print("{!r}: {}".format(render_self, source))
         s_start, s_end = source[1]
         if isinstance(render_self, TextNode):
-            text = render_self.s
-            first_line = text.splitlines(True)[0]
+            first_line = render_self.s.splitlines(True)[0]
             if first_line.isspace():
                 s_start += len(first_line)
+        elif VerbatimNode and isinstance(render_self, VerbatimNode):
+            # VerbatimNode doesn't track source the same way. s_end only points
+            # to the end of the {% verbatim %} opening tag, not the entire
+            # content. Adjust it to cover all of it.
+            s_end += len(render_self.content)
         line_map = self.get_line_map(source[0].name)
         start = get_line_number(line_map, s_start)
         end = get_line_number(line_map, s_end-1)

tests/test_simple.py

@@ -186,7 +186,7 @@ def test_templatetag(self):
         self.assertEqual(text, "{%\nurl 'entry_list'\n%}\n")
         self.assert_analysis([1, 2, 3])
 
-    @needs_django(1, 5)     # not sure why, but 1.4 won't reverse "index".
+    @needs_django(1, 5)     # 1.4 had different syntax for {% url %}
     def test_url(self):
         self.make_template("""\
             {% url 'index' %}
@@ -196,6 +196,24 @@ def test_url(self):
         self.assertEqual(text, "/home\nnice.\n")
         self.assert_analysis([1, 2])
 
+    @needs_django(1, 5)     # {% verbatim %} is new in 1.5
+    def test_verbatim(self):
+        self.make_template("""\
+            1
+            {% verbatim %}
+            {{if dying}}Alive.{{/if}}
+            second.
+            {%third%}.
+            {% endverbatim %}
+            7
+            """)
+        text = self.run_django_coverage()
+        self.assertEqual(
+            text,
+            "1\n\n{{if dying}}Alive.{{/if}}\nsecond.\n{%third%}.\n\n7\n"
+        )
+        self.assert_analysis([1, 2, 3, 4, 5, 7])
+
 
 class StringTemplateTest(DjangoPluginTestCase):