github-linguist 5.3.3 → 6.0.0

data/grammars/text.html.asp.json

@@ -1,58 +1,53 @@
 {
-  "fileTypes": [
-    "asp"
-  ],
-  "keyEquivalent": "^~A",
   "name": "HTML (ASP)",
+  "scopeName": "text.html.asp",
   "patterns": [
     {
-      "begin": "<%--",
+      "name": "comment.block.asp.server",
+      "begin": "\u003c%--",
+      "end": "--%\u003e",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.asp"
         }
       },
-      "end": "--%>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.asp"
         }
-      },
-      "name": "comment.block.asp.server"
+      }
     },
     {
-      "begin": "<%=?",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.begin.asp"
-        }
-      },
-      "end": "%>",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.asp"
-        }
-      },
       "name": "source.asp.embedded.html",
+      "begin": "\u003c%=?",
+      "end": "%\u003e",
       "patterns": [
         {
+          "name": "comment.line.apostrophe.asp",
+          "match": "(').*?(?=%\u003e)",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.asp"
             }
-          },
-          "match": "(').*?(?=%>)",
-          "name": "comment.line.apostrophe.asp"
+          }
         },
         {
           "include": "source.asp"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.begin.asp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.end.asp"
+        }
+      }
     },
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.asp",
-  "uuid": "27798CC6-6B1D-11D9-B8FA-000D93589AF6"
-}
+  ]
+}

data/grammars/text.html.basic.json

@@ -1,30 +1,16 @@
 {
-  "fileTypes": [
-    "html",
-    "htm",
-    "shtml",
-    "xhtml",
-    "inc",
-    "tmpl",
-    "tpl"
-  ],
-  "firstLineMatch": "<(?i:(!DOCTYPE\\s*)?html)",
-  "injections": {
-    "R:text.html - (comment.block, text.html source)": {
-      "comment": "Use R: to ensure this matches after any other injections.",
-      "patterns": [
-        {
-          "match": "<",
-          "name": "invalid.illegal.bad-angle-bracket.html"
-        }
-      ]
-    }
-  },
-  "keyEquivalent": "^~H",
   "name": "HTML",
+  "scopeName": "text.html.basic",
   "patterns": [
     {
-      "begin": "(<)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^>]*></\\2>)",
+      "name": "meta.tag.any.html",
+      "begin": "(\u003c)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^\u003e]*\u003e\u003c/\\2\u003e)",
+      "end": "(\u003e(\u003c)/)(\\2)(\u003e)",
+      "patterns": [
+        {
+          "include": "#tag-stuff"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -33,7 +19,6 @@
           "name": "entity.name.tag.html"
         }
       },
-      "end": "(>(<)/)(\\2)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -47,26 +32,12 @@
         "4": {
           "name": "punctuation.definition.tag.html"
         }
-      },
-      "name": "meta.tag.any.html",
-      "patterns": [
-        {
-          "include": "#tag-stuff"
-        }
-      ]
+      }
     },
     {
-      "begin": "(<\\?)(xml)",
-      "captures": {
-        "1": {
-          "name": "punctuation.definition.tag.html"
-        },
-        "2": {
-          "name": "entity.name.tag.xml.html"
-        }
-      },
-      "end": "(\\?>)",
       "name": "meta.tag.preprocessor.xml.html",
+      "begin": "(\u003c\\?)(xml)",
+      "end": "(\\?\u003e)",
       "patterns": [
         {
           "include": "#tag-generic-attribute"
@@ -77,136 +48,103 @@
         {
           "include": "#string-single-quoted"
         }
-      ]
-    },
-    {
-      "begin": "<!--",
+      ],
       "captures": {
-        "0": {
-          "name": "punctuation.definition.comment.html"
+        "1": {
+          "name": "punctuation.definition.tag.html"
+        },
+        "2": {
+          "name": "entity.name.tag.xml.html"
         }
-      },
-      "end": "--\\s*>",
+      }
+    },
+    {
       "name": "comment.block.html",
+      "begin": "\u003c!--",
+      "end": "--\\s*\u003e",
       "patterns": [
         {
-          "match": "--",
-          "name": "invalid.illegal.bad-comments-or-CDATA.html"
+          "name": "invalid.illegal.bad-comments-or-CDATA.html",
+          "match": "--"
         },
         {
           "include": "#embedded-code"
         }
-      ]
-    },
-    {
-      "begin": "<!",
+      ],
       "captures": {
         "0": {
-          "name": "punctuation.definition.tag.html"
+          "name": "punctuation.definition.comment.html"
         }
-      },
-      "end": ">",
+      }
+    },
+    {
       "name": "meta.tag.sgml.html",
+      "begin": "\u003c!",
+      "end": "\u003e",
       "patterns": [
         {
+          "name": "meta.tag.sgml.doctype.html",
           "begin": "(?i:DOCTYPE)",
+          "end": "(?=\u003e)",
+          "patterns": [
+            {
+              "name": "string.quoted.double.doctype.identifiers-and-DTDs.html",
+              "match": "\"[^\"\u003e]*\""
+            }
+          ],
           "captures": {
             "1": {
               "name": "entity.name.tag.doctype.html"
             }
-          },
-          "end": "(?=>)",
-          "name": "meta.tag.sgml.doctype.html",
-          "patterns": [
-            {
-              "match": "\"[^\">]*\"",
-              "name": "string.quoted.double.doctype.identifiers-and-DTDs.html"
-            }
-          ]
+          }
         },
         {
+          "name": "constant.other.inline-data.html",
           "begin": "\\[CDATA\\[",
-          "end": "]](?=>)",
-          "name": "constant.other.inline-data.html"
+          "end": "]](?=\u003e)"
         },
         {
-          "match": "(\\s*)(?!--|>)\\S(\\s*)",
-          "name": "invalid.illegal.bad-comments-or-CDATA.html"
+          "name": "invalid.illegal.bad-comments-or-CDATA.html",
+          "match": "(\\s*)(?!--|\u003e)\\S(\\s*)"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag.html"
+        }
+      }
     },
     {
       "include": "#embedded-code"
     },
     {
-      "begin": "(^[ \\t]+)?(?=<(?i:style))",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.embedded.leading.html"
-        }
-      },
+      "begin": "(^[ \\t]+)?(?=\u003c(?i:style))",
       "end": "(?!\\G)([ \\t]*$\\n?)?",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.embedded.trailing.html"
