tm-grammars 1.22.19 → 1.23.0

package/grammars/wikitext.json

@@ -60,7 +60,7 @@
       ],
       "repository": {
         "argument": {
-          "begin": "({{{)",
+          "begin": "(\\{\\{\\{)",
           "end": "(}}})",
           "name": "variable.parameter.wikitext",
           "patterns": [
@@ -73,7 +73,7 @@
                   "name": "keyword.operator.wikitext"
                 }
               },
-              "match": "(?:^|\\G)([^#:\\|\\[\\]\\{\\}\\|]*)(\\|)"
+              "match": "(?:^|\\G)([^#:|\\[\\]{}]*)(\\|)"
             },
             {
               "include": "$self"
@@ -97,7 +97,7 @@
               "name": "keyword.operator.wikitext"
             }
           },
-          "end": "(\\}-)",
+          "end": "(}-)",
           "patterns": [
             {
               "include": "$self"
@@ -122,12 +122,12 @@
                   "name": "punctuation.terminator.rule.wikitext"
                 }
               },
-              "match": "(?:([a-zA-Z\\-]*)(:))?(.*?)(?:(;)|(?=\\}-))"
+              "match": "(?:([a-zA-Z\\-]*)(:))?(.*?)(?:(;)|(?=}-))"
             }
           ]
         },
         "extension-comments": {
-          "begin": "(<%--)\\s*(\\[)([A-Z_]*)(\\])",
+          "begin": "(<%--)\\s*(\\[)([A-Z_]*)(])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.extension.wikitext"
@@ -142,7 +142,7 @@
               "name": "punctuation.definition.tag.extension.wikitext"
             }
           },
-          "end": "(\\[)([A-Z_]*)(\\])\\s*(--%>)",
+          "end": "(\\[)([A-Z_]*)(])\\s*(--%>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.extension.wikitext"
@@ -206,7 +206,7 @@
                   "name": "punctuation.definition.tag.link.external.wikitext"
                 }
               },
-              "match": "(\\[)((?:(?:(?:http(?:s)?)|(?:ftp(?:s)?)):\\/\\/)[\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\.~:\\/?#%@!\\$&'\\(\\)\\*\\+,;=.]+)\\s*?([^\\]]*)(\\])",
+              "match": "(\\[)((?:https?|ftps?)://[\\w.\\-]+(?:\\.[\\w.\\-]+)+[\\w\\-.~:/?#%@!$\\&'()*+,;=]+)\\s*?([^\\]]*)(])",
               "name": "meta.link.external.wikitext"
             },
             {
@@ -229,7 +229,7 @@
                   "name": "punctuation.definition.tag.link.external.wikitext"
                 }
               },
-              "match": "(\\[)([\\w.-]+(?:\\.[\\w\\.-]+)+[\\w\\-\\.~:\\/?#%@!\\$&'\\(\\)\\*\\+,;=.]+)\\s*?([^\\]]*)(\\])",
+              "match": "(\\[)([\\w.\\-]+(?:\\.[\\w.\\-]+)+[\\w\\-.~:/?#%@!$\\&'()*+,;=]+)\\s*?([^\\]]*)(])",
               "name": "invalid.illegal.bad-link.wikitext"
             }
           ]
@@ -288,7 +288,7 @@
         },
         "internal-link": {
           "TODO": "SINGLE LINE",
-          "begin": "(\\[\\[)(([^#:\\|\\[\\]\\{\\}]*:)*)?([^\\|\\[\\]]*)?",
+          "begin": "(\\[\\[)(([^#:|\\[\\]{}]*:)*)?([^|\\[\\]]*)?",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.link.internal.wikitext"
@@ -300,7 +300,7 @@
               "name": "entity.other.attribute-name.wikitext"
             }
           },
-          "end": "(\\]\\])",
+          "end": "(]])",
           "name": "string.quoted.internal-link.wikitext",
           "patterns": [
             {
@@ -315,7 +315,7 @@
                   "name": "entity.other.attribute-name.localname.wikitext"
                 }
               },
-              "match": "(\\|)|(?:\\s*)(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*(=)"
+              "match": "(\\|)|\\s*(?:([\\-\\w.]+)((:)))?([\\-\\w.:]+)\\s*(=)"
             }
           ]
         },
