github-linguist 5.3.3 → 6.0.0

data/grammars/text.html.liquid.json

@@ -1,35 +1,25 @@
 {
-  "fileTypes": [
-    "liquid"
-  ],
-  "foldingStartMarker": "(?x)\n\t\t(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\\b.*?>\n\t\t|<!--(?!.*-->)\n\t\t|\\{\\s*($|\\?>\\s*$|//|/\\*(.*\\*/\\s*$|(?!.*?\\*/)))\n\t\t)",
-  "foldingStopMarker": "(?x)\n\t\t(</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>\n\t\t|^\\s*-->\n\t\t|(^|\\s)\\}\n\t\t)",
   "name": "HTML Liquid",
+  "scopeName": "text.html.liquid",
   "patterns": [
     {
-      "begin": "{%+(?!>)=?",
-      "end": "%}",
       "name": "source.liquid.tags.embedded.html",
+      "begin": "{%+(?!\u003e)=?",
+      "end": "%}",
       "patterns": [
-        {
-          "include": "source.ruby.rails"
-        }
+        {}
       ]
     },
     {
+      "name": "source.liquid.output.embedded.html",
       "begin": "{{",
       "end": "}}",
-      "name": "source.liquid.output.embedded.html",
       "patterns": [
-        {
-          "include": "source.ruby.rails"
-        }
+        {}
       ]
     },
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.liquid",
-  "uuid": "675E0890-CA4B-404D-8000-15BE6FAE9998"
-}
+  ]
+}

data/grammars/text.html.mako.json