-        }
-      },
       "patterns": [
         {
-          "begin": "(<)((?i:style))\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.tag.metadata.style.html"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "2": {
-              "name": "entity.name.tag.html"
-            }
-          },
-          "end": "(/>)|((<)/)((?i:style))(>)",
-          "endCaptures": {
-            "0": {
-              "name": "meta.tag.metadata.style.html"
-            },
-            "1": {
-              "name": "punctuation.definition.tag.end.html"
-            },
-            "2": {
-              "name": "punctuation.definition.tag.begin.html"
-            },
-            "3": {
-              "name": "source.css"
-            },
-            "4": {
-              "name": "entity.name.tag.html"
-            },
-            "5": {
-              "name": "punctuation.definition.tag.end.html"
-            }
-          },
           "name": "meta.embedded.block.html",
+          "begin": "(\u003c)((?i:style))\\b",
+          "end": "(/\u003e)|((\u003c)/)((?i:style))(\u003e)",
           "patterns": [
             {
-              "begin": "\\G",
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.tag.end.html"
-                }
-              },
-              "end": "(?=/>)|(>)",
               "name": "meta.tag.metadata.style.html",
+              "begin": "\\G",
+              "end": "(?=/\u003e)|(\u003e)",
               "patterns": [
                 {
                   "include": "#tag-stuff"
                 }
-              ]
+              ],
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.end.html"
+                }
+              }
             },
             {
-              "begin": "(?!\\G)",
-              "end": "(?=</(?i:style))",
               "name": "source.css",
+              "begin": "(?!\\G)",
+              "end": "(?=\u003c/(?i:style))",
               "patterns": [
                 {
                   "include": "#embedded-code"
@@ -216,29 +154,10 @@
                 }
               ]
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(^[ \\t]+)?(?=<(?i:script))",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.embedded.leading.html"
-        }
-      },
-      "end": "(?!\\G)([ \\t]*$\\n?)?",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.embedded.trailing.html"
-        }
-      },
-      "patterns": [
-        {
-          "begin": "(<)((?i:script))\\b",
+          ],
           "beginCaptures": {
             "0": {
-              "name": "meta.tag.metadata.script.html"
+              "name": "meta.tag.metadata.style.html"
             },
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -247,10 +166,9 @@
               "name": "entity.name.tag.html"
             }
           },
