github-linguist 5.3.3 → 6.0.0

data/grammars/text.html.factor.json

@@ -1,16 +1,11 @@
 {
-  "fileTypes": [
-    "furnace",
-    "fhtml"
-  ],
-  "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 (Factor)",
+  "scopeName": "text.html.factor",
   "patterns": [
     {
-      "begin": "<%\\s",
-      "end": "(?<=\\s)%>",
       "name": "source.factor.embedded.html",
+      "begin": "\u003c%\\s",
+      "end": "(?\u003c=\\s)%\u003e",
       "patterns": [
         {
           "include": "source.factor"
@@ -20,6 +15,5 @@
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.factor"
-}
+  ]
+}

data/grammars/text.html.ftl.json

@@ -1,25 +1,20 @@
 {
-  "fileTypes": [
-    "ftl",
-    "ftlx",
-    "ftlh"
-  ],
-  "foldingStartMarker": "(?x)\n\t\t(<(?i:head|body|table|thead|tbody|tfoot|tr|div|nav|section|aside|header|select|fieldset|style|script|ul|ol|form|dl)\\b.*?>\n\t\t|<!--(?!.*-->)\n\t\t|\\{\\s*($|\\?>\\s*$|//|/\\*(.*\\*/\\s*$|(?!.*?\\*/)))\n\t\t|(\\[|<)(\\#|@)\\w+.*\\(\\]|>)\n\t\t)",
-  "foldingStopMarker": "(?x)\n\t\t(</(?i:head|body|table|thead|tbody|tfoot|tr|div|nav|section|aside|header|select|fieldset|style|script|ul|ol|form|dl)>\n\t\t|^\\s*-->\n\t\t|(^|\\s)\\}\n\t\t|(\\[|<)/(\\#|@)\\w+.*(\\]|>)\n\t\t)",
-  "keyEquivalent": "^~F",
   "name": "FreeMarker",
+  "scopeName": "text.html.ftl",
   "patterns": [
     {
-      "begin": "[<\\[]#--",
+      "name": "comment.block.ftl",
+      "begin": "[\u003c\\[]#--",
+      "end": "--[\u003e\\]]",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.ftl"
         }
-      },
-      "end": "--[>\\]]",
-      "name": "comment.block.ftl"
+      }
     },
     {
+      "name": "meta.function.ftl",
+      "match": "([\u003c\\[](#|@))(\\w+(\\.\\w+)*)((\\s+[^\u003e\\]]+)*?)\\s*((\\/)?([\u003e\\]]))",
       "captures": {
         "1": {
           "name": "punctuation.definition.function.ftl"
@@ -39,11 +34,11 @@
         "9": {
           "name": "punctuation.definition.function.ftl"
         }
-      },
-      "match": "([<\\[](#|@))(\\w+(\\.\\w+)*)((\\s+[^>\\]]+)*?)\\s*((\\/)?([>\\]]))",
-      "name": "meta.function.ftl"
+      }
     },
     {
+      "name": "meta.function.ftl",
+      "match": "([\u003c\\[]\\/(#|@))(\\w+(\\.\\w+)*)\\s*([\u003e\\]])",
       "captures": {
         "1": {
           "name": "punctuation.definition.function.ftl"
@@ -57,11 +52,11 @@
         "5": {
           "name": "punctuation.definition.function.ftl"
         }
-      },
-      "match": "([<\\[]\\/(#|@))(\\w+(\\.\\w+)*)\\s*([>\\]])",
-      "name": "meta.function.ftl"
+      }
     },
     {
+      "name": "variable.other.readwrite.local.ftl",
+      "match": "(\\$\\{)\\.?[a-zA-Z_\\(][\\w\\(\\)+-\\/\\*]+(\\.?[\\w\\(\\)+-\\/\\*]+)*(.*?|\\?\\?|\\!)?(\\})",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.ftl"
@@ -72,14 +67,10 @@
         "4": {
           "name": "punctuation.definition.variable.ftl"
         }
-      },
-      "match": "(\\$\\{)\\.?[a-zA-Z_\\(][\\w\\(\\)+-\\/\\*]+(\\.?[\\w\\(\\)+-\\/\\*]+)*(.*?|\\?\\?|\\!)?(\\})",
-      "name": "variable.other.readwrite.local.ftl"
+      }
     },
     {
       "include": "text.html.basic"
     }