@@ -1,49 +1,45 @@
 {
-  "fileTypes": [
-    "mako",
-    "html"
-  ],
-  "foldingStartMarker": "(<(?i:(head|table|div|style|script|ul|ol|form|dl))\\b.*?>|\\{)",
-  "foldingStopMarker": "(</(?i:(head|table|div|style|script|ul|ol|form|dl))>|\\})",
   "name": "HTML (Mako)",
+  "scopeName": "text.html.mako",
   "patterns": [
     {
-      "comment": "comments",
-      "match": "(##(.*)$)",
-      "name": "comment.line.mako"
+      "name": "comment.line.mako",
+      "match": "(##(.*)$)"
     },
     {
-      "begin": "(<%\\s)",
-      "captures": {
-        "1": {
-          "name": "keyword.control"
-        }
-      },
-      "end": "(%>)",
       "name": "source.mako.substitution",
+      "begin": "(\u003c%\\s)",
+      "end": "(%\u003e)",
       "patterns": [
         {
           "include": "source.python"
         }
-      ]
-    },
-    {
-      "begin": "(<%!\\s)",
+      ],
       "captures": {
         "1": {
           "name": "keyword.control"
         }
-      },
-      "end": "(%>)",
+      }
+    },
+    {
       "name": "source.mako.substitution",
+      "begin": "(\u003c%!\\s)",
+      "end": "(%\u003e)",
       "patterns": [
         {
           "include": "source.python"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control"
+        }
+      }
     },
     {
-      "begin": "(<%(text)>)",
+      "name": "source.mako.text",
+      "begin": "(\u003c%(text)\u003e)",
+      "end": "(\u003c/%(\\2)\u003e)",
       "captures": {
         "1": {
           "name": "keyword.control"
@@ -51,15 +47,12 @@
         "2": {
           "name": "storage.type.function.python"
         }
-      },
-      "end": "(</%(\\2)>)",
-      "name": "source.mako.text",
-      "patterns": [
-
-      ]
+      }
     },
     {
-      "begin": "(<%(doc)>)",
+      "name": "comment.block.mako",
+      "begin": "(\u003c%(doc)\u003e)",
+      "end": "(\u003c/%(\\2)\u003e)",
       "captures": {
         "1": {
           "name": "keyword.control"
@@ -67,15 +60,17 @@
         "2": {
           "name": "storage.type.function.python"
         }
-      },
-      "end": "(</%(\\2)>)",
-      "name": "comment.block.mako",
-      "patterns": [
-
-      ]
+      }
     },
     {
+      "name": "source.mako.expression",
       "begin": "(\\${)",
+      "end": "(})",
+      "patterns": [
+        {
+          "include": "source.python"
+        }
+      ],
       "captures": {
         "1": {
           "name": "keyword.control"
@@ -83,17 +78,17 @@
         "2": {
           "name": "keyword.control"
         }
-      },
-      "end": "(})",
-      "name": "source.mako.expression",
+      }
+    },
+    {
+      "name": "source.doc.python.mako.controlline",
+      "begin": "^\\s*(%)(\\s*((endfor)|(endif)|(endwhile)))?",
+      "end": "$",
       "patterns": [
         {
           "include": "source.python"
         }
-      ]
-    },
-    {
-      "begin": "^\\s*(%)(\\s*((endfor)|(endif)|(endwhile)))?",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control"
@@ -101,49 +96,42 @@
         "2": {
           "name": "keyword.control"
         }
-      },
-      "end": "$",
-      "name": "source.doc.python.mako.controlline",
-      "patterns": [
-        {
-          "include": "source.python"
-        }
-      ]
+      }
     },
     {
+      "name": "source.python.mako.line",
       "begin": "^(#)",
+      "end": "$",
+      "patterns": [
+        {}
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control"
         }
-      },
-      "end": "$",
-      "name": "source.python.mako.line",
-      "patterns": [
-        {
-          "include": "comment.block"
-        }
-      ]
+      }
     },
     {
-      "begin": "(<%(def)\\S?)",
-      "captures": {
-        "1": {
-          "name": "keyword.control"
-        },
-        "2": {
-          "name": "storage.type.function.python"
-        }
-      },
-      "end": "(</%(\\2)>)",
       "name": "source.mako.def",
+      "begin": "(\u003c%(def)\\S?)",
+      "end": "(\u003c/%(\\2)\u003e)",
       "patterns": [
         {
-          "begin": "(?<=<%def)",
-          "end": "(?=>)",
+          "begin": "(?\u003c=\u003c%def)",
+          "end": "(?=\u003e)",
           "patterns": [
             {
+              "contentName": "entity.name.function.python",
               "begin": "(name)\\s*(=)\\s*(\")(?=[A-Za-z_][A-Za-z0-9_]*)",
+              "end": "(\")",
+              "patterns": [
+                {
+                  "include": "#function_def"
+                },
+                {
+                  "include": "#entity_name"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control"
@@ -155,21 +143,11 @@
                   "name": "punctuation.section.function.begin.python"
                 }
               },
-              "contentName": "entity.name.function.python",
-              "end": "(\")",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.section.function.begin.python"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#function_def"
-                },
-                {
-                  "include": "#entity_name"
-                }
-              ]
+              }
             },
             {
               "include": "#tag-stuff"
@@ -177,23 +155,20 @@
           ]
         },
         {
-          "begin": "(>)",
-          "captures": {
-            "1": {
-              "name": "keyword.control"
-            }
-          },
-          "end": "(?=</%def>)",
+          "begin": "(\u003e)",
+          "end": "(?=\u003c/%def\u003e)",
           "patterns": [
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "keyword.control"
+            }
+          }
         }
-      ]
-    },
-    {
-      "begin": "(<%(call))",
+      ],
       "captures": {
         "1": {
           "name": "keyword.control"
@@ -201,12 +176,21 @@
         "2": {
           "name": "storage.type.function.python"
         }
-      },
-      "end": "(</%(\\2)>)",
+      }
+    },
+    {
       "name": "source.mako.call",
+      "begin": "(\u003c%(call))",
+      "end": "(\u003c/%(\\2)\u003e)",
       "patterns": [
         {
           "begin": "(expr)\\s*(=)\\s*(\")",
+          "end": "(\")",
+          "patterns": [
+            {
+              "include": "source.python"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control"
@@ -218,59 +202,45 @@
               "name": "punctuation.section.function.begin.python"
             }
           },
-          "end": "(\")",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.begin.python"
             }
-          },
+          }
+        },
+        {
+          "begin": "(\u003e)",
+          "end": "(?=\u003c/%call\u003e)",
           "patterns": [
             {
-              "include": "source.python"
+              "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(>)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control"
             }
-          },
-          "end": "(?=</%call>)",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
-      ]
-    },
-    {
-      "begin": "(<%(inherit|namespace|include)) ",
-      "beginCaptures": {
+      ],
+      "captures": {
         "1": {
           "name": "keyword.control"
         },
         "2": {
           "name": "storage.type.function.python"
         }
-      },
-      "end": "(/>)",
-      "endCaptures": {
-        "1": {
-          "name": "keyword.control"
-        }
-      },
+      }
+    },
+    {
       "name": "source.mako.inherit",
+      "begin": "(\u003c%(inherit|namespace|include)) ",
+      "end": "(/\u003e)",
       "patterns": [
         {
           "include": "#tag-stuff"
         }
-      ]
-    },
-    {
-      "begin": "(<%(page))",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control"
@@ -279,16 +249,28 @@
           "name": "storage.type.function.python"
         }
       },
