github-linguist 5.3.3 → 6.0.0

data/grammars/text.junit-test-report.json

@@ -1,9 +1,10 @@
 {
-  "firstLineMatch": "^Testsuite:",
-  "keyEquivalent": "^~J",
   "name": "JUnit Test Report",
+  "scopeName": "text.junit-test-report",
   "patterns": [
     {
+      "name": "meta.testsuite.name.junit-test-report",
+      "match": "(Testsuite:) (.+)$\\n",
       "captures": {
         "1": {
           "name": "meta.testsuite.label.junit-test-report"
@@ -11,11 +12,11 @@
         "2": {
           "name": "entity.name.testsuite.junit-test-report"
         }
-      },
-      "match": "(Testsuite:) (.+)$\\n",
-      "name": "meta.testsuite.name.junit-test-report"
+      }
     },
     {
+      "name": "meta.testcase.name.junit-test-report",
+      "match": "(Testcase:) (.+) took ([\\d\\.]+) sec$\\n",
       "captures": {
         "1": {
           "name": "meta.testcase.label.junit-test-report"
@@ -23,20 +24,19 @@
         "2": {
           "name": "entity.name.testcase.junit-test-report"
         }
-      },
-      "match": "(Testcase:) (.+) took ([\\d\\.]+) sec$\\n",
-      "name": "meta.testcase.name.junit-test-report"
+      }
     },
     {
+      "name": "meta.stackframe.junit-test-report",
       "begin": "at\\s+(?=.+?\\(.+?\\)$)",
       "end": "$\\n",
-      "name": "meta.stackframe.junit-test-report",
       "patterns": [
         {
-          "match": "(?<=\\.)[^\\.]+?(?=\\()",
-          "name": "meta.stackframe.method.junit-test-report"
+          "name": "meta.stackframe.method.junit-test-report",
+          "match": "(?\u003c=\\.)[^\\.]+?(?=\\()"
         },
         {
+          "match": "\\((.+)(:)(.+)\\)$",
           "captures": {
             "1": {
               "name": "meta.stackframe.source.junit-test-report"
@@ -44,49 +44,46 @@
             "3": {
               "name": "meta.stackframe.source.line.junit-test-report"
             }
-          },
-          "match": "\\((.+)(:)(.+)\\)$"
+          }
         }
       ]
     },
     {
+      "name": "meta.section.output.junit-test-report",
       "begin": "------------- Standard Output ---------------$\\n",
       "end": "------------- ---------------- ---------------$\\n",
-      "name": "meta.section.output.junit-test-report",
       "patterns": [
         {
+          "name": "meta.output.junit-test-report",
+          "contentName": "meta.output.content.junit-test-report",
           "begin": "--Output from (.+?)--$\\n",
+          "end": "(?=--Output from|------------- ---------------- ---------------)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.testcase.junit-test-report"
             }
-          },
-          "contentName": "meta.output.content.junit-test-report",
-          "end": "(?=--Output from|------------- ---------------- ---------------)",
-          "name": "meta.output.junit-test-report"
+          }
         }
       ]
     },
     {
-      "begin": "------------- Standard Error -----------------$\\n",
+      "name": "meta.section.error.junit-test-report",
       "contentName": "meta.error.junit-test-report",
+      "begin": "------------- Standard Error -----------------$\\n",
       "end": "------------- ---------------- ---------------$\\n",
-      "name": "meta.section.error.junit-test-report",
       "patterns": [
         {
+          "name": "meta.error.junit-test-report",
+          "contentName": "meta.error.content.junit-test-report",
           "begin": "--Output from (.+?)--$\\n",
+          "end": "(?=--Output from|------------- ---------------- ---------------)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.testcase.junit-test-report"
             }
-          },
-          "contentName": "meta.error.content.junit-test-report",
-          "end": "(?=--Output from|------------- ---------------- ---------------)",
-          "name": "meta.error.junit-test-report"
+          }
         }
       ]
     }
-  ],
-  "scopeName": "text.junit-test-report",
-  "uuid": "6F20804D-4BF2-42A7-BC64-A8CD83B7DE0F"
-}
+  ]
+}

data/grammars/text.log.latex.json

@@ -1,86 +1,84 @@
 {
-  "firstLineMatch": "This is (pdf|pdfe)?TeXk?, Version ",
   "name": "LaTeX Log",
+  "scopeName": "text.log.latex",
   "patterns": [
     {
-      "match": ".*Warning:",
-      "name": "invalid.deprecated"
+      "name": "invalid.deprecated",
+      "match": ".*Warning:"
     },
     {
-      "match": "[^:]*:\\d*:.*",
-      "name": "invalid.deprecated"
+      "name": "invalid.deprecated",
+      "match": "[^:]*:\\d*:.*"
     },
     {
-      "match": ".*Error|^!.*",
-      "name": "invalid.illegal"
+      "name": "invalid.illegal",
+      "match": ".*Error|^!.*"
     },
     {
-      "match": ".*\\.sty",
-      "name": "entity.name.function"
+      "name": "entity.name.function",
+      "match": ".*\\.sty"
     },
     {
-      "match": ".*\\.cls",
-      "name": "entity.name.type.class"
+      "name": "entity.name.type.class",
+      "match": ".*\\.cls"
     },
     {
-      "match": ".*\\.cfg",
-      "name": "entity.name.tag.configuration"
+      "name": "entity.name.tag.configuration",
+      "match": ".*\\.cfg"
     },
     {
-      "match": ".*\\.def",
-      "name": "entity.name.tag.definition"
+      "name": "entity.name.tag.definition",
+      "match": ".*\\.def"
     },
     {
-      "match": ".*Info.*",
-      "name": "comment.block.documentation"
+      "name": "comment.block.documentation",
+      "match": ".*Info.*"
     },
     {
-      "match": ".*FiXme:",
-      "name": "meta.log.latex.fixme"
+      "name": "meta.log.latex.fixme",
+      "match": ".*FiXme:"
     },
     {
+      "name": "meta.log.latex.hyphenation",
       "begin": "(Overfull|Underfull)",
+      "end": "(\\[\\]\\n)",
+      "patterns": [
+        {
+          "name": "variable.parameter.hyphenation.latex2",
+          "match": "[0-9]+\\-\\-[0-9]+"
+        }
+      ],
       "captures": {
         "1": {
           "name": "keyword.control.hyphenation.latex"
         }
-      },
-      "end": "(\\[\\]\\n)",
-      "name": "meta.log.latex.hyphenation",
+      }
+    },
+    {
+      "name": "string.unquoted.other.filename.log.latex",
+      "begin": "(\u003c)",
+      "end": "(\u003e)",
       "patterns": [
         {
-          "match": "[0-9]+\\-\\-[0-9]+",
-          "name": "variable.parameter.hyphenation.latex2"
+          "name": "support.function.with-arg.latex",
+          "match": "(.*/.*\\.pdf)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.filename.latex"
+            }
+          }
         }
-      ]
-    },
-    {
-      "begin": "(<)",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.log.latex"
         }
       },