@@ -356,11 +356,11 @@
             "variables": {
               "patterns": [
                 {
-                  "match": "(?i)(\\{\\{)(CURRENTYEAR|CURRENTMONTH|CURRENTMONTH1|CURRENTMONTHNAME|CURRENTMONTHNAMEGEN|CURRENTMONTHABBREV|CURRENTDAY|CURRENTDAY2|CURRENTDOW|CURRENTDAYNAME|CURRENTTIME|CURRENTHOUR|CURRENTWEEK|CURRENTTIMESTAMP|LOCALYEAR|LOCALMONTH|LOCALMONTH1|LOCALMONTHNAME|LOCALMONTHNAMEGEN|LOCALMONTHABBREV|LOCALDAY|LOCALDAY2|LOCALDOW|LOCALDAYNAME|LOCALTIME|LOCALHOUR|LOCALWEEK|LOCALTIMESTAMP)(\\}\\})",
+                  "match": "(?i)(\\{\\{)(CURRENTYEAR|CURRENTMONTH|CURRENTMONTH1|CURRENTMONTHNAME|CURRENTMONTHNAMEGEN|CURRENTMONTHABBREV|CURRENTDAY|CURRENTDAY2|CURRENTDOW|CURRENTDAYNAME|CURRENTTIME|CURRENTHOUR|CURRENTWEEK|CURRENTTIMESTAMP|LOCALYEAR|LOCALMONTH|LOCALMONTH1|LOCALMONTHNAME|LOCALMONTHNAMEGEN|LOCALMONTHABBREV|LOCALDAY|LOCALDAY2|LOCALDOW|LOCALDAYNAME|LOCALTIME|LOCALHOUR|LOCALWEEK|LOCALTIMESTAMP)(}})",
                   "name": "constant.language.variables.time.wikitext"
                 },
                 {
-                  "match": "(?i)(\\{\\{)(SITENAME|SERVER|SERVERNAME|DIRMARK|DIRECTIONMARK|SCRIPTPATH|STYLEPATH|CURRENTVERSION|CONTENTLANGUAGE|CONTENTLANG|PAGEID|PAGELANGUAGE|CASCADINGSOURCES|REVISIONID|REVISIONDAY|REVISIONDAY2|REVISIONMONTH|REVISIONMONTH1|REVISIONYEAR|REVISIONTIMESTAMP|REVISIONUSER|REVISIONSIZE)(\\}\\})",
+                  "match": "(?i)(\\{\\{)(SITENAME|SERVER|SERVERNAME|DIRMARK|DIRECTIONMARK|SCRIPTPATH|STYLEPATH|CURRENTVERSION|CONTENTLANGUAGE|CONTENTLANG|PAGEID|PAGELANGUAGE|CASCADINGSOURCES|REVISIONID|REVISIONDAY|REVISIONDAY2|REVISIONMONTH|REVISIONMONTH1|REVISIONYEAR|REVISIONTIMESTAMP|REVISIONUSER|REVISIONSIZE)(}})",
                   "name": "constant.language.variables.metadata.wikitext"
                 },
                 {
@@ -403,7 +403,7 @@
                   "name": "punctuation.definition.tag.link.internal.end.wikitext"
                 }
               },
-              "match": "(?i)(^\\s*?#REDIRECT)\\s*(\\[\\[)(([^#:\\|\\[\\]\\{\\}]*?:)*)?([^\\|\\[\\]]*)?(\\|[^\\[\\]]*?)?(\\]\\])"
+              "match": "(?i)(^\\s*?#REDIRECT)\\s*(\\[\\[)(([^#:|\\[\\]{}]*?:)*)?([^|\\[\\]]*)?(\\|[^\\[\\]]*?)?(]])"
             }
           ]
         },
@@ -431,7 +431,7 @@
                   ]
                 }
               },
-              "end": "^\\s*(\\|\\})",
+              "end": "^\\s*(\\|})",
               "name": "meta.tag.block.table.wikitext",
               "patterns": [
                 {
@@ -571,7 +571,7 @@
           ]
         },
         "template": {
-          "begin": "(\\{\\{)\\s*(([^#:\\|\\[\\]\\{\\}]*(:))*)\\s*((#[^#:\\|\\[\\]\\{\\}]+(:))*)([^#:\\|\\[\\]\\{\\}]*)",
+          "begin": "(\\{\\{)\\s*(([^#:|\\[\\]{}]*(:))*)\\s*((#[^#:|\\[\\]{}]+(:))*)([^#:|\\[\\]{}]*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.template.wikitext"
@@ -592,7 +592,7 @@
               "name": "entity.name.tag.local-name.wikitext"
             }
           },