-  ],
-  "scopeName": "text.html.ftl",
-  "uuid": "C011BB07-875D-4DEB-9582-0E1FEC0D1E4E"
-}
+  ]
+}

data/grammars/text.html.handlebars.json

@@ -1,10 +1,292 @@
 {
   "name": "Handlebars",
+  "scopeName": "text.html.handlebars",
+  "patterns": [
+    {
+      "include": "#yfm"
+    },
+    {
+      "include": "#extends"
+    },
+    {
+      "include": "#block_comments"
+    },
+    {
+      "include": "#comments"
+    },
+    {
+      "include": "#block_helper"
+    },
+    {
+      "include": "#end_block"
+    },
+    {
+      "include": "#else_token"
+    },
+    {
+      "include": "#partial_and_var"
+    },
+    {
+      "include": "#inline_script"
+    },
+    {
+      "include": "#html_tags"
+    },
+    {
+      "include": "text.html.basic"
+    }
+  ],
   "repository": {
+    "block_comments": {
+      "patterns": [
+        {
+          "name": "comment.block.handlebars",
+          "begin": "\\{\\{!--",
+          "end": "--\\}\\}",
+          "patterns": [
+            {
+              "name": "keyword.annotation.handlebars",
+              "match": "@\\w*"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "name": "comment.block.html",
+          "begin": "\u003c!--",
+          "end": "-{2,3}\\s*\u003e",
+          "patterns": [
+            {
+              "name": "invalid.illegal.bad-comments-or-CDATA.html",
+              "match": "--"
+            }
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.html"
+            }
+          }
+        }
+      ]
+    },
+    "block_helper": {
+      "name": "meta.function.block.start.handlebars",
+      "begin": "(\\{\\{)(~?\\#)([-a-zA-Z0-9_\\./\u003e]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
+      "end": "(~?\\}\\})",
+      "patterns": [
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#handlebars_attribute"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "support.constant.handlebars"
+        },
+        "2": {
+          "name": "support.constant.handlebars keyword.control"
+        },
+        "3": {
+          "name": "support.constant.handlebars keyword.control"
+        },
+        "4": {
+          "name": "variable.parameter.handlebars"
+        },
+        "5": {
+          "name": "support.constant.handlebars"
+        },
+        "6": {
+          "name": "variable.parameter.handlebars"
+        },
+        "7": {
+          "name": "support.constant.handlebars"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "support.constant.handlebars"
+        }
+      }
+    },
+    "comments": {
+      "patterns": [
+        {
+          "name": "comment.block.handlebars",
+          "begin": "\\{\\{!",
+          "end": "\\}\\}",
+          "patterns": [
+            {
+              "name": "keyword.annotation.handlebars",
+              "match": "@\\w*"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "name": "comment.block.html",
+          "begin": "\u003c!--",
+          "end": "-{2,3}\\s*\u003e",
+          "patterns": [
+            {
+              "name": "invalid.illegal.bad-comments-or-CDATA.html",
+              "match": "--"
+            }
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.html"
+            }
+          }
+        }
+      ]
+    },
+    "else_token": {
+      "name": "meta.function.inline.else.handlebars",
+      "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\./]+))?",
+      "end": "(~?\\}\\}\\}*)",
+      "beginCaptures": {
+        "1": {
+          "name": "support.constant.handlebars"
+        },
+        "2": {
+          "name": "support.constant.handlebars keyword.control"
+        },
+        "3": {
+          "name": "support.constant.handlebars"
+        },
+        "4": {
+          "name": "variable.parameter.handlebars"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "support.constant.handlebars"
+        }
+      }
+    },
+    "end_block": {
+      "name": "meta.function.block.end.handlebars",
+      "begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
+      "end": "(~?\\}\\})",
+      "beginCaptures": {
+        "1": {
+          "name": "support.constant.handlebars"
+        },
+        "2": {
+          "name": "support.constant.handlebars keyword.control"
+        },
+        "3": {
+          "name": "support.constant.handlebars keyword.control"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "support.constant.handlebars"
+        }
+      }
+    },
+    "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"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.html"
+            }
+          }
+        },
+        {
+          "name": "invalid.illegal.bad-ampersand.html",
+          "match": "\u0026"
+        }
+      ]
+    },
+    "escaped-double-quote": {
+      "name": "constant.character.escape.js",
+      "match": "\\\\\""
+    },
+    "escaped-single-quote": {
+      "name": "constant.character.escape.js",
+      "match": "\\\\'"
+    },
+    "extends": {
+      "patterns": [
+        {
+          "name": "meta.preprocessor.handlebars",
+          "begin": "(\\{\\{!\u003c)\\s([-a-zA-Z0-9_\\./]+)",
+          "end": "(\\}\\})",
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.handlebars"
+            },
+            "2": {
+              "name": "support.class.handlebars"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "support.function.handlebars"
+            }
+          }
+        }
+      ]
+    },
+    "handlebars_attribute": {
+      "patterns": [
+        {
+          "include": "#handlebars_attribute_name"
+        },
+        {
+          "include": "#handlebars_attribute_value"
+        }
+      ]
+    },
+    "handlebars_attribute_name": {
+      "name": "entity.other.attribute-name.handlebars",
+      "begin": "\\b([-a-zA-Z0-9_\\.]+)\\b=",
+      "end": "(?='|\"|)",
+      "captures": {
+        "1": {
+          "name": "variable.parameter.handlebars"
+        }
+      }
+    },
+    "handlebars_attribute_value": {
+      "name": "entity.other.attribute-value.handlebars",
+      "begin": "([-a-zA-Z0-9_\\./]+)\\b",
+      "end": "('|\"|)",
+      "patterns": [
+        {
+          "include": "#string"
+        }
+      ],
+      "captures": {
+        "1": {
+          "name": "variable.parameter.handlebars"
+        }
+      }
+    },
     "html_tags": {
       "patterns": [
         {
-          "begin": "(<)([a-zA-Z0-9:-]+)(?=[^>]*></\\2>)",
+          "name": "meta.tag.any.html",
+          "begin": "(\u003c)([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"
@@ -13,7 +295,6 @@
               "name": "entity.name.tag.html"
             }
           },
-          "end": "(>(<)/)(\\2)(>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.html"
@@ -27,26 +308,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"
@@ -54,579 +321,350 @@
             {
               "include": "#string"
             }
-          ]
-        },
-        {
-          "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": "--"
             }