-      "end": "(>)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.log.latex"
         }
-      },
-      "name": "string.unquoted.other.filename.log.latex",
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "entity.name.function.filename.latex"
-            }
-          },
-          "match": "(.*/.*\\.pdf)",
-          "name": "support.function.with-arg.latex"
-        }
-      ]
+      }
     }
-  ],
-  "scopeName": "text.log.latex",
-  "uuid": "F68ACE95-7DB3-4DFB-AA8A-89988B116B5C"
-}
+  ]
+}

data/grammars/text.marko.json

@@ -1,8 +1,6 @@
 {
-  "fileTypes": [
-    "marko"
-  ],
   "name": "Marko",
+  "scopeName": "text.marko",
   "patterns": [
     {
       "include": "#scriptlet"
@@ -55,8 +53,13 @@
   ],
   "repository": {
     "attr-assignment-concise": {
-      "applyEndPatternLast": 1,
       "begin": "(?:\\s+|[,])(?:(ref)|([a-zA-Z][a-zA-Z]*)|(data-[a-zA-Z-]*)|([_a-zA-Z0-9][a-zA-Z0-9:_.-]*))\\s*([=])\\s*",
+      "end": "(?=([,;]|\\s|$))",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.function.marko-attribute"
@@ -74,19 +77,19 @@
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?=([,;]|\\s|$))",
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "attr-assignment-html": {
-      "applyEndPatternLast": 1,
       "begin": "(?:\\s+|[,])(?:(ref)|([a-zA-Z][a-zA-Z]*)|(data-[a-zA-Z0-9-]*)|([_a-zA-Z0-9][a-zA-Z0-9:_.-]*))\\s*([=])\\s*",
+      "end": "(?=[,;]|\\s|/\u003e|\u003e)",
+      "patterns": [
+        {
+          "include": "#expression-no-gt"
+        }
+      ],
       "beginCaptures": {
         "1": {
-          "name": "support.function.marko-attribute"
+          "name": "entity.other.attribute-name.html"
         },
         "2": {
           "name": "entity.other.attribute-name.html"
@@ -95,40 +98,36 @@
           "name": "entity.other.attribute-name.html"
         },
         "4": {
-          "name": "support.function.marko-attribute"
+          "name": "entity.other.attribute-name.html"
         },
         "5": {
           "name": "punctuation.separator.key-value.html"
         }
       },
-      "end": "(?=[,;]|\\s|/>|>)",
-      "patterns": [
-        {
-          "include": "#expression-no-gt"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "attr-js-block": {
-      "applyEndPatternLast": 1,
       "begin": "\\s\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#js"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.scope.begin.js"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.js"
         }
       },
-      "patterns": [
-        {
-          "include": "#js"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "attr-no-value": {
+      "match": "\\s+(?:([a-zA-Z][a-zA-Z]*)|(data-[a-zA-Z0-9-]*)|([a-zA-Z0-9][a-zA-Z0-9:_.-]+))(?=\\s|/\u003e|\u003e|$)",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.html"
@@ -137,19 +136,12 @@
           "name": "entity.other.attribute-name.html"
         },
         "3": {
-          "name": "support.function.marko-attribute"
+          "name": "entity.other.attribute-name.html"
         }
-      },
-      "match": "\\s+(?:([a-zA-Z][a-zA-Z]*)|(data-[a-zA-Z0-9-]*)|([a-zA-Z0-9][a-zA-Z0-9:_.-]+))(?=\\s|/>|>|$)"
+      }
     },
     "attr-semicolon": {
-      "applyEndPatternLast": 1,
       "begin": "([;])",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.terminator.statement.js"
-        }
-      },
       "end": "(?=\\n)",
       "patterns": [
         {
@@ -158,15 +150,21 @@
         {
           "include": "#comment-block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.terminator.statement.js"
+        }
+      },
+      "applyEndPatternLast": true
     },
     "attr-special": {
+      "match": "\\s+(else)\\b",
       "captures": {
         "1": {
           "name": "support.function.marko-attribute"
         }
-      },
-      "match": "\\s+(else)\\b"
+      }
     },
     "attr-stuff-concise": {
       "patterns": [
@@ -244,8 +242,13 @@
       ]
     },
     "attr-with-arg": {
-      "applyEndPatternLast": 1,
       "begin": "\\s+([_a-zA-Z0-9][a-zA-Z0-9:_.-]+)(\\()",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.function.marko-attribute"
@@ -254,88 +257,82 @@
           "name": "meta.brace.round.js"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "1": {
           "name": "meta.brace.round.js"
         }
       },
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "cdata": {
-      "begin": "<!\\[CDATA\\[",
+      "name": "string.unquoted.cdata.xml",
+      "begin": "\u003c!\\[CDATA\\[",
+      "end": "]]\u003e",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.xml"
         }
       },
-      "end": "]]>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.xml"
         }