-          "end": "(/>)|(/)((?i:script))(>)",
           "endCaptures": {
             "0": {
-              "name": "meta.tag.metadata.script.html"
+              "name": "meta.tag.metadata.style.html"
             },
             "1": {
               "name": "punctuation.definition.tag.end.html"
@@ -259,97 +177,95 @@
               "name": "punctuation.definition.tag.begin.html"
             },
             "3": {
-              "name": "entity.name.tag.html"
+              "name": "source.css"
             },
             "4": {
+              "name": "entity.name.tag.html"
+            },
+            "5": {
               "name": "punctuation.definition.tag.end.html"
             }
-          },
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
+        }
+      }
+    },
+    {
+      "begin": "(^[ \\t]+)?(?=\u003c(?i:script))",
+      "end": "(?!\\G)([ \\t]*$\\n?)?",
+      "patterns": [
+        {
           "name": "meta.embedded.block.html",
+          "begin": "(\u003c)((?i:script))\\b",
+          "end": "(/\u003e)|(/)((?i:script))(\u003e)",
           "patterns": [
             {
               "begin": "\\G",
-              "end": "(?=/>|/)",
+              "end": "(?=/\u003e|/)",
               "patterns": [
                 {
-                  "begin": "(>)",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "meta.tag.metadata.script.html"
-                    },
-                    "1": {
-                      "name": "punctuation.definition.tag.end.html"
-                    }
-                  },
-                  "end": "((<))(?=/(?i:script))",
-                  "endCaptures": {
-                    "0": {
-                      "name": "meta.tag.metadata.script.html"
-                    },
-                    "1": {
-                      "name": "punctuation.definition.tag.begin.html"
-                    },
-                    "2": {
-                      "name": "source.js"
-                    }
-                  },
+                  "begin": "(\u003e)",
+                  "end": "((\u003c))(?=/(?i:script))",
                   "patterns": [
                     {
-                      "begin": "\\G",
-                      "end": "(?=</(?i:script))",
                       "name": "source.js",
+                      "begin": "\\G",
+                      "end": "(?=\u003c/(?i:script))",
                       "patterns": [
                         {
                           "begin": "(^[ \\t]+)?(?=//)",
-                          "beginCaptures": {
-                            "1": {
-                              "name": "punctuation.whitespace.comment.leading.js"
-                            }
-                          },
                           "end": "(?!\\G)",
                           "patterns": [
                             {
+                              "name": "comment.line.double-slash.js",
                               "begin": "//",
+                              "end": "(?=\u003c/script)|\\n",
                               "beginCaptures": {
                                 "0": {
                                   "name": "punctuation.definition.comment.js"
                                 }
-                              },
-                              "end": "(?=</script)|\\n",
-                              "name": "comment.line.double-slash.js"
+                              }
                             }
-                          ]
+                          ],
+                          "beginCaptures": {
+                            "1": {
+                              "name": "punctuation.whitespace.comment.leading.js"
+                            }
+                          }
                         },
                         {
+                          "name": "comment.block.js",
                           "begin": "/\\*",
+                          "end": "\\*/|(?=\u003c/script)",
                           "captures": {
                             "0": {
                               "name": "punctuation.definition.comment.js"
                             }
-                          },
-                          "end": "\\*/|(?=</script)",
-                          "name": "comment.block.js"
+                          }
                         },
                         {
                           "include": "source.js"
                         }
                       ]
                     }
-                  ]
-                },
-                {
-                  "begin": "\\G",
-                  "end": "(?i:(?=/?>|type(?=[\\s=])(?!\\s*=\\s*('|\"|)(text/(javascript|ecmascript|babel)|application/((x-)?javascript|ecmascript|babel)|module)[\\s\"'>])))",
-                  "name": "meta.tag.metadata.script.html",
-                  "patterns": [
-                    {
-                      "include": "#tag-stuff"
+                  ],
+                  "beginCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.end.html"
                     }
-                  ]
-                },
-                {
-                  "begin": "(?=(?i:type\\s*=\\s*('|\"|)(text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'>])))",
-                  "end": "((<))(?=/(?i:script))",
+                  },
                   "endCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.script.html"