-          ]
-        },
-        {
-          "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": "(DOCTYPE|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*)"
             }
-          ]
-        },
-        {
-          "begin": "(?:^\\s+)?(<)((?i:style))\\b(?![^>]*/>)",
+          ],
           "captures": {
-            "1": {
-              "name": "punctuation.definition.tag.html"
-            },
-            "2": {
-              "name": "entity.name.tag.style.html"
-            },
-            "3": {
+            "0": {
               "name": "punctuation.definition.tag.html"
             }
-          },
-          "end": "(</)((?i:style))(>)(?:\\s*\\n)?",
+          }
+        },
+        {
           "name": "source.css.embedded.html",
+          "begin": "(?:^\\s+)?(\u003c)((?i:style))\\b(?![^\u003e]*/\u003e)",
+          "end": "(\u003c/)((?i:style))(\u003e)(?:\\s*\\n)?",
           "patterns": [
             {
               "include": "#tag-stuff"
             },
             {
-              "begin": "(>)",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.definition.tag.html"
-                }
-              },
-              "end": "(?=</(?i:style))",
+              "begin": "(\u003e)",
+              "end": "(?=\u003c/(?i:style))",
               "patterns": [
                 {
                   "include": "source.css"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag.html"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "(?:^\\s+)?(<)((?i:script))\\b(?![^>]*/>)",
-          "beginCaptures": {
+          ],
+          "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
             },
             "2": {
-              "name": "entity.name.tag.script.html"
-            }
-          },
-          "end": "(?<=</(script|SCRIPT))(>)(?:\\s*\\n)?",
-          "endCaptures": {
-            "2": {
+              "name": "entity.name.tag.style.html"
+            },
+            "3": {
               "name": "punctuation.definition.tag.html"
             }
-          },
+          }
+        },
+        {
           "name": "source.js.embedded.html",
+          "begin": "(?:^\\s+)?(\u003c)((?i:script))\\b(?![^\u003e]*/\u003e)",
+          "end": "(?\u003c=\u003c/(script|SCRIPT))(\u003e)(?:\\s*\\n)?",
           "patterns": [
             {
               "include": "#tag-stuff"
             },
             {
-              "begin": "(?<!</(?:script|SCRIPT))(>)",
-              "captures": {
-                "1": {
-                  "name": "punctuation.definition.tag.html"
-                },
-                "2": {
-                  "name": "entity.name.tag.script.html"
-                }
-              },
-              "end": "(</)((?i:script))",
+              "begin": "(?\u003c!\u003c/(?:script|SCRIPT))(\u003e)",
+              "end": "(\u003c/)((?i:script))",
               "patterns": [
                 {
+                  "name": "comment.line.double-slash.js",
+                  "match": "(//).*?((?=\u003c/script)|$\\n?)",
                   "captures": {
                     "1": {
                       "name": "punctuation.definition.comment.js"
                     }
-                  },
-                  "match": "(//).*?((?=</script)|$\\n?)",
-                  "name": "comment.line.double-slash.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"
                 }
-              ]
+              ],
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.tag.html"
+                },
+                "2": {
+                  "name": "entity.name.tag.script.html"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "(</?)((?i:body|head|html)\\b)",
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.html"
             },
             "2": {
-              "name": "entity.name.tag.structure.any.html"
+              "name": "entity.name.tag.script.html"
             }
           },