-      },
-      "name": "string.unquoted.cdata.xml"
+      }
     },
     "comment-block": {
+      "name": "comment.block.js",
       "begin": "/\\*",
+      "end": "\\*/",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.js"
         }
       },
-      "end": "\\*/",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.js"
         }
-      },
-      "name": "comment.block.js"
+      }
     },
     "comment-concise-block": {
+      "name": "comment.block.js",
       "begin": "^(\\s*)/\\*",
+      "end": "\\*/.*",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.js"
         }
       },
-      "end": "\\*/.*",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.js"
         }
-      },
-      "name": "comment.block.js"
+      }
     },
     "comment-concise-line": {
+      "name": "comment.line.double-slash.marko",
       "begin": "^(\\s*)//",
-      "comment": "Single line comment (concise)",
-      "end": "$",
-      "name": "comment.line.double-slash.marko"
+      "end": "$"
     },
     "comment-html": {
-      "begin": "\\s*<!--",
+      "name": "comment.block.html",
+      "begin": "\\s*\u003c!--",
+      "end": "--\u003e",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.html"
         }
-      },
-      "end": "-->",
-      "name": "comment.block.html"
+      }
     },
     "comment-line": {
+      "name": "comment.line.double-slash.js",
       "begin": "(//)",
+      "end": "(?=\\n)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.js"
         }
-      },
-      "end": "(?=\\n)",
-      "name": "comment.line.double-slash.js"
+      }
     },
     "component-style": {
       "patterns": [
@@ -348,8 +345,13 @@
       ]
     },
     "component-style-css": {
-      "applyEndPatternLast": 1,
       "begin": "^(style)(?:\\.([a-z]+))?\\s+(\\{)",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "source.css"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.marko.css"
@@ -361,21 +363,21 @@
           "name": "punctuation.section.scope.begin.css"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.css"
         }
       },
-      "patterns": [
-        {
-          "include": "source.css"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "component-style-less": {
-      "applyEndPatternLast": 1,
       "begin": "^(style)\\.(less)\\s+(\\{)",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "source.css.less"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.marko.less"
@@ -387,48 +389,42 @@
           "name": "punctuation.section.scope.begin.less"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.less"
         }
       },
-      "patterns": [
-        {
-          "include": "source.css.less"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "doctype": {
-      "begin": "<!",
-      "captures": {
-        "0": {
-          "name": "punctuation.definition.marko-tag.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"
-            }
-          ]
+          }
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.marko-tag.html"
+        }
+      }
     },
     "expression": {
-      "comment": "A JavaScript expression",
       "patterns": [
         {
           "include": "#expression-common"
@@ -439,7 +435,6 @@
       ]
     },
     "expression-common": {
-      "comment": "A JavaScript expression",
       "patterns": [
         {
           "include": "#expression-string-single"
@@ -481,6 +476,7 @@
           "match": "[.]([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\b"
         },
         {
+          "match": "\\b(out)[.](global)\\b",
           "captures": {
             "1": {
               "name": "entity.name.type"
@@ -488,10 +484,10 @@
             "2": {
               "name": "entity.name.type"
             }
-          },
-          "match": "\\b(out)[.](global)\\b"
+          }
         },
         {
+          "match": "\\b(this)[.](input|state)\\b",
           "captures": {
             "1": {
               "name": "variable.language.js"
@@ -499,18 +495,18 @@
             "2": {
               "name": "entity.name.type"
             }
-          },
-          "match": "\\b(this)[.](input|state)\\b"
+          }
         },
         {
-          "match": "\\b(input|state|component|JSON|out)\\b",
-          "name": "entity.name.type"
+          "name": "entity.name.type",
+          "match": "\\b(input|state|component|JSON|out)\\b"
         },
         {
-          "match": "\\b(let|var|const)\\b",
-          "name": "storage.type.var.js"
+          "name": "storage.type.var.js",
+          "match": "\\b(let|var|const)\\b"
         },
         {
+          "match": "\\b(require)[.](resolve)\\b",
           "captures": {
             "1": {
               "name": "entity.name.type"
@@ -518,16 +514,15 @@
             "2": {
               "name": "entity.name.type"
             }
-          },
-          "match": "\\b(require)[.](resolve)\\b"
+          }
         },
         {
-          "match": "\\b(console|JSON|event|window|setTimeout|setInterval|require)\\b",
-          "name": "entity.name.type"
+          "name": "entity.name.type",
+          "match": "\\b(console|JSON|event|window|setTimeout|setInterval|require)\\b"
         },
         {
-          "match": "\\b(this|arguments)\\b",
-          "name": "variable.language.js"
+          "name": "variable.language.js",
+          "match": "\\b(this|arguments)\\b"
         },
         {
           "include": "#expression-special-class"
@@ -535,6 +530,7 @@
       ]
     },
     "expression-constant": {
+      "match": "(true)|(false)|(Infinity)|(NaN)|(null)|(undefined)",
       "captures": {
         "1": {
           "name": "constant.language.boolean.true.js"
@@ -554,75 +550,73 @@
         "6": {
           "name": "constant.language.undefined.js"
         }
-      },
-      "match": "(true)|(false)|(Infinity)|(NaN)|(null)|(undefined)"
+      }
     },
     "expression-group-braces": {
-      "applyEndPatternLast": 1,
       "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.scope.begin.js"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.scope.end.js"
         }
       },
+      "applyEndPatternLast": true
+    },
+    "expression-group-brackets": {
+      "begin": "\\[",
+      "end": "\\]",
       "patterns": [
         {
           "include": "#expression"
         }
-      ]
-    },
-    "expression-group-brackets": {
-      "applyEndPatternLast": 1,
-      "begin": "\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "meta.brace.square.js"
         }
       },