@@ -358,79 +274,149 @@
                       "name": "punctuation.definition.tag.begin.html"
                     },
                     "2": {
-                      "name": "text.html.basic"
+                      "name": "source.js"
                     }
-                  },
+                  }
+                },
+                {
+                  "name": "meta.tag.metadata.script.html",
+                  "begin": "\\G",
+                  "end": "(?i:(?=/?\u003e|type(?=[\\s=])(?!\\s*=\\s*('|\"|)(text/(javascript|ecmascript|babel)|application/((x-)?javascript|ecmascript|babel)|module)[\\s\"'\u003e])))",
+                  "patterns": [
+                    {
+                      "include": "#tag-stuff"
+                    }
+                  ]
+                },
+                {
+                  "begin": "(?=(?i:type\\s*=\\s*('|\"|)(text/(x-handlebars|(x-(handlebars-)?|ng-)?template|html)[\\s\"'\u003e])))",
+                  "end": "((\u003c))(?=/(?i:script))",
                   "patterns": [
                     {
-                      "begin": "\\G",
-                      "end": "(>)|(?=/>)",
-                      "endCaptures": {
-                        "1": {
-                          "name": "punctuation.definition.tag.end.html"
-                        }
-                      },
                       "name": "meta.tag.metadata.script.html",
+                      "begin": "\\G",
+                      "end": "(\u003e)|(?=/\u003e)",
                       "patterns": [
                         {
                           "include": "#tag-stuff"
                         }
-                      ]
+                      ],
+                      "endCaptures": {
+                        "1": {
+                          "name": "punctuation.definition.tag.end.html"
+                        }
+                      }
                     },
                     {
-                      "begin": "(?!\\G)",
-                      "end": "(?=</(?i:script))",
                       "name": "text.html.basic",
+                      "begin": "(?!\\G)",
+                      "end": "(?=\u003c/(?i:script))",
                       "patterns": [
                         {
                           "include": "text.html.basic"
                         }
                       ]
                     }
-                  ]
-                },
-                {
-                  "begin": "(?=(?i:type))",
-                  "end": "(<)(?=/(?i:script))",
+                  ],
                   "endCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.script.html"
                     },
                     "1": {
                       "name": "punctuation.definition.tag.begin.html"
+                    },
+                    "2": {
+                      "name": "text.html.basic"
                     }