-          "end": "(>)",
-          "name": "meta.tag.structure.any.html",
-          "patterns": [
-            {
-              "include": "#tag-stuff"
-            }
-          ]
-        },
-        {
-          "begin": "(</?)((?i:address|blockquote|dd|div|header|section|footer|aside|nav|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\\b)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.tag.html"
-            },
+          "endCaptures": {
             "2": {
-              "name": "entity.name.tag.block.any.html"
-            }
-          },
-          "end": "(>)",
-          "name": "meta.tag.block.any.html",
-          "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)",
-          "captures": {
-            "1": {
               "name": "punctuation.definition.tag.html"
-            },
-            "2": {
-              "name": "entity.name.tag.inline.any.html"
             }
-          },
-          "end": "((?: ?/)?>)",
-          "name": "meta.tag.inline.any.html",
-          "patterns": [
-            {
-              "include": "#tag-stuff"
-            }
-          ]
+          }
         },
         {
-          "begin": "(</?)([a-zA-Z0-9:-]+)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.tag.html"
-            },
-            "2": {
-              "name": "entity.name.tag.other.html"
-            }
-          },
-          "end": "(>)",
-          "name": "meta.tag.other.html",
+          "name": "meta.tag.structure.any.html",
+          "begin": "(\u003c/?)((?i:body|head|html)\\b)",
+          "end": "(\u003e)",
           "patterns": [
             {
               "include": "#tag-stuff"
             }
-          ]
-        },
-        {
-          "begin": "(</?)([a-zA-Z0-9{}:-]+)",
+          ],
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.html"
             },
             "2": {
-              "name": "entity.name.tag.tokenised.html"
-            }
-          },
-          "end": "(>)",
-          "name": "meta.tag.tokenised.html",
-          "patterns": [
-            {
-              "include": "#tag-stuff"
-            }
-          ]
-        },
-        {
-          "include": "#entities"
-        },
-        {
-          "match": "<>",
-          "name": "invalid.illegal.incomplete.html"
-        },
-        {
-          "match": "<",
-          "name": "invalid.illegal.bad-angle-bracket.html"
-        }
-      ]
-    },
-    "entities": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.entity.html"
-            },
-            "3": {
-              "name": "punctuation.definition.entity.html"
+              "name": "entity.name.tag.structure.any.html"
             }