-      "end": "\\]",
       "endCaptures": {
         "0": {
           "name": "meta.brace.square.js"
         }
       },
+      "applyEndPatternLast": true
+    },
+    "expression-group-parens": {
+      "begin": "\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "#expression"
         }
-      ]
-    },
-    "expression-group-parens": {
-      "applyEndPatternLast": 1,
-      "begin": "\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "meta.brace.round.js"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "meta.brace.round.js"
         }
       },
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "expression-hex": {
-      "match": "\\b0[xX][0-9A-Fa-f]+\\b",
-      "name": "constant.numeric.hex.js"
+      "name": "constant.numeric.hex.js",
+      "match": "\\b0[xX][0-9A-Fa-f]+\\b"
     },
     "expression-no-gt": {
-      "comment": "A JavaScript expression",
       "patterns": [
         {
           "include": "#expression-common"
@@ -630,83 +624,73 @@
       ]
     },
     "expression-numeric": {
-      "match": "(?x)\n\t\t\t\t(?<!\\w)\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t(?>\n\t\t\t\t\t(\n\t\t\t\t\t\t(0|[1-9][0-9]*)(\\.[0-9]*)?\t\t# 0 or 1 or 1. or 1.0\n\t\t\t\t\t  | \\.[0-9]+\t\t\t\t\t\t# .1\n\t\t\t\t\t)\n\t\t\t\t\t([eE][+-]?[0-9]+)?\t\t\t\t\t# Exponent\n\t\t\t\t)\n\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t",
-      "name": "constant.numeric.js"
+      "name": "constant.numeric.js",
+      "match": "(?x)\n\t\t\t\t(?\u003c!\\w)\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t\t(?\u003e\n\t\t\t\t\t(\n\t\t\t\t\t\t(0|[1-9][0-9]*)(\\.[0-9]*)?\t\t# 0 or 1 or 1. or 1.0\n\t\t\t\t\t  | \\.[0-9]+\t\t\t\t\t\t# .1\n\t\t\t\t\t)\n\t\t\t\t\t([eE][+-]?[0-9]+)?\t\t\t\t\t# Exponent\n\t\t\t\t)\n\t\t\t\t(?!\\w)\t\t\t\t\t\t\t\t\t# Ensure word boundry\n\t\t\t"
     },
     "expression-operator-binary": {
+      "match": "(\\s+|\\b)(===|==|!==|!=|\u003c=|\u003c\u003c|\u0026\u0026|\\|\\||\u003c|\\+=|-=|\\*=|/=|%=|[=+*/%|\u0026~^:])(\\s+|\\b)",
       "captures": {
         "2": {
           "name": "keyword.operator.js"
         }
-      },
-      "match": "(\\s+|\\b)(===|==|!==|!=|<=|<<|&&|\\|\\||<|\\+=|-=|\\*=|/=|%=|[=+*/%|&~^:])(\\s+|\\b)"
+      }
     },
     "expression-operator-gt": {
+      "match": "(\\s+|\\b)(\u003e=|\u003e\u003e|\u003e)(\\s+|\\b)",
       "captures": {
         "2": {
           "name": "keyword.operator.js"
         }
-      },
-      "match": "(\\s+|\\b)(>=|>>|>)(\\s+|\\b)"
+      }
     },
     "expression-operator-special": {
-      "match": "(?<!\\.|\\$)\\b(delete|in|instanceof|new|typeof\\s*|void|with|from|to|step)\\b(?!\\$)",
-      "name": "keyword"
+      "name": "keyword",
+      "match": "(?\u003c!\\.|\\$)\\b(delete|in|instanceof|new|typeof\\s*|void|with|from|to|step)\\b(?!\\$)"
     },
     "expression-operator-unary": {
-      "match": "\\b(!|\\+\\+)\\b|\\b\\-\\-(?<!\\s)",
-      "name": "keyword.operator.js"
+      "name": "keyword.operator.js",
+      "match": "\\b(!|\\+\\+)\\b|\\b\\-\\-(?\u003c!\\s)"
     },
     "expression-special-class": {
-      "match": "(?<!\\.|\\$)\\b(Array|Boolean|Date|Error|EvalError|Function|Number|Object|RangeError|ReferenceError|RegExp|String|SyntaxError|TypeError|URIError)\\b(?!\\$)",
-      "name": "support.class.js"
+      "name": "support.class.js",
+      "match": "(?\u003c!\\.|\\$)\\b(Array|Boolean|Date|Error|EvalError|Function|Number|Object|RangeError|ReferenceError|RegExp|String|SyntaxError|TypeError|URIError)\\b(?!\\$)"
     },
     "expression-string-double": {
+      "name": "string.quoted.double.js",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.js",
+          "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)"
+        },
+        {
+          "include": "#placeholder-patterns"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.js"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.js"
         }