-                  },
+                  }
+                },
+                {
+                  "begin": "(?=(?i:type))",
+                  "end": "(\u003c)(?=/(?i:script))",
                   "patterns": [
                     {
-                      "begin": "\\G",
-                      "end": "(>)|(?=/>)",
-                      "endCaptures": {
-                        "1": {
-                          "name": "punctuation.definition.tag.end.html"
-                        }
-                      },
                       "name": "meta.tag.metadata.script.html",
+                      "begin": "\\G",
+                      "end": "(\u003e)|(?=/\u003e)",
                       "patterns": [
                         {
                           "include": "#tag-stuff"
                         }
-                      ]
+                      ],
+                      "endCaptures": {
+                        "1": {
+                          "name": "punctuation.definition.tag.end.html"
+                        }
+                      }
                     },
                     {
+                      "name": "source.unknown",
                       "begin": "(?!\\G)",
-                      "end": "(?=</(?i:script))",
-                      "name": "source.unknown"
+                      "end": "(?=\u003c/(?i:script))"
                     }
-                  ]
+                  ],
+                  "endCaptures": {
+                    "0": {
+                      "name": "meta.tag.metadata.script.html"
+                    },
+                    "1": {
+                      "name": "punctuation.definition.tag.begin.html"
+                    }
+                  }
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "2": {
+              "name": "entity.name.tag.html"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "meta.tag.metadata.script.html"
+            },
+            "1": {
+              "name": "punctuation.definition.tag.end.html"
+            },
+            "2": {
+              "name": "punctuation.definition.tag.begin.html"
+            },
+            "3": {
+              "name": "entity.name.tag.html"
+            },
+            "4": {
+              "name": "punctuation.definition.tag.end.html"
+            }
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.leading.html"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.embedded.trailing.html"
+        }
+      }
     },
     {
-      "begin": "(</?)((?i:body|head|html)\\b)",
+      "name": "meta.tag.structure.any.html",
+      "begin": "(\u003c/?)((?i:body|head|html)\\b)",
+      "end": "(\u003e)",
+      "patterns": [
+        {
+          "include": "#tag-stuff"
+        }
+      ],
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -438,17 +424,17 @@
         "2": {
           "name": "entity.name.tag.structure.any.html"
         }
-      },
-      "end": "(>)",
-      "name": "meta.tag.structure.any.html",
+      }
+    },
+    {
+      "name": "meta.tag.block.any.html",
+      "begin": "(\u003c/?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)\\b)",
+      "end": "(\u003e)",
       "patterns": [
         {
           "include": "#tag-stuff"
         }
-      ]
-    },
-    {
-      "begin": "(</?)((?i:address|blockquote|dd|div|section|article|aside|header|footer|nav|menu|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|pre)\\b)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -457,21 +443,21 @@
           "name": "entity.name.tag.block.any.html"
         }
       },
-      "end": "(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.html"
         }
-      },
-      "name": "meta.tag.block.any.html",
+      }
+    },
+    {
+      "name": "meta.tag.inline.any.html",
+      "begin": "(\u003c/?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b(?!-))",
+      "end": "((?: ?/)?\u003e)",
       "patterns": [
         {
           "include": "#tag-stuff"
         }
-      ]
-    },
-    {
-      "begin": "(</?)((?i:a|abbr|acronym|area|b|base|basefont|bdo|big|br|button|caption|cite|code|col|colgroup|del|dfn|em|font|head|html|i|img|input|ins|isindex|kbd|label|legend|li|link|map|meta|noscript|optgroup|option|param|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|var)\\b(?!-))",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -480,21 +466,21 @@
           "name": "entity.name.tag.inline.any.html"
         }
       },
-      "end": "((?: ?/)?>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.html"
         }
-      },
-      "name": "meta.tag.inline.any.html",
+      }
+    },
+    {
+      "name": "meta.tag.other.html",
+      "begin": "(\u003c/?)([a-zA-Z][a-zA-Z0-9:-]*)",
+      "end": "(/?\u003e)",
       "patterns": [
         {
           "include": "#tag-stuff"
         }
-      ]
-    },
-    {
-      "begin": "(</?)([a-zA-Z][a-zA-Z0-9:-]*)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -503,25 +489,18 @@
           "name": "entity.name.tag.other.html"
         }
       },
-      "end": "(/?>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.html"
         }