-      "end": "(\\/>)",
       "endCaptures": {
         "1": {
           "name": "keyword.control"
         }
-      },
+      }
+    },
+    {
       "name": "source.mako.page",
+      "begin": "(\u003c%(page))",
+      "end": "(\\/\u003e)",
       "patterns": [
         {
           "begin": "(args)\\s*(=)\\s*(\")",
+          "end": "(\")",
+          "patterns": [
+            {
+              "include": "#positional_args"
+            },
+            {
+              "include": "#keyword_arguments"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control"
@@ -300,29 +282,17 @@
               "name": "punctuation.section.function.begin.python"
             }
           },
-          "end": "(\")",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.end.python"
             }
-          },
-          "patterns": [
-            {
-              "include": "#positional_args"
-            },
-            {
-              "include": "#keyword_arguments"
-            }
-          ]
+          }
         },
         {
           "include": "#tag-stuff"
         }
-      ]
-    },
-    {
-      "begin": "(<%([a-zA-Z0-9:_]+))",
-      "captures": {
+      ],
+      "beginCaptures": {
         "1": {
           "name": "keyword.control"
         },
@@ -330,11 +300,25 @@
           "name": "storage.type.function.python"
         }
       },
-      "end": "(</%(\\2)>|\\/>)",
+      "endCaptures": {
+        "1": {
+          "name": "keyword.control"
+        }
+      }
+    },
+    {
       "name": "source.mako.genericcall",
+      "begin": "(\u003c%([a-zA-Z0-9:_]+))",
+      "end": "(\u003c/%(\\2)\u003e|\\/\u003e)",
       "patterns": [
         {
           "begin": "(expr)\\s*(=)\\s*(\")",
+          "end": "(\")",
+          "patterns": [
+            {
+              "include": "source.python"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control"
@@ -346,36 +330,38 @@
               "name": "punctuation.section.function.begin.python"
             }
           },
-          "end": "(\")",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.begin.python"
             }
-          },
+          }
+        },
+        {
+          "begin": "(\u003e)",
+          "end": "(?=\u003c/%[a-zA-Z0-9:_]+\u003e)",
           "patterns": [
             {
-              "include": "source.python"
+              "include": "$self"
             }
-          ]
-        },
-        {
-          "begin": "(>)",
+          ],
           "captures": {
             "1": {
               "name": "keyword.control"
             }
-          },
-          "end": "(?=</%[a-zA-Z0-9:_]+>)",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
           "include": "#tag-stuff"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.control"