-      },
-      "name": "string.quoted.double.js",
-      "patterns": [
-        {
-          "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)",
-          "name": "constant.character.escape.js"
-        },
-        {
-          "include": "#placeholder-patterns"
-        }
-      ]
+      }
     },
     "expression-string-escapes": {
       "patterns": [
         {
-          "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)",
-          "name": "constant.character.escape.js"
+          "name": "constant.character.escape.js",
+          "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)"
         }
       ]
     },
     "expression-string-single": {
+      "name": "string.quoted.single.js",
       "begin": "'",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.js"
-        }
-      },
       "end": "'",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.js"
-        }
-      },
-      "name": "string.quoted.single.js",
       "patterns": [
         {
           "include": "#expression-string-escapes"
@@ -714,35 +698,41 @@
         {
           "include": "#placeholder-patterns"
         }
-      ]
-    },
-    "expression-string-template": {
-      "begin": "`",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.js"
         }
       },
-      "end": "`",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.js"
         }
-      },
+      }
+    },
+    "expression-string-template": {
       "name": "string.quoted.other.template.js",
+      "begin": "`",
+      "end": "`",
       "patterns": [
         {
           "include": "#expression-string-escapes"
         },
         {
+          "name": "meta.embedded.line.js",
+          "contentName": "source.js",
           "begin": "\\$\\{",
+          "end": "(\\})",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.js"
             }
           },
-          "contentName": "source.js",
-          "end": "(\\})",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.js"
@@ -750,20 +740,24 @@
             "1": {
               "name": "source.js"
             }
-          },
-          "name": "meta.embedded.line.js",
-          "patterns": [
-            {
-              "include": "#expression"
-            }
-          ]
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.js"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.js"
+        }
+      }
     },
     "expression-ternary-if": {
+      "name": "meta.ternary-if.js",
       "begin": "\\?",
       "end": ":",
-      "name": "meta.ternary-if.js",
       "patterns": [
         {
           "include": "$self"
@@ -771,14 +765,9 @@
       ]
     },
     "html-block-concise": {
+      "name": "meta.section.marko-html-block",
       "begin": "(\\s*)(-[-]+)\\n",
-      "captures": {
-        "2": {
-          "name": "keyword.operator.marko"
-        }
-      },
       "end": "^(\\1\\2|(?!(\\1)))",
-      "name": "meta.section.marko-html-block",
       "patterns": [
         {
           "include": "#cdata"
@@ -798,16 +787,15 @@
         {
           "include": "#placeholder-patterns"
         }
-      ]
+      ],
+      "captures": {
+        "2": {
+          "name": "keyword.operator.marko"
+        }
+      }
     },
     "html-line-block-concise": {
-      "applyEndPatternLast": 1,
       "begin": "\\s*([-][-]+)\\n",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.marko.blah"
-        }
-      },
       "end": "(?!\\2)|(\\2\\1)",
       "patterns": [
         {
@@ -822,15 +810,16 @@
         {
           "include": "#placeholder-patterns"
         }
-      ]
-    },
-    "html-line-concise": {
-      "begin": "\\s*([-][-]+)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.operator.marko"
+          "name": "keyword.operator.marko.blah"
         }
       },
+      "applyEndPatternLast": true
+    },
+    "html-line-concise": {
+      "begin": "\\s*([-][-]+)",
       "end": "(?=\\n)",
       "patterns": [
         {
@@ -845,7 +834,12 @@
         {
           "include": "#placeholder-patterns"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.marko"
+        }
+      }
     },
     "js": {
       "patterns": [
@@ -856,64 +850,64 @@
           "include": "#comment-block"
         },
         {
-          "applyEndPatternLast": 1,
           "begin": "\\{",
+          "end": "\\}",
+          "patterns": [
+            {
+              "include": "#js"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.scope.begin.js"
             }
           },
-          "end": "\\}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.scope.end.js"
             }
           },
+          "applyEndPatternLast": true
+        },
+        {
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#js"
             }
-          ]
-        },
-        {
-          "applyEndPatternLast": 1,
-          "begin": "\\(",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.scope.begin.js"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.scope.end.js"
             }
           },
+          "applyEndPatternLast": true
+        },
+        {
+          "begin": "\\[",
+          "end": "\\]",
           "patterns": [
             {
               "include": "#js"
             }
-          ]
-        },
-        {
-          "applyEndPatternLast": 1,
-          "begin": "\\[",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.scope.begin.js"
             }
           },
-          "end": "\\]",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.scope.end.js"
             }
           },
-          "patterns": [
-            {
-              "include": "#js"
-            }
-          ]
+          "applyEndPatternLast": true
         },
         {
           "match": "[.]([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\b"
@@ -922,31 +916,33 @@
           "include": "#expression"
         },
         {
-          "match": "\\b(break|case|catch|continue|default|do|else|export|finally|for|if|return|switch|throw|try|while|with|import|from|await|async)\\b",
-          "name": "keyword.control.js"
+          "name": "keyword.control.js",
+          "match": "\\b(break|case|catch|continue|default|do|else|export|finally|for|if|return|switch|throw|try|while|with|import|from|await|async)\\b"
         },
         {
-          "match": "(\\s+|\\b)(\\=\\>)(\\s+|\\b)",
-          "name": "storage.type.function.arrow.js"
+          "name": "storage.type.function.arrow.js",
+          "match": "(\\s+|\\b)(\\=\\\u003e)(\\s+|\\b)"
         },
         {
-          "match": "\\;",
-          "name": "punctuation.terminator.statement.js"
+          "name": "punctuation.terminator.statement.js",
+          "match": "\\;"
         },
         {
-          "match": "\\b(function)\\b",
-          "name": "storage.type.function.js"
+          "name": "storage.type.function.js",
+          "match": "\\b(function)\\b"
         },
         {
-          "match": "\\b(class)\\b",
-          "name": "entity.name.type.class.js"
+          "name": "entity.name.type.class.js",
+          "match": "\\b(class)\\b"
         },
         {
-          "match": "\\bextends\\b",
-          "name": "entity.other.inherited-class.js"
+          "name": "entity.other.inherited-class.js",
+          "match": "\\bextends\\b"
         },
         {
+          "name": "meta.method.js",
           "begin": "([\\p{L}\\p{Nl}$_][\\p{L}\\p{Nl}$\\p{Mn}\\p{Mc}\\p{Nd}\\p{Pc}\\x{200C}\\x{200D}]*)\\s*(\\()(?=(?:[^\\(\\)]*)?\\)\\s*\\{)",
+          "end": "\\)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.js"
@@ -955,41 +951,33 @@
               "name": "punctuation.definition.parameters.begin.js"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.parameters.END.js"
             }