-          },
-          "name": "constant.character.entity.html",
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)"
+          }
         },
         {
-          "name": "invalid.illegal.bad-ampersand.html",
-          "match": "&"
-        }
-      ]
-    },
-    "end_block": {
-      "begin": "(\\{\\{)(~?/)([a-zA-Z0-9/_\\.-]+)\\s*",
-      "end": "(~?\\}\\})",
-      "name": "meta.function.block.end.handlebars",
-      "endCaptures": {
-        "1": {
-          "name": "support.constant.handlebars"
-        }
-      },
-      "beginCaptures": {
-        "1": {
-          "name": "support.constant.handlebars"
-        },
-        "2": {
-          "name": "support.constant.handlebars keyword.control"
-        },
-        "3": {
-          "name": "support.constant.handlebars keyword.control"
-        }
-      },
-      "patterns": [
-
-      ]
-    },
-    "yfm": {
-      "patterns": [
-        {
+          "name": "meta.tag.block.any.html",
+          "begin": "(\u003c/?)((?i:address|blockquote|dd|div|header|section|footer|aside|nav|dl|dt|fieldset|form|frame|frameset|h1|h2|h3|h4|h5|h6|iframe|noframes|object|ol|p|ul|applet|center|dir|hr|menu|pre)\\b)",
+          "end": "(\u003e)",
           "patterns": [
             {
-              "include": "source.yaml"
+              "include": "#tag-stuff"
             }
           ],
-          "begin": "(?<!\\s)---\\n$",
-          "end": "^---\\s",
-          "name": "markup.raw.yaml.front-matter"
-        }
-      ]
-    },
-    "comments": {
-      "patterns": [
-        {
-          "patterns": [
-            {
-              "name": "keyword.annotation.handlebars",
-              "match": "@\\w*"
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
             },
-            {
-              "include": "#comments"
+            "2": {
+              "name": "entity.name.tag.block.any.html"
             }
-          ],
-          "begin": "\\{\\{!",
-          "end": "\\}\\}",
-          "name": "comment.block.handlebars"
+          }
         },
         {
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.html"
-            }
-          },
-          "begin": "<!--",
-          "end": "-{2,3}\\s*>",
-          "name": "comment.block.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": [
             {
-              "name": "invalid.illegal.bad-comments-or-CDATA.html",
-              "match": "--"
+              "include": "#tag-stuff"
             }
-          ]
-        }
-      ]
-    },
-    "block_comments": {
-      "patterns": [
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.inline.any.html"
+            }
+          }
+        },
         {
+          "name": "meta.tag.other.html",
+          "begin": "(\u003c/?)([a-zA-Z0-9:-]+)",
+          "end": "(\u003e)",
           "patterns": [
             {
-              "name": "keyword.annotation.handlebars",
-              "match": "@\\w*"
-            },
-            {
-              "include": "#comments"
+              "include": "#tag-stuff"
             }
           ],
-          "begin": "\\{\\{!--",
-          "end": "--\\}\\}",
-          "name": "comment.block.handlebars"
-        },
-        {
           "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.html"
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.other.html"
             }