-      },
-      "name": "meta.tag.other.html",
-      "patterns": [
-        {
-          "include": "#tag-stuff"
-        }
-      ]
+      }
     },
     {
       "include": "#entities"
     },
     {
-      "match": "<>",
-      "name": "invalid.illegal.incomplete.html"
+      "name": "invalid.illegal.incomplete.html",
+      "match": "\u003c\u003e"
     }
   ],
   "repository": {
@@ -538,6 +517,8 @@
     "entities": {
       "patterns": [
         {
+          "name": "constant.character.entity.html",
+          "match": "(\u0026)([a-zA-Z0-9]+|#[0-9]+|#[xX][0-9a-fA-F]+)(;)",
           "captures": {
             "1": {
               "name": "punctuation.definition.entity.html"
@@ -545,20 +526,18 @@
             "3": {
               "name": "punctuation.definition.entity.html"
             }
-          },
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#[xX][0-9a-fA-F]+)(;)",
-          "name": "constant.character.entity.html"
+          }
         },
         {
-          "match": "&",
-          "name": "invalid.illegal.bad-ampersand.html"
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
         }
       ]
     },
     "python": {
-      "begin": "(?:^\\s*)<\\?python(?!.*\\?>)",
-      "end": "\\?>(?:\\s*$\\n)?",
       "name": "source.python.embedded.html",
+      "begin": "(?:^\\s*)\u003c\\?python(?!.*\\?\u003e)",
+      "end": "\\?\u003e(?:\\s*$\\n)?",
       "patterns": [
         {
           "include": "source.python"
@@ -569,6 +548,7 @@
       "patterns": [
         {
           "begin": "(\\{(literal)\\})",
+          "end": "(\\{/(literal)\\})",
           "captures": {
             "1": {
               "name": "source.smarty.embedded.html"
@@ -576,36 +556,23 @@
             "2": {
               "name": "support.function.built-in.smarty"
             }
-          },
-          "end": "(\\{/(literal)\\})"
+          }
         },
         {
+          "name": "source.smarty.embedded.html",
           "begin": "{{|{",
-          "disabled": 1,
           "end": "}}|}",
-          "name": "source.smarty.embedded.html",
           "patterns": [
-            {
-              "include": "source.smarty"
-            }
-          ]
+            {}
+          ],
+          "disabled": true
         }
       ]
     },
     "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"
@@ -613,22 +580,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"
@@ -636,40 +603,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-Z0-9:-]+)",
-      "name": "entity.other.attribute-name.html"
+      "name": "entity.other.attribute-name.html",
+      "match": "(?\u003c=[^=])\\b([a-zA-Z0-9:-]+)"
     },
     "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": "(?!\\G)(?<='|\"|[^\\s<>/])",
       "name": "meta.attribute-with-value.id.html",
+      "begin": "\\b(id)\\b\\s*(=)",
+      "end": "(?!\\G)(?\u003c='|\"|[^\\s\u003c\u003e/])",
       "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"
@@ -677,23 +636,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"
@@ -701,18 +660,36 @@
             {
               "include": "#entities"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.html"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.html"
+            }
+          }
         },
         {
+          "name": "string.unquoted.html",
+          "match": "(?\u003c==)(?:[^\\s\u003c\u003e/'\"]|/(?!\u003e))+",
           "captures": {
             "0": {
               "name": "meta.toc-list.id.html"
             }
-          },
-          "match": "(?<==)(?:[^\\s<>/'\"]|/(?!>))+",
-          "name": "string.unquoted.html"
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.id.html"
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html"
+        }
+      }
     },
     "tag-stuff": {
       "patterns": [
@@ -737,10 +714,18 @@
       ]
     },
     "unquoted-attribute": {
-      "match": "(?<==)(?:[^\\s<>/'\"]|/(?!>))+",
-      "name": "string.unquoted.html"
+      "name": "string.unquoted.html",
+      "match": "(?\u003c==)(?:[^\\s\u003c\u003e/'\"]|/(?!\u003e))+"
     }
   },
-  "scopeName": "text.html.basic",
-  "uuid": "17994EC8-6B1D-11D9-AC3A-000D93589AF6"
-}
+  "injections": {
+    "R:text.html - (comment.block, text.html source)": {
+      "patterns": [
+        {
+          "name": "invalid.illegal.bad-angle-bracket.html",
+          "match": "\u003c"
+        }
+      ]
+    }
+  }
+}