-          },
-          "name": "meta.method.js"
+          }
         }
       ]
     },
     "js-code-block": {
-      "applyEndPatternLast": 1,
-      "begin": "^\\s*([$])\\s",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.embedded.js"
-        }
-      },
       "contentName": "source.js.embedded",
+      "begin": "^\\s*([$])\\s",
       "end": "(?=\\n)",
       "patterns": [
         {
           "include": "#js"
         }
-      ]
-    },
-    "open-tag-end": {
-      "begin": "(>)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "punctuation.definition.tag.end.open.html"
+          "name": "storage.modifier.embedded.js"
         }
       },
-      "comment": "Concise style tag with CSS code.",
-      "end": "(?=</)",
+      "applyEndPatternLast": true
+    },
+    "open-tag-end": {
+      "begin": "(\u003e)",
+      "end": "(?=\u003c/)",
       "patterns": [
         {
           "include": "#cdata"
@@ -1009,17 +997,16 @@
         {
           "include": "#placeholder-patterns"
         }
-      ]
-    },
-    "open-tag-end-script": {
-      "begin": "(>)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.open.html"
         }
-      },
-      "comment": "Concise style tag with CSS code.",
-      "end": "(?=</)",
+      }
+    },
+    "open-tag-end-script": {
+      "begin": "(\u003e)",
+      "end": "(?=\u003c/)",
       "patterns": [
         {
           "include": "#placeholder-patterns"
@@ -1027,17 +1014,16 @@
         {
           "include": "#js"
         }
-      ]
-    },
-    "open-tag-end-style": {
-      "begin": "(>)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.open.html"
         }
-      },
-      "comment": "Concise style tag with CSS code.",
-      "end": "(?=</)",
+      }
+    },
+    "open-tag-end-style": {
+      "begin": "(\u003e)",
+      "end": "(?=\u003c/)",
       "patterns": [
         {
           "include": "#placeholder-patterns"
@@ -1045,31 +1031,33 @@
         {
           "include": "source.css"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag.end.open.html"
+        }
+      }
     },
     "placeholder": {
-      "applyEndPatternLast": 1,
+      "name": "meta.section.marko-placeholder",
       "begin": "[$][!]?\\{",
-      "captures": {
-        "0": {
-          "name": "keyword.operator.marko"
-        }
-      },
-      "comment": "${ } placeholder note: should be punctuation.section.embedded.js",
       "end": "\\}",
-      "name": "meta.section.marko-placeholder",
       "patterns": [
         {
           "include": "#expression"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "keyword.operator.marko"
+        }
+      },
+      "applyEndPatternLast": true
     },
     "placeholder-escaped": {
-      "comment": "\\${",
       "match": "\\\\[$][!]?[{]"
     },
     "placeholder-escaped-escaped": {
-      "comment": "\\\\${",
       "match": "\\\\\\\\(?=[$][!]?[{])"
     },
     "placeholder-patterns": {
@@ -1086,24 +1074,29 @@
       ]
     },
     "scriptlet": {
-      "applyEndPatternLast": 1,
-      "begin": "<%",
+      "begin": "\u003c%",
+      "end": "%\u003e",
+      "patterns": [
+        {
+          "include": "#js"
+        }
+      ],
       "captures": {
         "0": {
           "name": "keyword.operator.scriptlet.marko"
         }
       },
-      "comment": "Scriptlet block",
-      "end": "%>",
+      "applyEndPatternLast": true
+    },
+    "special-js-tags": {
+      "contentName": "source.js.embedded",
+      "begin": "^\\s*(?:(class)|(static)|(import))\\s",
+      "end": "(?=\\n)",
       "patterns": [
         {
           "include": "#js"
         }
-      ]
-    },
-    "special-js-tags": {
-      "applyEndPatternLast": 1,
-      "begin": "^\\s*(?:(class)|(static)|(import))\\s",
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.js"
@@ -1115,13 +1108,7 @@
           "name": "storage.modifier.marko"
         }
       },