-          },
-          "begin": "<!--",
-          "end": "-{2,3}\\s*>",
-          "name": "comment.block.html",
+          }
+        },
+        {
+          "name": "meta.tag.tokenised.html",
+          "begin": "(\u003c/?)([a-zA-Z0-9{}:-]+)",
+          "end": "(\u003e)",
           "patterns": [
             {
-              "name": "invalid.illegal.bad-comments-or-CDATA.html",
-              "match": "--"
+              "include": "#tag-stuff"
             }
-          ]
-        }
-      ]
-    },
-    "block_helper": {
-      "begin": "(\\{\\{)(~?\\#)([-a-zA-Z0-9_\\./>]+)\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*\\s?(@?[-a-zA-Z0-9_\\./]+)*",
-      "end": "(~?\\}\\})",
-      "name": "meta.function.block.start.handlebars",
-      "endCaptures": {
-        "1": {
-          "name": "support.constant.handlebars"
-        }
-      },
-      "beginCaptures": {
-        "1": {
-          "name": "support.constant.handlebars"
-        },
-        "2": {
-          "name": "support.constant.handlebars keyword.control"
-        },
-        "3": {
-          "name": "support.constant.handlebars keyword.control"
-        },
-        "4": {
-          "name": "variable.parameter.handlebars"
-        },
-        "5": {
-          "name": "support.constant.handlebars"
-        },
-        "6": {
-          "name": "variable.parameter.handlebars"
-        },
-        "7": {
-          "name": "support.constant.handlebars"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#string"
-        },
-        {
-          "include": "#handlebars_attribute"
-        }
-      ]
-    },
-    "string-single-quoted": {
-      "begin": "'",
-      "end": "'",
-      "name": "string.quoted.single.handlebars",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.html"
-        }
-      },
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.html"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#escaped-single-quote"
-        },
-        {
-          "include": "#block_comments"
-        },
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#block_helper"
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.tokenised.html"
+            }
+          }
         },
         {
-          "include": "#else_token"
+          "include": "#entities"
         },
         {
-          "include": "#end_block"
+          "name": "invalid.illegal.incomplete.html",
+          "match": "\u003c\u003e"
         },
         {
-          "include": "#partial_and_var"
+          "name": "invalid.illegal.bad-angle-bracket.html",
+          "match": "\u003c"
         }
       ]
     },
-    "string": {
+    "inline_script": {
+      "name": "source.handlebars.embedded.html",
+      "begin": "(?:^\\s+)?(\u003c)((?i:script))\\b(?:.*(type)=([\"'](?:text/x-handlebars-template|text/x-handlebars|text/template|x-tmpl-handlebars)[\"']))(?![^\u003e]*/\u003e)",
+      "end": "(?\u003c=\u003c/(script|SCRIPT))(\u003e)(?:\\s*\\n)?",
       "patterns": [
         {
-          "include": "#string-single-quoted"
+          "include": "#tag-stuff"
         },
         {
-          "include": "#string-double-quoted"
+          "begin": "(?\u003c!\u003c/(?:script|SCRIPT))(\u003e)",
+          "end": "(\u003c/)((?i:script))",
+          "patterns": [
+            {
+              "include": "#block_comments"
+            },
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#block_helper"
+            },
+            {
+              "include": "#end_block"
+            },
+            {
+              "include": "#else_token"
+            },
+            {
+              "include": "#partial_and_var"
+            },
+            {
+              "include": "#html_tags"
+            },
+            {
+              "include": "text.html.basic"
+            }
+          ],
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.tag.html"
+            },
+            "2": {
+              "name": "entity.name.tag.script.html"
+            }
+          }
         }
-      ]
-    },
-    "escaped-single-quote": {
-      "name": "constant.character.escape.js",
-      "match": "\\\\'"
-    },
-    "escaped-double-quote": {
-      "name": "constant.character.escape.js",
-      "match": "\\\\\""
-    },
-    "partial_and_var": {
-      "begin": "(\\{\\{~?\\{*(>|!<)*)\\s*(@?[-a-zA-Z0-9$_\\./]+)*",
-      "end": "(~?\\}\\}\\}*)",
-      "name": "meta.function.inline.other.handlebars",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "support.constant.handlebars"
+          "name": "punctuation.definition.tag.html"
+        },
+        "2": {
+          "name": "entity.name.tag.script.html"
         },
         "3": {
-          "name": "variable.parameter.handlebars"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "support.constant.handlebars"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#string"
+          "name": "entity.other.attribute-name.html"
         },
