Fix Mason regex.

Previously, the tag was cut off.
pygments · Nov 8, 2020 · afa9e3b · afa9e3b
1 parent 255442a
commit afa9e3b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
@@ -537,9 +537,8 @@ class MasonLexer(RegexLexer):
             (r'(?s)(<%(?:def|method))(\s*)(.*?)(>)(.*?)(</%\2\s*>)',
              bygroups(Name.Tag, Text, Name.Function, Name.Tag,
                       using(this), Name.Tag)),
-            (r'(?s)<%(\w+)(.*?)(>)(.*?)(</%\1\s*>)',
-             bygroups(Name.Tag, Name.Function, Name.Tag,
-                      using(PerlLexer), Name.Tag)),
+            (r'(?s)(<%(\w+)(.*?)(>))(.*?)(</%\2\s*>)',
+             bygroups(Name.Tag, None, None, None, using(PerlLexer), Name.Tag)),
             (r'(?s)(<&[^|])(.*?)(,.*?)?(&>)',
              bygroups(Name.Tag, Name.Function, using(PerlLexer), Name.Tag)),
             (r'(?s)(<&\|)(.*?)(,.*?)?(&>)',

diff --git a/tests/test_templates.py b/tests/test_templates.py
@@ -45,8 +45,7 @@ def test_mason_unnamed_block(lexerMason):
 def test_mason_handles_tags_correctly(lexerMason):
     fragment = "<%class>\nhas 'foo';\nhas 'bar' => (required => 1);\nhas 'baz' => (isa => 'Int', default => 17);\n</%class>\n"
     tokens = [
-        (Token.Name.Tag, 'class'),
-        (Token.Name.Tag, '>'),
+        (Token.Name.Tag, '<%class>'),
         (Token.Text, '\n'),
         (Token.Name, ''),
         (Token.Name, 'has'),