-      "contentName": "source.js.embedded",
-      "end": "(?=\\n)",
-      "patterns": [
-        {
-          "include": "#js"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "tag-concise": {
       "patterns": [
@@ -1134,7 +1121,6 @@
       ]
     },
     "tag-html": {
-      "comment": "HTML tag within the non-concise syntax",
       "patterns": [
         {
           "include": "#tag-name-open-tag-only-html"
@@ -1160,8 +1146,19 @@
       ]
     },
     "tag-name-concise": {
-      "applyEndPatternLast": 1,
       "begin": "^\\s*(([a-zA-Z0-9_-]+)([.#][a-zA-Z0-9_.#-]*)?)(?=(\\s+(?![=])|$|\\())",
+      "end": "(?=\\n)",
+      "patterns": [
+        {
+          "include": "#html-line-block-concise"
+        },
+        {
+          "include": "#html-line-concise"
+        },
+        {
+          "include": "#attr-stuff-concise"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "entity.name.tag.concise"
@@ -1170,41 +1167,37 @@
           "name": "entity.other.attribute-name.shorthand"
         }
       },
-      "comment": "A concise tag name",
+      "applyEndPatternLast": true
+    },
+    "tag-name-custom-concise": {
+      "begin": "^\\s*(for|if|unless|else-if|else|var|assign|macro|invoke|include|app|await|[a-zA-Z0-9_]+([:-])[a-zA-Z0-9_:-]*|[@][a-zA-Z0-9_-]+)(?=(\\s+(?![=])|$|[(]))",
       "end": "(?=\\n)",
       "patterns": [
-        {
-          "include": "#html-line-block-concise"
-        },
         {
           "include": "#html-line-concise"
         },
         {
           "include": "#attr-stuff-concise"
         }
-      ]
-    },
-    "tag-name-custom-concise": {
-      "applyEndPatternLast": 1,
-      "begin": "^\\s*(for|if|unless|else-if|else|var|assign|macro|invoke|include|app|await|[a-zA-Z0-9_]+([:-])[a-zA-Z0-9_:-]*|[@][a-zA-Z0-9_-]+)(?=(\\s+(?![=])|$|[(]))",
+      ],
       "beginCaptures": {
         "1": {
           "name": "support.function.marko-tag.concise"
         }
       },
-      "comment": "A concise custom tag name",
-      "end": "(?=\\n)",
+      "applyEndPatternLast": true
+    },
+    "tag-name-custom-html": {
+      "begin": "(\u003c)(for|if|unless|else-if|else|var|assign|macro|invoke|include|app|await|[a-zA-Z0-9_]+[-:][a-zA-Z0-9\\-_:]*|[@][a-zA-Z0-9_-]+)(?=(\u003e|/\u003e|\\s|\\())",
+      "end": "(\u003c/)(\\2)?(\u003e)|(/\u003e)",
       "patterns": [
         {
-          "include": "#html-line-concise"
+          "include": "#attr-stuff-html"
         },
         {
-          "include": "#attr-stuff-concise"
+          "include": "#open-tag-end"
         }
-      ]
-    },
-    "tag-name-custom-html": {
-      "begin": "(<)(for|if|unless|else-if|else|var|assign|macro|invoke|include|app|await|[a-zA-Z0-9_]+[-:][a-zA-Z0-9\\-_:]*|[@][a-zA-Z0-9_-]+)(?=(>|/>|\\s|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1213,8 +1206,6 @@
           "name": "support.function.marko-tag.open.html"
         }
       },
-      "comment": "The beginning of a custom/special HTML tag",
-      "end": "(</)(\\2)?(>)|(/>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.close.html"
@@ -1228,7 +1219,11 @@
         "4": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
+      }
+    },
+    "tag-name-html": {
+      "begin": "(\u003c)([a-zA-Z0-9]+)(?=(\u003e|/\u003e|\\s|\\())",
+      "end": "(\u003c/)(\\2)?(\u003e)|(/\u003e)",
       "patterns": [
         {
           "include": "#attr-stuff-html"
@@ -1236,10 +1231,7 @@
         {
           "include": "#open-tag-end"
         }
-      ]
-    },
-    "tag-name-html": {
-      "begin": "(<)([a-zA-Z0-9]+)(?=(>|/>|\\s|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1248,8 +1240,6 @@
           "name": "entity.name.tag.open.html"
         }
       },
-      "comment": "The beginning of a regular HTML tag in non-concise mode",
-      "end": "(</)(\\2)?(>)|(/>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.close.html"
@@ -1263,18 +1253,16 @@
         "4": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
+      }
+    },
+    "tag-name-open-tag-only-html": {
+      "begin": "(\u003c)(base|br|col|hr|embed|img|input|keygen|link|meta|param|source|track|wbr|lasso-img)(?=(\u003e|/\u003e|\\s|\\())",
+      "end": "(\u003e|/\u003e)",
       "patterns": [
         {
           "include": "#attr-stuff-html"
-        },
-        {
-          "include": "#open-tag-end"
         }
-      ]
-    },
-    "tag-name-open-tag-only-html": {
-      "begin": "(<)(base|br|col|hr|embed|img|input|keygen|link|meta|param|source|track|wbr|lasso-img)(?=(>|/>|\\s|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1283,21 +1271,23 @@
           "name": "entity.name.tag.open.html"
         }
       },
-      "comment": "HTML tags that are open tag only",
-      "end": "(>|/>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
+      }
+    },
+    "tag-name-script-html": {
+      "begin": "(\u003c)(script)(?=(\u003e|/\u003e|\\s|\\())",
+      "end": "(\u003c/)(script)?(\u003e)|/\u003e",
       "patterns": [
         {
           "include": "#attr-stuff-html"
+        },
+        {
+          "include": "#open-tag-end-script"
         }
-      ]
-    },
-    "tag-name-script-html": {
-      "begin": "(<)(script)(?=(>|/>|\\s|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1306,8 +1296,6 @@
           "name": "entity.name.tag.script.open.html"
         }
       },
-      "comment": "HTML style tag",
-      "end": "(</)(script)?(>)|/>",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.close.html"
@@ -1321,18 +1309,19 @@
         "4": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