-        {
-          "include": "#handlebars_attribute"
-        }
-      ]
-    },
-    "handlebars_attribute_name": {
-      "begin": "\\b([-a-zA-Z0-9_\\.]+)\\b=",
-      "captures": {
-        "1": {
-          "name": "variable.parameter.handlebars"
-        }
-      },
-      "end": "(?='|\"|)",
-      "name": "entity.other.attribute-name.handlebars"
-    },
-    "handlebars_attribute_value": {
-      "begin": "([-a-zA-Z0-9_\\./]+)\\b",
-      "captures": {
-        "1": {
-          "name": "variable.parameter.handlebars"
+        "4": {
+          "name": "string.quoted.double.html"
         }
       },
-      "end": "('|\"|)",
-      "name": "entity.other.attribute-value.handlebars",
-      "patterns": [
-        {
-          "include": "#string"
+      "endCaptures": {
+        "2": {
+          "name": "punctuation.definition.tag.html"
         }
-      ]
+      }
     },
-    "handlebars_attribute": {
+    "partial_and_var": {
+      "name": "meta.function.inline.other.handlebars",
+      "begin": "(\\{\\{~?\\{*(\u003e|!\u003c)*)\\s*(@?[-a-zA-Z0-9$_\\./]+)*",
+      "end": "(~?\\}\\}\\}*)",
       "patterns": [
         {
-          "include": "#handlebars_attribute_name"
+          "include": "#string"
         },
         {
-          "include": "#handlebars_attribute_value"
-        }
-      ]
-    },
-    "extends": {
-      "patterns": [
-        {
-          "end": "(\\}\\})",
-          "begin": "(\\{\\{!<)\\s([-a-zA-Z0-9_\\./]+)",
-          "beginCaptures": {
-            "1": {
-              "name": "support.function.handlebars"
-            },
-            "2": {
-              "name": "support.class.handlebars"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "support.function.handlebars"
-            }
-          },
-          "name": "meta.preprocessor.handlebars"
+          "include": "#handlebars_attribute"
         }
-      ]
-    },
-    "else_token": {
-      "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\./]+))?",
-      "end": "(~?\\}\\}\\}*)",
-      "name": "meta.function.inline.else.handlebars",
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.constant.handlebars"
         },
-        "2": {
-          "name": "support.constant.handlebars keyword.control"
-        },
         "3": {
-          "name": "support.constant.handlebars"
-        },
-        "4": {
           "name": "variable.parameter.handlebars"
         }
       },
@@ -636,20 +674,20 @@
         }
       }
     },
+    "string": {
+      "patterns": [
+        {
+          "include": "#string-single-quoted"
+        },
+        {
+          "include": "#string-double-quoted"
+        }
+      ]
+    },
     "string-double-quoted": {
+      "name": "string.quoted.double.handlebars",
       "begin": "\"",
       "end": "\"",
-      "name": "string.quoted.double.handlebars",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.html"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.html"
-        }
-      },
       "patterns": [
         {
           "include": "#escaped-double-quote"
@@ -672,110 +710,55 @@
         {
           "include": "#partial_and_var"
         }
-      ]
-    },
-    "inline_script": {
-      "begin": "(?:^\\s+)?(<)((?i:script))\\b(?:.*(type)=([\"'](?:text/x-handlebars-template|text/x-handlebars|text/template|x-tmpl-handlebars)[\"']))(?![^>]*/>)",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.html"
-        },
-        "2": {
-          "name": "entity.name.tag.script.html"
-        },
-        "3": {
-          "name": "entity.other.attribute-name.html"
-        },
-        "4": {
-          "name": "string.quoted.double.html"
+        "0": {
+          "name": "punctuation.definition.string.begin.html"
         }
       },