+        },
+        "2": {
+          "name": "storage.type.function.python"
+        }
+      }
     },
     {
       "include": "text.html.basic"
@@ -383,28 +369,28 @@
   ],
   "repository": {
     "builtin_exceptions": {
-      "match": "(?x)\\b((Arithmetic|Assertion|Attribute|EOF|Environment|FloatingPoint|IO|Import|Indentation|Index|Key|Lookup|Memory|Name|OS|Overflow|NotImplemented|Reference|Runtime|Standard|Syntax|System|Tab|Type|UnboundLocal|Unicode(Translate|Encode|Decode)?|Value|ZeroDivision)Error|(Deprecation|Future|Overflow|PendingDeprecation|Runtime|Syntax|User)?Warning|KeyboardInterrupt|NotImplemented|StopIteration|SystemExit|(Base)?Exception)\\b",
-      "name": "support.type.exception.python"
+      "name": "support.type.exception.python",
+      "match": "(?x)\\b((Arithmetic|Assertion|Attribute|EOF|Environment|FloatingPoint|IO|Import|Indentation|Index|Key|Lookup|Memory|Name|OS|Overflow|NotImplemented|Reference|Runtime|Standard|Syntax|System|Tab|Type|UnboundLocal|Unicode(Translate|Encode|Decode)?|Value|ZeroDivision)Error|(Deprecation|Future|Overflow|PendingDeprecation|Runtime|Syntax|User)?Warning|KeyboardInterrupt|NotImplemented|StopIteration|SystemExit|(Base)?Exception)\\b"
     },
     "builtin_functions": {
-      "match": "(?x)\\b(\n                __import__|all|abs|any|apply|callable|chr|cmp|coerce|compile|delattr|dir|\n                divmod|eval|execfile|filter|getattr|globals|hasattr|hash|hex|id|\n                input|intern|isinstance|issubclass|iter|len|locals|map|max|min|oct|\n                ord|pow|range|raw_input|reduce|reload|repr|round|setattr|sorted|\n                sum|unichr|vars|zip\n\t\t\t)\\b",
-      "name": "support.function.builtin.python"
+      "name": "support.function.builtin.python",
+      "match": "(?x)\\b(\n                __import__|all|abs|any|apply|callable|chr|cmp|coerce|compile|delattr|dir|\n                divmod|eval|execfile|filter|getattr|globals|hasattr|hash|hex|id|\n                input|intern|isinstance|issubclass|iter|len|locals|map|max|min|oct|\n                ord|pow|range|raw_input|reduce|reload|repr|round|setattr|sorted|\n                sum|unichr|vars|zip\n\t\t\t)\\b"
     },
     "builtin_types": {
-      "match": "(?x)\\b(\n\t\t\t\tbasestring|bool|buffer|classmethod|complex|dict|enumerate|file|\n\t\t\t\tfloat|frozenset|int|list|long|object|open|property|reversed|set|\n\t\t\t\tslice|staticmethod|str|super|tuple|type|unicode|xrange\n\t\t\t)\\b",
-      "name": "support.type.python"
+      "name": "support.type.python",
+      "match": "(?x)\\b(\n\t\t\t\tbasestring|bool|buffer|classmethod|complex|dict|enumerate|file|\n\t\t\t\tfloat|frozenset|int|list|long|object|open|property|reversed|set|\n\t\t\t\tslice|staticmethod|str|super|tuple|type|unicode|xrange\n\t\t\t)\\b"
     },
     "constant_placeholder": {
-      "match": "(?i:%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?[hL]?[a-z%])",
-      "name": "constant.other.placeholder.python"
+      "name": "constant.other.placeholder.python",
+      "match": "(?i:%(\\([a-z_]+\\))?#?0?\\-?[ ]?\\+?([0-9]*|\\*)(\\.([0-9]*|\\*))?[hL]?[a-z%])"
     },
     "dotted_entity_name": {
       "begin": "(?=[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*)",
-      "end": "(?<=[A-Za-z0-9_])",
+      "end": "(?\u003c=[A-Za-z0-9_])",
       "patterns": [
         {
           "begin": "(?=[A-Za-z_][A-Za-z0-9_]*)",
-          "end": "(?<=[A-Za-z0-9_])",
+          "end": "(?\u003c=[A-Za-z0-9_])",
           "patterns": [
             {
               "include": "#entity_name"
@@ -416,6 +402,8 @@
     "entities": {
       "patterns": [
         {
+          "name": "constant.character.entity.html",
+          "match": "(\u0026)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
           "captures": {
             "1": {
               "name": "punctuation.definition.entity.html"
@@ -423,19 +411,17 @@
             "3": {
               "name": "punctuation.definition.entity.html"
             }
-          },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
-          "name": "constant.character.entity.html"
+          }
         },
         {
-          "match": "&",
-          "name": "invalid.illegal.bad-ampersand.html"
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
         }
       ]
     },
     "entity_name": {
       "begin": "(?=[A-Za-z_][A-Za-z0-9_]*)",
-      "end": "(?<=[A-Za-z0-9_])",
+      "end": "(?\u003c=[A-Za-z0-9_])",
       "patterns": [
         {
           "include": "#magic_function_names"
@@ -461,35 +447,35 @@
       ]
     },
     "escaped_char": {
-      "match": "\\\\[.\\n]",
-      "name": "constant.character.escape.python"
+      "name": "constant.character.escape.python",
+      "match": "\\\\[.\\n]"
     },
     "function_def": {
+      "contentName": "meta.function.parameters.python",
       "begin": "(\\()",
+      "end": "(\\))\\s*(?=\\\")",
+      "patterns": [
+        {
+          "include": "#keyword_arguments"
+        },
+        {
+          "include": "#positional_args"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.parameters.begin.python"
         }
       },
-      "contentName": "meta.function.parameters.python",
-      "end": "(\\))\\s*(?=\\\")",
       "endCaptures": {
         "1": {
           "name": "punctuation.section.parameters.end.python"
         }
-      },
-      "patterns": [
-        {
-          "include": "#keyword_arguments"
-        },
-        {
-          "include": "#positional_args"
-        }
-      ]
+      }
     },
     "function_name": {
       "begin": "(?=[A-Za-z_][A-Za-z0-9_]*)",
-      "end": "(?<=[A-Za-z0-9_])",
+      "end": "(?\u003c=[A-Za-z0-9_])",
       "patterns": [
         {
           "include": "#magic_function_names"
@@ -515,11 +501,17 @@
       "match": "[A-Za-z_][A-Za-z0-9_]*"
     },
     "illegal_names": {
-      "match": "\\b(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\\b",
-      "name": "invalid.illegal.name.python"
+      "name": "invalid.illegal.name.python",
+      "match": "\\b(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\\b"
     },
     "keyword_arguments": {
       "begin": "\\b([a-zA-Z_][a-zA-Z_0-9]*)\\s*(=)",
+      "end": "\\s*(?:(,)|(?=$\\n?|[\\)\"]))",
+      "patterns": [
+        {
+          "include": "$base"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "variable.parameter.function.python"
@@ -528,19 +520,14 @@
           "name": "keyword.operator.assignment.python"
         }
       },
-      "end": "\\s*(?:(,)|(?=$\\n?|[\\)\"]))",
       "endCaptures": {
         "1": {
           "name": "punctuation.separator.parameters.python"
         }
-      },
-      "patterns": [
-        {
-          "include": "$base"
-        }
-      ]
+      }
     },
     "line_continuation": {
+      "match": "(\\\\)(.*)$\\n?",
       "captures": {
         "1": {
           "name": "punctuation.separator.continuation.line.python"
@@ -548,20 +535,18 @@
         "2": {
           "name": "invalid.illegal.unexpected-text.python"
         }
-      },
-      "match": "(\\\\)(.*)$\\n?"
+      }
     },
     "magic_function_names": {
-      "comment": "these methods have magic interpretation by python and are generally called indirectly through syntactic constructs",
-      "match": "(?x)\\b(__(?:\n\t\t\t\t\t\tabs|add|and|call|cmp|coerce|complex|contains|del|delattr|\n\t\t\t\t\t\tdelete|delitem|delslice|div|divmod|enter|eq|exit|float|\n\t\t\t\t\t\tfloordiv|ge|get|getattr|getattribute|getitem|getslice|gt|\n\t\t\t\t\t\thash|hex|iadd|iand|idiv|ifloordiv|ilshift|imod|imul|init|\n\t\t\t\t\t\tint|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|\n\t\t\t\t\t\tlong|lshift|lt|mod|mul|ne|neg|new|nonzero|oct|or|pos|pow|\n\t\t\t\t\t\tradd|rand|rdiv|rdivmod|repr|rfloordiv|rlshift|rmod|rmul|ror|\n\t\t\t\t\t\trpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|\n\t\t\t\t\t\tsetslice|str|sub|truediv|unicode|xor\n\t\t\t\t\t)__)\\b",
-      "name": "entity.name.function.magic.python"
+      "name": "entity.name.function.magic.python",
+      "match": "(?x)\\b(__(?:\n\t\t\t\t\t\tabs|add|and|call|cmp|coerce|complex|contains|del|delattr|\n\t\t\t\t\t\tdelete|delitem|delslice|div|divmod|enter|eq|exit|float|\n\t\t\t\t\t\tfloordiv|ge|get|getattr|getattribute|getitem|getslice|gt|\n\t\t\t\t\t\thash|hex|iadd|iand|idiv|ifloordiv|ilshift|imod|imul|init|\n\t\t\t\t\t\tint|invert|ior|ipow|irshift|isub|iter|itruediv|ixor|le|len|\n\t\t\t\t\t\tlong|lshift|lt|mod|mul|ne|neg|new|nonzero|oct|or|pos|pow|\n\t\t\t\t\t\tradd|rand|rdiv|rdivmod|repr|rfloordiv|rlshift|rmod|rmul|ror|\n\t\t\t\t\t\trpow|rrshift|rshift|rsub|rtruediv|rxor|set|setattr|setitem|\n\t\t\t\t\t\tsetslice|str|sub|truediv|unicode|xor\n\t\t\t\t\t)__)\\b"
     },
     "magic_variable_names": {
-      "comment": "magic variables which a class/module may have.",
-      "match": "\\b__(all|bases|class|debug|dict|doc|file|members|metaclass|methods|name|slots|weakref)__\\b",
-      "name": "support.variable.magic.python"
+      "name": "support.variable.magic.python",
+      "match": "\\b__(all|bases|class|debug|dict|doc|file|members|metaclass|methods|name|slots|weakref)__\\b"
     },
     "positional_args": {
+      "match": "\\b([a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(,)|(?=[\\n\\)\"]))",
       "captures": {
         "1": {
           "name": "variable.parameter.function.python"
@@ -569,14 +554,23 @@
         "2": {
           "name": "punctuation.separator.parameters.python"
         }
-      },
-      "match": "\\b([a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(,)|(?=[\\n\\)\"]))"
+      }
     },
     "source_mako_tagargs": {
       "name": "source.mako.tagargs",
       "patterns": [
         {
+          "contentName": "entity.name.function.python",
           "begin": "(name)\\s*(=)\\s*(\")(?=[A-Za-z_][A-Za-z0-9_]*)",
+          "end": "(\")",
+          "patterns": [
+            {
+              "include": "#function_def"
+            },
+            {
+              "include": "#entity_name"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control"
@@ -588,21 +582,11 @@
               "name": "punctuation.section.function.begin.python"
             }
           },
-          "contentName": "entity.name.function.python",
-          "end": "(\")",
           "endCaptures": {
             "1": {
               "name": "punctuation.section.function.begin.python"
             }
-          },
-          "patterns": [
-            {
-              "include": "#function_def"
-            },
-            {
-              "include": "#entity_name"
-            }
-          ]
+          }
         },
         {
           "include": "#tag-stuff"
@@ -610,19 +594,9 @@
       ]
     },
     "string-double-quoted": {
+      "name": "string.quoted.double.html",
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.html"
-        }
-      },
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.html"
-        }
-      },
-      "name": "string.quoted.double.html",
       "patterns": [
         {
           "include": "#embedded-code"
@@ -630,22 +604,22 @@
         {
           "include": "#entities"
         }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.html"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.html"
         }
-      },
+      }
+    },
+    "string-single-quoted": {
       "name": "string.quoted.single.html",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#embedded-code"
@@ -653,40 +627,32 @@
         {
           "include": "#entities"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.html"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.html"
+        }
+      }
     },
     "tag-generic-attribute": {
-      "match": "\\b([a-zA-Z\\-_:]+)",
-      "name": "entity.other.attribute-name.html"
+      "name": "entity.other.attribute-name.html",
+      "match": "\\b([a-zA-Z\\-_:]+)"
     },
     "tag-id-attribute": {
-      "begin": "\\b(id)\\b\\s*(=)",
-      "captures": {
-        "1": {
-          "name": "entity.other.attribute-name.id.html"
-        },
-        "2": {
-          "name": "punctuation.separator.key-value.html"
-        }
-      },
-      "end": "(?<='|\")",
       "name": "meta.attribute-with-value.id.html",
+      "begin": "\\b(id)\\b\\s*(=)",
+      "end": "(?\u003c='|\")",
       "patterns": [
         {
-          "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.html"
-            }
-          },
+          "name": "string.quoted.double.html",
           "contentName": "meta.toc-list.id.html",
+          "begin": "\"",
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.html"
-            }
-          },
-          "name": "string.quoted.double.html",
           "patterns": [
             {
               "include": "#embedded-code"
@@ -694,23 +660,23 @@
             {
               "include": "#entities"
             }
-          ]
-        },
-        {
-          "begin": "'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.html"
             }
           },
-          "contentName": "meta.toc-list.id.html",
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.html"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.html",
+          "contentName": "meta.toc-list.id.html",
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
               "include": "#embedded-code"
@@ -718,9 +684,27 @@
             {
               "include": "#entities"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.html"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.html"
+            }
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.id.html"
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html"
+        }
+      }
     },
     "tag-stuff": {
       "patterns": [
@@ -738,7 +722,5 @@
         }
       ]
     }
-  },
-  "scopeName": "text.html.mako",
-  "uuid": "8580C15A-0134-4D25-9705-14F98729B2C5"
-}
+  }
+}