+      }
+    },
+    "tag-name-shorthand-html": {
+      "begin": "(\u003c)(([a-zA-Z0-9_-]+)([#.][a-zA-Z0-9_#.:-]+))(?=(\u003e|/\u003e|\\s+(?![=])|\\())",
+      "end": "(\u003c/)((\\3)(\\4)?)?(\u003e)|(/\u003e)",
       "patterns": [
         {
           "include": "#attr-stuff-html"
         },
         {
-          "include": "#open-tag-end-script"
+          "include": "#open-tag-end"
         }
-      ]
-    },
-    "tag-name-shorthand-html": {
-      "begin": "(<)(([a-zA-Z0-9_-]+)([#.][a-zA-Z0-9_#.:-]+))(?=(>|/>|\\s+(?![=])|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1344,8 +1333,6 @@
           "name": "entity.other.attribute-name.shorthand"
         }
       },
-      "comment": "HTML tag with shorthand ID/class parts",
-      "end": "(</)((\\3)(\\4)?)?(>)|(/>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.close.html"
@@ -1362,7 +1349,11 @@
         "6": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
+      }
+    },
+    "tag-name-shorthand-no-tag-name-html": {
+      "begin": "(\u003c)([#.][a-zA-Z0-9_#.:-]+)(?=(\u003e|/\u003e|\\s|\\())",
+      "end": "(\u003c/)(\\2|div)(\u003e)|(/\u003e)",
       "patterns": [
         {
           "include": "#attr-stuff-html"
@@ -1370,10 +1361,7 @@
         {
           "include": "#open-tag-end"
         }
-      ]
-    },
-    "tag-name-shorthand-no-tag-name-html": {
-      "begin": "(<)([#.][a-zA-Z0-9_#.:-]+)(?=(>|/>|\\s|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1382,8 +1370,6 @@
           "name": "entity.other.attribute-name.shorthand"
         }
       },
-      "comment": "HTML style tag",
-      "end": "(</)(\\2|div)(>)|(/>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.close.html"
@@ -1397,18 +1383,19 @@
         "4": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
+      }
+    },
+    "tag-name-style-html": {
+      "begin": "(\u003c)(style)(?=(\u003e|/\u003e|\\s|\\())",
+      "end": "(\u003c/)(style)?(\u003e)|(/\u003e)",
       "patterns": [
         {
           "include": "#attr-stuff-html"
         },
         {
-          "include": "#open-tag-end"
+          "include": "#open-tag-end-style"
         }
-      ]
-    },
-    "tag-name-style-html": {
-      "begin": "(<)(style)(?=(>|/>|\\s|\\())",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.open.html"
@@ -1417,8 +1404,6 @@
           "name": "entity.name.tag.style.open.html"
         }
       },
-      "comment": "HTML style tag",
-      "end": "(</)(style)?(>)|(/>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.close.html"
@@ -1432,19 +1417,10 @@
         "4": {
           "name": "punctuation.definition.tag.end.self-close.html"
         }
-      },
-      "patterns": [
-        {
-          "include": "#attr-stuff-html"
-        },
-        {
-          "include": "#open-tag-end-style"
-        }
-      ]
+      }
     },
     "tag-script-body-block": {
       "begin": "(\\s*-[-]+)",
-      "comment": "HTML script tag with nested JavaScript code",
       "end": "(\\1)[.]*$",
       "patterns": [
         {
@@ -1454,7 +1430,6 @@
     },
     "tag-script-body-line": {
       "begin": "\\s+-[-]+\\s",
-      "comment": "HTML script tag with nested JavaScript code",
       "end": "(?=\\n)",
       "patterns": [
         {
@@ -1463,14 +1438,7 @@
       ]
     },
     "tag-script-concise": {
-      "applyEndPatternLast": 1,
       "begin": "^(\\s*)(script)(?=(\\s|$|\\())",
-      "beginCaptures": {
-        "2": {
-          "name": "entity.name.tag.script.marko.concise"
-        }
-      },
-      "comment": "HTML script tag with nested JavaScript code",
       "end": "^(?!(\\1\\s)|\\s*$)",
       "patterns": [
         {
@@ -1482,11 +1450,16 @@
         {
           "include": "#tag-script-body-block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "entity.name.tag.script.marko.concise"
+        }
+      },
+      "applyEndPatternLast": true
     },
     "tag-style-body-block": {
       "begin": "(\\s*[-][-]+)",
-      "comment": "HTML script tag with nested CSS code",
       "end": "(\\1)[.]*$",
       "patterns": [
         {
@@ -1496,7 +1469,6 @@
     },
     "tag-style-body-line": {
       "begin": "\\s[-][-]+\\s",
-      "comment": "HTML style tag with nested CSS code",
       "end": "(?=\\n)",
       "patterns": [
         {
@@ -1505,16 +1477,9 @@
       ]
     },
     "tag-style-concise": {
-      "applyEndPatternLast": 1,
+      "name": "meta.tag.other.style",
       "begin": "^(\\s*)(style)(?=(\\s|$|\\())",
-      "beginCaptures": {
-        "2": {
-          "name": "entity.name.tag.style.marko.concise"
-        }
-      },
-      "comment": "style tag with CSS code.",
       "end": "^(?!(\\1\\s)|\\s*$)",
-      "name": "meta.tag.other.style",
       "patterns": [
         {
           "include": "#attr-stuff-concise"
@@ -1525,9 +1490,13 @@
         {
           "include": "#tag-style-body-block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "entity.name.tag.style.marko.concise"
+        }
+      },
+      "applyEndPatternLast": true
     }
-  },
-  "scopeName": "text.marko",
-  "uuid": "BC8F1816-9AB4-4571-97E8-787F6C925E07"
-}
+  }
+}