-          "end": "(\\}\\})",
+          "end": "(}})",
           "patterns": [
             {
               "include": "$self"
@@ -616,7 +616,7 @@
                   "name": "keyword.operator.equal.wikitext"
                 }
               },
-              "match": "(?<=\\|)\\s*(?:([-\\w.]+)(:))?([-\\w\\s\\.:]+)\\s*(=)"
+              "match": "(?<=\\|)\\s*(?:([\\-\\w.]+)(:))?([\\-\\w\\s.:]+)\\s*(=)"
             }
           ]
         },
@@ -1006,7 +1006,7 @@
               ],
               "repository": {
                 "hl-bat": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(['\"]?)(?:batch|bat|dosbatch|winbatch)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(['\"]?)(?:batch|bat|dosbatch|winbatch)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1060,7 +1060,7 @@
                   ]
                 },
                 "hl-bibtex": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:bibtex|bib)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)bib(?:tex|)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1114,7 +1114,7 @@
                   ]
                 },
                 "hl-c": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)c\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)c\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1168,7 +1168,7 @@
                   ]
                 },
                 "hl-clojure": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:clojure|clj)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)cl(?:ojure|j)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1222,7 +1222,7 @@
                   ]
                 },
                 "hl-coffee": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:coffeescript|coffee-script|coffee)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)coffee(?:script|-script|)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1276,7 +1276,7 @@
                   ]
                 },
                 "hl-cpp": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:cpp|c\\+\\+)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)c(?:pp|\\+\\+)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1330,7 +1330,7 @@
                   ]
                 },
                 "hl-csharp": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:csharp|c#|cs)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)c(?:sharp|[#s])\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1384,7 +1384,7 @@
                   ]
                 },
                 "hl-css": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)css\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)css\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1438,7 +1438,7 @@
                   ]
                 },
                 "hl-dart": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)dart\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)dart\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1492,7 +1492,7 @@
                   ]
                 },
                 "hl-diff": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:diff|udiff)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:diff|udiff)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1546,7 +1546,7 @@
                   ]
                 },
                 "hl-dockerfile": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:docker|dockerfile)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)docker(?:|file)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1600,7 +1600,7 @@
                   ]
                 },
                 "hl-elixir": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:elixir|ex|exs)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)e(?:lixir|x|xs)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1654,7 +1654,7 @@
                   ]
                 },
                 "hl-erlang": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)erlang\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)erlang\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1708,7 +1708,7 @@
                   ]
                 },
                 "hl-fsharp": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:fsharp|f#)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)f(?:sharp|#)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1762,7 +1762,7 @@
                   ]
                 },
                 "hl-go": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:go|golang)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)go(?:|lang)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1816,7 +1816,7 @@
                   ]
                 },
                 "hl-groovy": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)groovy\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)groovy\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1870,7 +1870,7 @@
                   ]
                 },
                 "hl-handlebars": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)handlebars\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)handlebars\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1924,7 +1924,7 @@
                   ]
                 },
                 "hl-html": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)html\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)html\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -1978,7 +1978,7 @@
                   ]
                 },
                 "hl-ini": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:ini|cfg|dosini)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:ini|cfg|dosini)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2032,7 +2032,7 @@
                   ]
                 },
                 "hl-java": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)java\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)java\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2086,7 +2086,7 @@
                   ]
                 },
                 "hl-js": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:javascript|js)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)j(?:avascript|s)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2140,7 +2140,7 @@
                   ]
                 },
                 "hl-json": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"json\"|'json'|\"json-object\"|'json-object'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"json\"|'json'|\"json-object\"|'json-object')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2194,7 +2194,7 @@
                   ]
                 },
                 "hl-julia": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"julia\"|'julia'|\"jl\"|'jl'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"julia\"|'julia'|\"jl\"|'jl')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2248,7 +2248,7 @@
                   ]
                 },
                 "hl-latex": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:tex|latex)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:tex|latex)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2302,7 +2302,7 @@
                   ]
                 },
                 "hl-less": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"less\"|'less'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"less\"|'less')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2356,7 +2356,7 @@
                   ]
                 },
                 "hl-lua": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)lua\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)lua\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2410,7 +2410,7 @@
                   ]
                 },
                 "hl-makefile": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:make|makefile|mf|bsdmake)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:make|makefile|mf|bsdmake)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2464,7 +2464,7 @@
                   ]
                 },
                 "hl-markdown": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:markdown|md)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)m(?:arkdown|d)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2518,7 +2518,7 @@
                   ]
                 },
                 "hl-objc": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"objective-c\"|'objective-c'|\"objectivec\"|'objectivec'|\"obj-c\"|'obj-c'|\"objc\"|'objc'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"objective-c\"|'objective-c'|\"objectivec\"|'objectivec'|\"obj-c\"|'obj-c'|\"objc\"|'objc')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2572,7 +2572,7 @@
                   ]
                 },
                 "hl-perl": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:perl|ple)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)p(?:erl|le)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2626,7 +2626,7 @@
                   ]
                 },
                 "hl-perl6": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"perl6\"|'perl6'|\"pl6\"|'pl6'|\"raku\"|'raku'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"perl6\"|'perl6'|\"pl6\"|'pl6'|\"raku\"|'raku')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2680,7 +2680,7 @@
                   ]
                 },
                 "hl-php": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:php|php3|php4|php5)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)php(?:|[345])\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2734,7 +2734,7 @@
                   ]
                 },
                 "hl-powershell": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"powershell\"|'powershell'|\"pwsh\"|'pwsh'|\"posh\"|'posh'|\"ps1\"|'ps1'|\"psm1\"|'psm1'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"powershell\"|'powershell'|\"pwsh\"|'pwsh'|\"posh\"|'posh'|\"ps1\"|'ps1'|\"psm1\"|'psm1')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2788,7 +2788,7 @@
                   ]
                 },
                 "hl-pug": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:pug|jade)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:pug|jade)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2842,7 +2842,7 @@
                   ]
                 },
                 "hl-python": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"python\"|'python'|\"py\"|'py'|\"sage\"|'sage'|\"python3\"|'python3'|\"py3\"|'py3'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"python\"|'python'|\"py\"|'py'|\"sage\"|'sage'|\"python3\"|'python3'|\"py3\"|'py3')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2896,7 +2896,7 @@
                   ]
                 },
                 "hl-r": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:splus|s|r)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:splus|[sr])\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -2950,7 +2950,7 @@
                   ]
                 },
                 "hl-ruby": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:ruby|rb|duby)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:ruby|rb|duby)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3004,7 +3004,7 @@
                   ]
                 },
                 "hl-rust": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"rust\"|'rust'|\"rs\"|'rs'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"rust\"|'rust'|\"rs\"|'rs')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3058,7 +3058,7 @@
                   ]
                 },
                 "hl-scala": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"scala\"|'scala'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"scala\"|'scala')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3112,7 +3112,7 @@
                   ]
                 },
                 "hl-scss": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"scss\"|'scss'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"scss\"|'scss')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3166,7 +3166,7 @@
                   ]
                 },
                 "hl-shell": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"bash\"|'bash'|\"sh\"|'sh'|\"ksh\"|'ksh'|\"zsh\"|'zsh'|\"shell\"|'shell'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"bash\"|'bash'|\"sh\"|'sh'|\"ksh\"|'ksh'|\"zsh\"|'zsh'|\"shell\"|'shell')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3220,7 +3220,7 @@
                   ]
                 },
                 "hl-sql": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)sql\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)sql\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3274,7 +3274,7 @@
                   ]
                 },
                 "hl-swift": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"swift\"|'swift'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"swift\"|'swift')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3328,7 +3328,7 @@
                   ]
                 },
                 "hl-ts": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:\"typescript\"|'typescript'|\"ts\"|'ts'))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(?:\"typescript\"|'typescript'|\"ts\"|'ts')(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3382,7 +3382,7 @@
                   ]
                 },
                 "hl-vb-net": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)(?:vb\\.net|vbnet|lobas|oobas|sobas)\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)(?:vb\\.net|vbnet|lobas|oobas|sobas)\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3436,7 +3436,7 @@
                   ]
                 },
                 "hl-xml": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)xml\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)xml\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3490,7 +3490,7 @@
                   ]
                 },
                 "hl-xslt": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)xslt\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)xslt\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"
@@ -3544,7 +3544,7 @@
                   ]
                 },
                 "hl-yaml": {
-                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?(?:\\s+lang=(?:(['\"]?)yaml\\4))(?:\\s+[^>]+)?)\\s*(>)",
+                  "begin": "(?i)(<)(syntaxhighlight)((?:\\s+[^>]+)?\\s+lang=(['\"]?)yaml\\4(?:\\s+[^>]+)?)\\s*(>)",
                   "beginCaptures": {
                     "0": {
                       "name": "meta.tag.metadata.start.wikitext"