tm-grammars 1.25.2 → 1.26.0

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/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"
         },
         {

package/grammars/typespec.json

@@ -17,7 +17,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.alias-id.typespec",
       "patterns": [
         {
@@ -35,7 +35,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.alias-statement.typespec",
       "patterns": [
         {
@@ -56,7 +56,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "end": "(?=([$_`[:alpha:]]))|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=([$_`[:alpha:]]))|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.augment-decorator-statement.typespec",
       "patterns": [
         {
@@ -115,7 +115,7 @@
           "name": "variable.name.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.const-statement.typespec",
       "patterns": [
         {
@@ -139,7 +139,7 @@
           "name": "entity.name.tag.tsp"
         }
       },
-      "end": "(?=([$_`[:alpha:]]))|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=([$_`[:alpha:]]))|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.decorator.typespec",
       "patterns": [
         {
@@ -163,7 +163,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.decorator-declaration-statement.typespec",
       "patterns": [
         {
@@ -175,13 +175,16 @@
       ]
     },
     "directive": {
-      "begin": "\\s*(#\\b[$_[:alpha:]][$_[:alnum:]]*)\\b",
+      "begin": "\\s*(#)\\b([$_[:alpha:]][$_[:alnum:]]*)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.directive.name.tsp"
+        },
+        "2": {
+          "name": "keyword.directive.name.tsp"
         }
       },
-      "end": "$|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "$|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.directive.typespec",
       "patterns": [
         {
@@ -306,7 +309,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.enum-member.typespec",
       "patterns": [
         {
@@ -327,7 +330,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?<=})|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.enum-statement.typespec",
       "patterns": [
         {
@@ -395,7 +398,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.function-declaration-statement.typespec",
       "patterns": [
         {
@@ -420,7 +423,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.import-statement.typespec",
       "patterns": [
         {
@@ -488,7 +491,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.interface-member.typespec",
       "patterns": [
         {
@@ -506,7 +509,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?<=})|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.interface-statement.typespec",
       "patterns": [
         {
@@ -593,7 +596,7 @@
           "name": "string.quoted.double.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.model-property.typespec",
       "patterns": [
         {
@@ -617,7 +620,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?<=})|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.model-statement.typespec",
       "patterns": [
         {
@@ -656,7 +659,7 @@
     },
     "namespace-name": {
       "begin": "(?=([$_`[:alpha:]]))",
-      "end": "((?=\\{)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
+      "end": "((?=\\{)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.namespace-name.typespec",
       "patterns": [
         {
@@ -674,7 +677,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "((?<=})|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
+      "end": "((?<=})|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b))",
       "name": "meta.namespace-statement.typespec",
       "patterns": [
         {
@@ -734,7 +737,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.object-literal-property.typespec",
       "patterns": [
         {
@@ -752,7 +755,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.operation-heritage.typespec",
       "patterns": [
         {
@@ -818,7 +821,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.operation-statement.typespec",
       "patterns": [
         {
@@ -907,7 +910,7 @@
           "name": "entity.name.function.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.scalar-constructor.typespec",
       "patterns": [
         {
@@ -946,7 +949,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?<=})|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.scalar-statement.typespec",
       "patterns": [
         {
@@ -970,7 +973,7 @@
           "name": "keyword.operator.spread.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.spread-operator.typespec",
       "patterns": [
         {
@@ -1178,7 +1181,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "(?=>)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.assignment.tsp"
@@ -1230,7 +1233,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?=>)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-parameter.typespec",
       "patterns": [
         {
@@ -1251,7 +1254,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=>)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-parameter-constraint.typespec",
       "patterns": [
         {
@@ -1266,7 +1269,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "(?=>)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.type-parameter-default.typespec",
       "patterns": [
         {
@@ -1304,7 +1307,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=>)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.typeof.typespec",
       "patterns": [
         {
@@ -1357,7 +1360,7 @@
           "name": "entity.name.type.tsp"
         }
       },
-      "end": "(?<=})|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?<=})|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.union-statement.typespec",
       "patterns": [
         {
@@ -1378,7 +1381,7 @@
           "name": "keyword.operator.type.annotation.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.union-variant.typespec",
       "patterns": [
         {
@@ -1396,7 +1399,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.using-statement.typespec",
       "patterns": [
         {
@@ -1417,7 +1420,7 @@
           "name": "keyword.other.tsp"
         }
       },
-      "end": "(?=>)|(?=[),;@}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
+      "end": "(?=>)|(?=[,;@]|#[a-z]|[)}]|\\bextern\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "name": "meta.valueof.typespec",
       "patterns": [
         {

package/grammars/vue.json

@@ -55,12 +55,13 @@
           ]
         },
         {
-          "begin": "([-0-:A-Za-z]+)\\b(?=[^>]*\\blang\\s*=\\s*([\"']?)html\\b\\2)",
+          "begin": "(?!template(?![-0-:A-Za-z]))([-0-:A-Za-z]+)\\b(?=[^>]*\\blang\\s*=\\s*([\"']?)html\\b\\2)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.$1.html.vue"
             }
           },
+          "contentName": "text.html.derivative",
           "end": "(</)(\\1)\\s*(?=>)",
           "endCaptures": {
             "1": {
@@ -75,14 +76,7 @@
               "include": "#tag-stuff"
             },
             {
-              "begin": "(?<=>)",
-              "end": "(?=</)",
-              "name": "text.html.derivative",
-              "patterns": [
-                {
-                  "include": "#html-stuff"
-                }
-              ]
+              "include": "#html-stuff"
             }
           ]
         },
@@ -695,7 +689,7 @@
           ]
         },
         {
-          "begin": "(template)\\b",
+          "begin": "(template)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.$1.html.vue"
@@ -716,7 +710,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=</template\\b)",
+              "end": "(?=</template[>\\s])",
               "name": "text.html.derivative",
               "patterns": [
                 {
@@ -727,7 +721,7 @@
           ]
         },
         {
-          "begin": "(script)\\b",
+          "begin": "(script)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.$1.html.vue"
@@ -748,7 +742,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=</script\\b)",
+              "end": "(?=</script[>\\s])",
               "name": "source.js",
               "patterns": [
                 {
@@ -759,7 +753,7 @@
           ]
         },
         {
-          "begin": "(style)\\b",
+          "begin": "(style)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.tag.$1.html.vue"
@@ -780,7 +774,7 @@
             },
             {
               "begin": "(?<=>)",
-              "end": "(?=</style\\b)",
+              "end": "(?=</style[>\\s])",
               "name": "source.css",
               "patterns": [
                 {
@@ -908,7 +902,7 @@
       "patterns": [
         {
           "begin": "\\G",
-          "end": "(?=/>)|((</)(template))\\b",
+          "end": "(?=/>)|((</)(template)(?=[>\\s]))",
           "endCaptures": {
             "2": {
               "name": "punctuation.definition.tag.begin.html.vue"
@@ -927,7 +921,7 @@
       ]
     },
     "template-tag-2": {
-      "begin": "(<)(template)\\b",
+      "begin": "(<)(template)(?=\\s|/?>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html.vue"
@@ -946,7 +940,7 @@
       "patterns": [
         {
           "begin": "\\G",
-          "end": "(?=/>)|((</)(template))\\b",
+          "end": "(?=/>)|((</)(template)(?=[>\\s]))",
           "endCaptures": {
             "2": {
               "name": "punctuation.definition.tag.begin.html.vue"