tm-grammars 1.25.3 → 1.27.0

package/grammars/razor.json

@@ -5,6 +5,13 @@
     "cshtml"
   ],
   "injections": {
+    "source.cs": {
+      "patterns": [
+        {
+          "include": "#inline-template"
+        }
+      ]
+    },
     "string.quoted.double.html": {
       "patterns": [
         {
@@ -132,7 +139,7 @@
           "name": "keyword.control.try.catch.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.catch.razor",
       "patterns": [
         {
@@ -362,7 +369,7 @@
           "name": "keyword.control.loop.do.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.do.razor",
       "patterns": [
         {
@@ -390,7 +397,7 @@
           "name": "keyword.control.loop.do.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.do.razor",
       "patterns": [
         {
@@ -414,7 +421,7 @@
           "name": "keyword.control.conditional.if.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.else.razor",
       "patterns": [
         {
@@ -466,7 +473,7 @@
           "name": "keyword.control.try.finally.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.finally.razor",
       "patterns": [
         {
@@ -491,7 +498,7 @@
           "name": "keyword.control.loop.for.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.for.razor",
       "patterns": [
         {
@@ -519,7 +526,7 @@
           "name": "keyword.control.loop.for.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.for.razor",
       "patterns": [
         {
@@ -612,7 +619,7 @@
           "name": "keyword.control.loop.foreach.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.foreach.razor",
       "patterns": [
         {
@@ -647,7 +654,7 @@
           "name": "keyword.control.loop.foreach.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.foreach.razor",
       "patterns": [
         {
@@ -696,7 +703,7 @@
           "name": "keyword.control.conditional.if.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.if.razor",
       "patterns": [
         {
@@ -724,7 +731,7 @@
           "name": "keyword.control.conditional.if.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.if.razor",
       "patterns": [
         {
@@ -937,6 +944,111 @@
       "match": "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_[:alpha:]][_[:alnum:]]*)?\\s*(?=$)",
       "name": "meta.directive"
     },
+    "inline-template": {
+      "patterns": [
+        {
+          "include": "#inline-template-void-tag"
+        },
+        {
+          "include": "#inline-template-non-void-tag"
+        }
+      ]
+    },
+    "inline-template-non-void-tag": {
+      "begin": "(@)(<)(!)?([^/>\\s]+)(?=\\s|/?>)",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#transition"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "3": {
+          "name": "constant.character.escape.razor.tagHelperOptOut"
+        },
+        "4": {
+          "name": "entity.name.tag.html"
+        }
+      },
+      "end": "(</)(\\4)\\s*(>)|(/>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "2": {
+          "name": "entity.name.tag.html"
+        },
+        "3": {
+          "name": "punctuation.definition.tag.end.html"
+        },
+        "4": {
+          "name": "punctuation.definition.tag.end.html"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?<=>)(?!$)",
+          "end": "(?=</)",
+          "patterns": [
+            {
+              "include": "#inline-template"
+            },
+            {
+              "include": "#wellformed-html"
+            },
+            {
+              "include": "#razor-control-structures"
+            }
+          ]
+        },
+        {
+          "include": "#razor-control-structures"
+        },
+        {
+          "include": "text.html.basic#attribute"
+        }
+      ]
+    },
+    "inline-template-void-tag": {
+      "begin": "(?i)(@)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#transition"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "3": {
+          "name": "constant.character.escape.razor.tagHelperOptOut"
+        },
+        "4": {
+          "name": "entity.name.tag.html"
+        }
+      },
+      "end": "/?>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag.end.html"
+        }
+      },
+      "name": "meta.tag.structure.$4.void.html",
+      "patterns": [
+        {
+          "include": "#razor-control-structures"
+        },
+        {
+          "include": "text.html.basic#attribute"
+        }
+      ]
+    },
     "layout-directive": {
       "captures": {
         "1": {
@@ -974,7 +1086,7 @@
           "name": "keyword.other.lock.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.lock.razor",
       "patterns": [
         {
@@ -1002,7 +1114,7 @@
           "name": "keyword.other.lock.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.lock.razor",
       "patterns": [
         {
@@ -1271,6 +1383,9 @@
         {
           "include": "#text-tag"
         },
+        {
+          "include": "#inline-template"
+        },
         {
           "include": "#wellformed-html"
         },
@@ -1469,7 +1584,7 @@
           "name": "keyword.control.switch.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.switch.razor",
       "patterns": [
         {
@@ -1497,7 +1612,7 @@
           "name": "keyword.control.switch.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.switch.razor",
       "patterns": [
         {
@@ -1618,7 +1733,7 @@
           "name": "keyword.control.try.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.try.razor",
       "patterns": [
         {
@@ -1646,7 +1761,7 @@
           "name": "keyword.control.try.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.try.razor",
       "patterns": [
         {
@@ -1785,7 +1900,7 @@
           "name": "keyword.other.using.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.using.razor",
       "patterns": [
         {
@@ -1813,7 +1928,7 @@
           "name": "keyword.other.using.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.using.razor",
       "patterns": [
         {

package/grammars/solidity.json

@@ -703,9 +703,6 @@
         {
           "include": "#type-modifier-transient"
         },
-        {
-          "include": "#type-modifier-extend-scope"
-        },
         {
           "include": "#type-modifier-payable"
         },
@@ -997,19 +994,6 @@
         }
       ]
     },
-    "number": {
-      "patterns": [
-        {
-          "include": "#number-decimal"
-        },
-        {
-          "include": "#number-hex"
-        },
-        {
-          "include": "#number-scientific"
-        }
-      ]
-    },
     "number-decimal": {
       "match": "\\b([0-9_]+(\\.[0-9_]+)?)\\b",
       "name": "constant.numeric.decimal"
@@ -1156,7 +1140,7 @@
     "type-primitive": {
       "patterns": [
         {
-          "begin": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b\\[](\\()",
+          "begin": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool\\d*)\\b\\[](\\()",
           "beginCaptures": {
             "1": {
               "name": "support.type.primitive"
@@ -1179,7 +1163,7 @@
           ]
         },
         {
-          "match": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool|hash\\d*)\\b",
+          "match": "\\b(address|string\\d*|bytes\\d*|int\\d*|uint\\d*|bool\\d*)\\b",
           "name": "support.type.primitive"
         }
       ]

package/grammars/svelte.json

@@ -22,15 +22,26 @@
     "L:(meta.script.svelte | meta.style.svelte) (meta.lang.ts | meta.lang.typescript) - (meta source)": {
       "patterns": [
         {
-          "begin": "(?<=>)(?!</)",
+          "begin": "(?<=>)(?=[^\\n]+</(s(?:cript|tyle))[>\\s])",
           "contentName": "source.ts",
-          "end": "(?=</)",
+          "end": "(?=</(s(?:cript|tyle))[>\\s])",
           "name": "meta.embedded.block.svelte",
           "patterns": [
             {
               "include": "source.ts"
             }
           ]
+        },
+        {
+          "begin": "(?<=>)(?!</)",
+          "contentName": "source.ts",
+          "name": "meta.embedded.block.svelte",
+          "patterns": [
+            {
+              "include": "source.ts"
+            }
+          ],
+          "while": "^(?!\\s*</(s(?:cript|tyle))[>\\s])"
         }
       ]
     },

package/grammars/tex.json

@@ -271,7 +271,7 @@
               "name": "punctuation.definition.constant.math.tex"
             }
           },
-          "match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c([au]p)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook((?:lef|righ)tarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n([ew]arrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v([Dd]ash)|warrow|le(ss|q(slant|q)?|ft((?:|right)arrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left((?:|right)arrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot([ps])?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee((?:down|up)arrow)?|wedge((?:down|up)arrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead((?:lef|righ)tarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u([bp]set))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C([au]p)|u(n([lr]hd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t([ah])|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P((?:s|h?)i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left((?:|right)arrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot([ps])|e(ss(sim|dot|eq(q?gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(v??dash)|r(h([do])|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(q?less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc([au]p))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left((?:|right)arrow)|rightarrow|maps(to|from))|eft((?:|right)arrow)|leftarrow|ambda|bag)|Arrownot)(?![@-Za-z])",
+          "match": "(\\\\)(s(s(earrow|warrow|lash)|h(ort(downarrow|uparrow|parallel|leftarrow|rightarrow|mid)|arp)|tar|i(gma|m(eq)?)|u(cc(sim|n(sim|approx)|curlyeq|eq|approx)?|pset(neq(q)?|plus(eq)?|eq(q)?)?|rd|m|bset(neq(q)?|plus(eq)?|eq(q)?)?)|p(hericalangle|adesuit)|e(tminus|arrow)|q(su(pset(eq)?|bset(eq)?)|c([au]p)|uare)|warrow|m(ile|all(s(etminus|mile)|frown)))|h(slash|ook((?:lef|righ)tarrow)|eartsuit|bar)|R(sh|ightarrow|e|bag)|Gam(e|ma)|n(s(hort(parallel|mid)|im|u(cc(eq)?|pseteq(q)?|bseteq))|Rightarrow|n([ew]arrow)|cong|triangle(left(eq(slant)?)?|right(eq(slant)?)?)|i(plus)?|u|p(lus|arallel|rec(eq)?)|e(q|arrow|g|xists)|v([Dd]ash)|warrow|le(ss|q(slant|q)?|ft((?:|right)arrow))|a(tural|bla)|VDash|rightarrow|g(tr|eq(slant|q)?)|mid|Left((?:|right)arrow))|c(hi|irc(eq|le(d(circ|S|dash|ast)|arrow(left|right)))?|o(ng|prod|lon|mplement)|dot([ps])?|u(p|r(vearrow(left|right)|ly(eq(succ|prec)|vee((?:down|up)arrow)?|wedge((?:down|up)arrow)?)))|enterdot|lubsuit|ap)|Xi|Maps(to(char)?|from(char)?)|B(ox|umpeq|bbk)|t(h(ick(sim|approx)|e(ta|refore))|imes|op|wohead((?:lef|righ)tarrow)|a(u|lloblong)|riangle(down|q|left(eq(slant)?)?|right(eq(slant)?)?)?)|i(n(t(er(cal|leave))?|plus|fty)?|ota|math)|S(igma|u([bp]set))|zeta|o(slash|times|int|dot|plus|vee|wedge|lessthan|greaterthan|m(inus|ega)|b(slash|long|ar))|d(i(v(ideontimes)?|a(g(down|up)|mond(suit)?)|gamma)|o(t(plus|eq(dot)?)|ublebarwedge|wn(harpoon(left|right)|downarrows|arrow))|d(ots|agger)|elta|a(sh(v|leftarrow|rightarrow)|leth|gger))|Y(down|up|left|right)|C([au]p)|u(n([lr]hd)|p(silon|harpoon(left|right)|downarrow|uparrows|lus|arrow)|lcorner|rcorner)|jmath|Theta|Im|p(si|hi|i(tchfork)?|erp|ar(tial|allel)|r(ime|o(d|pto)|ec(sim|n(sim|approx)|curlyeq|eq|approx)?)|m)|e(t([ah])|psilon|q(slant(less|gtr)|circ|uiv)|ll|xists|mptyset)|Omega|D(iamond|ownarrow|elta)|v(d(ots|ash)|ee(bar)?|Dash|ar(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|curly(vee|wedge)|t(heta|imes|riangle(left|right)?)|o(slash|circle|times|dot|plus|vee|wedge|lessthan|ast|greaterthan|minus|b(slash|ar))|p(hi|i|ropto)|epsilon|kappa|rho|bigcirc))|kappa|Up(silon|downarrow|arrow)|Join|f(orall|lat|a(t(s(emi|lash)|bslash)|llingdotseq)|rown)|P((?:s|h?)i)|w(p|edge|r)|l(hd|n(sim|eq(q)?|approx)|ceil|times|ightning|o(ng(left((?:|right)arrow)|rightarrow|maps(to|from))|zenge|oparrow(left|right))|dot([ps])|e(ss(sim|dot|eq(q?gtr)|approx|gtr)|q(slant|q)?|ft(slice|harpoon(down|up)|threetimes|leftarrows|arrow(t(ail|riangle))?|right(squigarrow|harpoons|arrow(s|triangle|eq)?))|adsto)|vertneqq|floor|l(c(orner|eil)|floor|l|bracket)?|a(ngle|mbda)|rcorner|bag)|a(s(ymp|t)|ngle|pprox(eq)?|l(pha|eph)|rrownot|malg)|V(v??dash)|r(h([do])|ceil|times|i(singdotseq|ght(s(quigarrow|lice)|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(t(ail|riangle))?|rightarrows))|floor|angle|r(ceil|parenthesis|floor|bracket)|bag)|g(n(sim|eq(q)?|approx)|tr(sim|dot|eq(q?less)|less|approx)|imel|eq(slant|q)?|vertneqq|amma|g(g)?)|Finv|xi|m(ho|i(nuso|d)|o(o|dels)|u(ltimap)?|p|e(asuredangle|rge)|aps(to|from(char)?))|b(i(n(dnasrepma|ampersand)|g(s(tar|qc([au]p))|nplus|c(irc|u(p|rly(vee|wedge))|ap)|triangle(down|up)|interleave|o(times|dot|plus)|uplus|parallel|vee|wedge|box))|o(t|wtie|x(slash|circle|times|dot|plus|empty|ast|minus|b(slash|ox|ar)))|u(llet|mpeq)|e(cause|t(h|ween|a))|lack(square|triangle(down|left|right)?|lozenge)|a(ck(s(im(eq)?|lash)|prime|epsilon)|r(o|wedge))|bslash)|L(sh|ong(left((?:|right)arrow)|rightarrow|maps(to|from))|eft((?:|right)arrow)|leftarrow|ambda|bag)|ge|le|Arrownot)(?![@-Za-z])",
           "name": "constant.character.math.tex"
         },
         {