Fix a few edge cases with attribute parsing

motet-a · Nov 5, 2018 · c60bea7 · c60bea7
1 parent 402130a
commit c60bea7
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 21 deletions.
diff --git a/jinjalint/ast.py b/jinjalint/ast.py
@@ -95,7 +95,7 @@ class Integer(Node):
     has_percent = attr.ib()  # bool
 
     def __str__(self):
-        return self.value + ('%' if self.has_percent else '')
+        return str(self.value) + ('%' if self.has_percent else '')
 
 
 @attr.s(frozen=True)

diff --git a/jinjalint/parse.py b/jinjalint/parse.py
@@ -332,11 +332,13 @@ def make_attribute_parser(jinja):
     return (
         locate(
             P.seq(
-                interpolated(tag_name).skip(whitespace),
-                P.seq(
-                    P.string('=').skip(whitespace).tag('equal'),
-                    interpolated(attribute_value).tag('value'),
-                ).map(dict).optional(),
+                interpolated(tag_name),
+                whitespace.then(
+                    P.seq(
+                        P.string('=').skip(whitespace).tag('equal'),
+                        interpolated(attribute_value).tag('value'),
+                    ).map(dict)
+                ).optional(),
             )
         )
         .combine(_combine_attribute)
@@ -347,21 +349,25 @@ def make_attribute_parser(jinja):
 def make_attributes_parser(config, jinja):
     attribute = make_attribute_parser(jinja)
 
-    @P.generate
-    def attrs():
-        r = yield attrs_
-        return r
-
-    jinja_attrs = make_jinja_parser(
+    jinja_attr = make_jinja_parser(
         config,
-        whitespace.then(attrs.skip(whitespace)),
+        interpolated(
+            whitespace
+            .then(
+                (attribute | jinja).sep_by(whitespace)
+            )
+            .skip(whitespace)
+        )
     )
 
-    attrs_ = interpolated(
-        (jinja_attrs | attribute).sep_by(whitespace)
+    attrs = interpolated(
+        (
+            whitespace.then(jinja_attr) |
+            mandatory_whitespace.then(attribute)
+        ).many()
     )
 
-    return attrs_
+    return attrs
 
 
 def _combine_comment(locations, text):
@@ -412,10 +418,6 @@ def make_opening_tag_parser(config,
                             tag_name_parser=None,
                             allow_slash=False):
     attributes = make_attributes_parser(config, jinja)
-    whitespace_attributes = (
-        mandatory_whitespace.then(attributes).skip(whitespace) |
-        interpolated(P.string('').result([]))
-    )
 
     if not tag_name_parser:
         tag_name_parser = tag_name | jinja
@@ -436,7 +438,7 @@ def make_opening_tag_parser(config,
         locate(P.seq(
             P.string('<'),
             tag_name_parser,
-            whitespace_attributes,
+            attributes.skip(whitespace),
             slash,
             P.string('>'),
         ))

diff --git a/jinjalint/parse_test.py b/jinjalint/parse_test.py
@@ -298,6 +298,20 @@ def test_element():
     src = '<{% if a %}bcd{% endif %}></{% if a %}bcd{% endif %}>'
     assert src == str(element.parse(src))
 
+    src = '<div{{ "ider" }}></div>'
+    assert '<div {{ "ider" }}></div>' == str(element.parse(src))
+
+    src = '<div{% if a %}foo="bar"{% endif %}></div>'
+    assert '<div {% if a %}foo="bar"{% endif %}></div>' == \
+        str(element.parse(src))
+
+    src = '<div{% if a %} foo="bar"  a=2 {% endif %}></div>'
+    assert '<div {% if a %}foo="bar"a=2{% endif %}></div>' == \
+        str(element.parse(src))
+
+    src = '<colgroup></colgroup>'
+    assert src == str(element.parse(src))
+
 
 def test_self_closing_elements():
     assert element.parse('<br>') == Element(