-      "end": "(?<=</(script|SCRIPT))(>)(?:\\s*\\n)?",
       "endCaptures": {
-        "2": {
-          "name": "punctuation.definition.tag.html"
+        "0": {
+          "name": "punctuation.definition.string.end.html"
         }
-      },
-      "name": "source.handlebars.embedded.html",
+      }
+    },
+    "string-single-quoted": {
+      "name": "string.quoted.single.handlebars",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
-          "include": "#tag-stuff"
+          "include": "#escaped-single-quote"
         },
         {
-          "begin": "(?<!</(?:script|SCRIPT))(>)",
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.tag.html"
-            },
-            "2": {
-              "name": "entity.name.tag.script.html"
-            }
-          },
-          "end": "(</)((?i:script))",
-          "patterns": [
-            {
-              "include": "#block_comments"
-            },
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#block_helper"
-            },
-            {
-              "include": "#end_block"
-            },
-            {
-              "include": "#else_token"
-            },
-            {
-              "include": "#partial_and_var"
-            },
-            {
-              "include": "#html_tags"
-            },
-            {
-              "include": "text.html.basic"
-            }
-          ]
-        }
-      ]
-    },
-    "tag_generic_attribute": {
-      "begin": "\\b([a-zA-Z0-9_-]+)\\b\\s*(=)",
-      "captures": {
-        "1": {
-          "name": "entity.other.attribute-name.generic.html"
+          "include": "#block_comments"
         },
-        "2": {
-          "name": "punctuation.separator.key-value.html"
-        }
-      },
-      "patterns": [
         {
-          "include": "#string"
+          "include": "#comments"
+        },
+        {
+          "include": "#block_helper"
+        },
+        {
+          "include": "#else_token"
+        },
+        {
+          "include": "#end_block"
+        },
+        {
+          "include": "#partial_and_var"
         }
       ],
-      "name": "entity.other.attribute-name.html",
-      "end": "(?<='|\"|)"
-    },
-    "tag_id_attribute": {
-      "begin": "\\b(id)\\b\\s*(=)",
-      "captures": {
-        "1": {
-          "name": "entity.other.attribute-name.id.html"
-        },
-        "2": {
-          "name": "punctuation.separator.key-value.html"
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.html"
         }
       },
-      "end": "(?<='|\"|)",
-      "name": "meta.attribute-with-value.id.html",
-      "patterns": [
-        {
-          "include": "#string"
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.html"
         }
-      ]
+      }
     },
     "tag-stuff": {
       "patterns": [
@@ -807,58 +790,56 @@
           "include": "#partial_and_var"
         }
       ]
-    }
-  },
-  "scopeName": "text.html.handlebars",
-  "patterns": [
-    {
-      "include": "#yfm"
-    },
-    {
-      "include": "#extends"
-    },
-    {
-      "include": "#block_comments"
-    },
-    {
-      "include": "#comments"
-    },
-    {
-      "include": "#block_helper"
-    },
-    {
-      "include": "#end_block"
-    },
-    {
-      "include": "#else_token"
-    },
-    {
-      "include": "#partial_and_var"
     },
-    {
-      "include": "#inline_script"
+    "tag_generic_attribute": {
+      "name": "entity.other.attribute-name.html",
+      "begin": "\\b([a-zA-Z0-9_-]+)\\b\\s*(=)",
+      "end": "(?\u003c='|\"|)",
+      "patterns": [
+        {
+          "include": "#string"
+        }
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.generic.html"
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html"
+        }
+      }
     },
-    {
-      "include": "#html_tags"
+    "tag_id_attribute": {
+      "name": "meta.attribute-with-value.id.html",
+      "begin": "\\b(id)\\b\\s*(=)",
+      "end": "(?\u003c='|\"|)",
+      "patterns": [
+        {
+          "include": "#string"
+        }
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.other.attribute-name.id.html"
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.html"
+        }
+      }
     },
-    {
-      "include": "text.html.basic"
+    "yfm": {
+      "patterns": [
+        {
+          "name": "markup.raw.yaml.front-matter",
+          "begin": "(?\u003c!\\s)---\\n$",
+          "end": "^---\\s",
+          "patterns": [
+            {
+              "include": "source.yaml"
+            }
+          ]
+        }
+      ]
     }
-  ],
-  "fileTypes": [
-    "handlebars",
-    "handlebars.html",
-    "hbr",
-    "hbrs",
-    "hbs",
-    "hdbs",
-    "hjs",
-    "mu",
-    "mustache",
-    "rac",
-    "stache",
-    "template",
-    "tmpl"
-  ],
-  "uuid": "70E91676-DE0A-4266-A2B9-3AD2E535E484"
-}
+  }
+}