tm-grammars 1.5.0 → 1.5.1

package/README.md

@@ -31,7 +31,7 @@ import { grammars } from 'tm-grammars'
 | `applescript` |  | [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle/blob/4947cad7494eba084c21cfe04689b4efce96700f/Syntaxes/AppleScript.tmLanguage) |  |  | 28.73 kB |
 | `ara` |  | [ara-lang/highlighting](https://github.com/ara-lang/highlighting/blob/ed1dbedcf03d0b67207e41fe2e11218cc925dc0d/syntaxes/ara.json) | [Apache-2.0](https://raw.githubusercontent.com/ara-lang/highlighting/main/LICENSE-APACHE) |  | 6.82 kB |
 | `asm` |  | [13xforever/x86_64-assembly-vscode](https://github.com/13xforever/x86_64-assembly-vscode/blob/15c07b12741ac75f5bb6e7701dc7c0d742add8dd/syntaxes/language-x86_64-assembly.tmLanguage) | [MIT](https://raw.githubusercontent.com/13xforever/x86_64-assembly-vscode/master/LICENSE.txt) |  | 38.59 kB |
-| `astro` |  | [withastro/language-tools](https://github.com/withastro/language-tools/blob/37434ab5ee2149dd74a7c1e800d8c279a0617912/packages/vscode/syntaxes/astro.tmLanguage.src.yaml) | [MIT](https://raw.githubusercontent.com/withastro/language-tools/main/LICENSE) | `json` `javascript` `typescript` `stylus` `sass` `css` `scss` `less` `postcss` `tsx` | 10.63 kB |
+| `astro` |  | [withastro/language-tools](https://github.com/withastro/language-tools/blob/db49ff7cbeb2910ddac6ce0b15f3973b72827ccd/packages/vscode/syntaxes/astro.tmLanguage.src.yaml) | [MIT](https://raw.githubusercontent.com/withastro/language-tools/main/LICENSE) | `json` `javascript` `typescript` `stylus` `sass` `css` `scss` `less` `postcss` `tsx` | 22.88 kB |
 | `awk` |  | [luggage66/vscode-awk](https://github.com/luggage66/vscode-awk/blob/eff8c0f160ae16592c8d9963fd77046137fd2612/syntaxes/awk.tmLanguage) | [MIT](https://raw.githubusercontent.com/luggage66/vscode-awk/master/LICENSE.txt) |  | 5.18 kB |
 | `ballerina` |  | [ballerina-platform/ballerina-grammar](https://github.com/ballerina-platform/ballerina-grammar/blob/42ddcc1c63c86bdd6ba712e86bf965f5063831d3/syntaxes/ballerina.tmLanguage) | [Apache-2.0](https://raw.githubusercontent.com/ballerina-platform/ballerina-grammar/master/LICENSE) |  | 56.58 kB |
 | `bat` | `batch` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/df15c8e832a341633acd2e9bb26e1b275d09cfe0/extensions/bat/syntaxes/batchfile.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 12.38 kB |
@@ -116,14 +116,14 @@ import { grammars } from 'tm-grammars'
 | `logo` |  | [textmate/logo.tmbundle](https://github.com/textmate/logo.tmbundle/blob/3205e987ed2a2aa11accdd55a7d094832441f89c/Syntaxes/Logo.tmLanguage) |  |  | 3.03 kB |
 | `lua` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/3c86ede5f554f6e196c832394e126b291a1de606/extensions/lua/syntaxes/lua.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `c` | 14.39 kB |
 | `make` | `makefile` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/91db8ea85fee30ebb3c7a5e7939aa2a8d79811c5/extensions/make/syntaxes/make.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 8.45 kB |
-| `markdown` | `md` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/3c86ede5f554f6e196c832394e126b291a1de606/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `css` `html` `ini` `java` `lua` `make` `perl` `r` `ruby` `php` `sql` `vb` `xml` `xsl` `yaml` `bat` `clojure` `coffee` `c` `cpp` `diff` `docker` `git-commit` `git-rebase` `go` `groovy` `pug` `javascript` `json` `jsonc` `less` `objective-c` `swift` `scss` `raku` `powershell` `python` `julia` `rust` `scala` `shellscript` `typescript` `tsx` `csharp` `fsharp` `dart` `handlebars` `erlang` `elixir` `latex` `bibtex` `html-derivative` | 52.58 kB |
+| `markdown` | `md` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/6b0a582e595fab7da09fcd267f4f8248e7ec437e/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `css` `html` `ini` `java` `lua` `make` `perl` `r` `ruby` `php` `sql` `vb` `xml` `xsl` `yaml` `bat` `clojure` `coffee` `c` `cpp` `diff` `docker` `git-commit` `git-rebase` `go` `groovy` `pug` `javascript` `json` `jsonc` `less` `objective-c` `swift` `scss` `raku` `powershell` `python` `julia` `rust` `scala` `shellscript` `typescript` `tsx` `csharp` `fsharp` `dart` `handlebars` `erlang` `elixir` `latex` `bibtex` `html-derivative` | 52.58 kB |
 | `marko` |  | [marko-js/marko-tmbundle](https://github.com/marko-js/marko-tmbundle/blob/dd3a0c39e656bedd276d3bcbdea92a2d627755c7/Syntaxes/marko.tmLanguage) | [MIT](https://raw.githubusercontent.com/marko-js/marko-tmbundle/master/LICENSE) | `css` `less` `scss` `javascript` | 18.31 kB |
 | `matlab` |  | [mathworks/MATLAB-Language-grammar](https://github.com/mathworks/MATLAB-Language-grammar/blob/69dbf20c1eb19efd629c0438a2a493e60617e8de/Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage) |  |  | 19.38 kB |
 | `mdc` |  | [nuxtlabs/vscode-mdc](https://github.com/nuxtlabs/vscode-mdc/blob/6294dbce9706f538a521e7dccce9609e928dc3be/syntaxes/mdc.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nuxtlabs/vscode-mdc/main/LICENSE) | `markdown` `yaml` `html-derivative` | 19.05 kB |
 | `mdx` |  | [wooorm/markdown-tm-language](https://github.com/wooorm/markdown-tm-language/blob/371d61df9ddc3850e12aabe61b602d02e259e8a4/source.mdx.tmLanguage) | [MIT](https://raw.githubusercontent.com/wooorm/markdown-tm-language/main/license) | `tsx` `toml` `yaml` `c` `clojure` `coffee` `cpp` `csharp` `css` `diff` `docker` `elixir` `elm` `erlang` `go` `graphql` `haskell` `html` `ini` `java` `javascript` `json` `julia` `kotlin` `less` `lua` `make` `markdown` `objective-c` `perl` `python` `r` `ruby` `rust` `scala` `scss` `shellscript` `shellsession` `sql` `xml` `swift` `typescript` | 120.76 kB |
 | `mermaid` |  | [bpruitt-goddard/vscode-mermaid-syntax-highlight](https://github.com/bpruitt-goddard/vscode-mermaid-syntax-highlight/blob/8b62f487cb7a89afcd152febfbf47f5d4787657f/syntaxes/mermaid.tmLanguage.yaml) | [MIT](https://raw.githubusercontent.com/bpruitt-goddard/vscode-mermaid-syntax-highlight/master/LICENSE) |  | 19.88 kB |
 | `mojo` |  | [modularml/mojo-syntax](https://github.com/modularml/mojo-syntax/blob/a2241dda06d9a20503394c3affa606114d007049/syntaxes/mojo.syntax.json) | [MIT](https://raw.githubusercontent.com/modularml/mojo-syntax/main/LICENSE) |  | 72.95 kB |
-| `move` |  | [damirka/move-syntax](https://github.com/damirka/move-syntax/blob/de9244e81505ff9154dc9422dbce434ac86fb981/syntaxes/move.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE) |  | 13.82 kB |
+| `move` |  | [damirka/move-syntax](https://github.com/damirka/move-syntax/blob/ec2884fdaee236db42d8999e5f9cd2923e317f8b/syntaxes/move.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE) |  | 16.28 kB |
 | `narrat` | `nar` | [liana-p/narrat-syntax-highlighting-vscode](https://github.com/liana-p/narrat-syntax-highlighting-vscode/blob/00d4b410338fc50ca0ce77a1f7e873c1fb66d376/syntaxes/narrat.tmLanguage.yaml) | [MIT](https://raw.githubusercontent.com/liana-p/narrat-syntax-highlighting-vscode/main/LICENSE) |  | 3.41 kB |
 | `nextflow` | `nf` | [nextflow-io/vscode-language-nextflow](https://github.com/nextflow-io/vscode-language-nextflow/blob/7eeb9be8d01556b7c51c59307275c2f720f2ddf4/syntaxes/nextflow.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nextflow-io/vscode-language-nextflow/master/LICENSE.md) |  | 4.40 kB |
 | `nginx` |  | [hangxingliu/vscode-nginx-conf-hint](https://github.com/hangxingliu/vscode-nginx-conf-hint/blob/49159c02fd09dce264ded7802c9499a0f09646f5/src/syntax/nginx.tmLanguage) | [GPL-3.0](https://raw.githubusercontent.com/hangxingliu/vscode-nginx-conf-hint/main/LICENSE) | `lua` | 34.14 kB |

package/grammars/astro.json

@@ -448,6 +448,50 @@
         }
       ]
     },
+    "entities": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.astro"
+            },
+            "912": {
+              "name": "punctuation.definition.entity.astro"
+            }
+          },
+          "match": "(?x)\n(&)\t(?=[a-zA-Z])\n(\n(a(s(ymp(eq)?|cr|t)|n(d(slope|d|v|and)?|g(s(t|ph)|zarr|e|le|rt(vb(d)?)?|msd(a(h|c|d|e|f|a|g|b))?)?)|c(y|irc|d|ute|E)?|tilde|o(pf|gon)|uml|p(id|os|prox(eq)?|e|E|acir)?|elig|f(r)?|w(conint|int)|l(pha|e(ph|fsym))|acute|ring|grave|m(p|a(cr|lg))|breve)|A(s(sign|cr)|nd|MP|c(y|irc)|tilde|o(pf|gon)|uml|pplyFunction|fr|Elig|lpha|acute|ring|grave|macr|breve))\n| (B(scr|cy|opf|umpeq|e(cause|ta|rnoullis)|fr|a(ckslash|r(v|wed))|reve)|b(s(cr|im(e)?|ol(hsub|b)?|emi)|n(ot|e(quiv)?)|c(y|ong)|ig(s(tar|qcup)|c(irc|up|ap)|triangle(down|up)|o(times|dot|plus)|uplus|vee|wedge)|o(t(tom)?|pf|wtie|x(h(d|u|D|U)?|times|H(d|u|D|U)?|d(R|l|r|L)|u(R|l|r|L)|plus|D(R|l|r|L)|v(R|h|H|l|r|L)?|U(R|l|r|L)|V(R|h|H|l|r|L)?|minus|box))|Not|dquo|u(ll(et)?|mp(e(q)?|E)?)|prime|e(caus(e)?|t(h|ween|a)|psi|rnou|mptyv)|karow|fr|l(ock|k(1(2|4)|34)|a(nk|ck(square|triangle(down|left|right)?|lozenge)))|a(ck(sim(eq)?|cong|prime|epsilon)|r(vee|wed(ge)?))|r(eve|vbar)|brk(tbrk)?))\n| (c(s(cr|u(p(e)?|b(e)?))|h(cy|i|eck(mark)?)|ylcty|c(irc|ups(sm)?|edil|a(ps|ron))|tdot|ir(scir|c(eq|le(d(R|circ|S|dash|ast)|arrow(left|right)))?|e|fnint|E|mid)?|o(n(int|g(dot)?)|p(y(sr)?|f|rod)|lon(e(q)?)?|m(p(fn|le(xes|ment))?|ma(t)?))|dot|u(darr(l|r)|p(s|c(up|ap)|or|dot|brcap)?|e(sc|pr)|vee|wed|larr(p)?|r(vearrow(left|right)|ly(eq(succ|prec)|vee|wedge)|arr(m)?|ren))|e(nt(erdot)?|dil|mptyv)|fr|w(conint|int)|lubs(uit)?|a(cute|p(s|c(up|ap)|dot|and|brcup)?|r(on|et))|r(oss|arr))|C(scr|hi|c(irc|onint|edil|aron)|ircle(Minus|Times|Dot|Plus)|Hcy|o(n(tourIntegral|int|gruent)|unterClockwiseContourIntegral|p(f|roduct)|lon(e)?)|dot|up(Cap)?|OPY|e(nterDot|dilla)|fr|lo(seCurly(DoubleQuote|Quote)|ckwiseContourIntegral)|a(yleys|cute|p(italDifferentialD)?)|ross))\n| (d(s(c(y|r)|trok|ol)|har(l|r)|c(y|aron)|t(dot|ri(f)?)|i(sin|e|v(ide(ontimes)?|onx)?|am(s|ond(suit)?)?|gamma)|Har|z(cy|igrarr)|o(t(square|plus|eq(dot)?|minus)?|ublebarwedge|pf|wn(harpoon(left|right)|downarrows|arrow)|llar)|d(otseq|a(rr|gger))?|u(har|arr)|jcy|e(lta|g|mptyv)|f(isht|r)|wangle|lc(orn|rop)|a(sh(v)?|leth|rr|gger)|r(c(orn|rop)|bkarow)|b(karow|lac)|Arr)|D(s(cr|trok)|c(y|aron)|Scy|i(fferentialD|a(critical(Grave|Tilde|Do(t|ubleAcute)|Acute)|mond))|o(t(Dot|Equal)?|uble(Right(Tee|Arrow)|ContourIntegral|Do(t|wnArrow)|Up(DownArrow|Arrow)|VerticalBar|L(ong(RightArrow|Left(RightArrow|Arrow))|eft(RightArrow|Tee|Arrow)))|pf|wn(Right(TeeVector|Vector(Bar)?)|Breve|Tee(Arrow)?|arrow|Left(RightVector|TeeVector|Vector(Bar)?)|Arrow(Bar|UpArrow)?))|Zcy|el(ta)?|D(otrahd)?|Jcy|fr|a(shv|rr|gger)))\n| (e(s(cr|im|dot)|n(sp|g)|c(y|ir(c)?|olon|aron)|t(h|a)|o(pf|gon)|dot|u(ro|ml)|p(si(v|lon)?|lus|ar(sl)?)|e|D(ot|Dot)|q(s(im|lant(less|gtr))|c(irc|olon)|u(iv(DD)?|est|als)|vparsl)|f(Dot|r)|l(s(dot)?|inters|l)?|a(ster|cute)|r(Dot|arr)|g(s(dot)?|rave)?|x(cl|ist|p(onentiale|ectation))|m(sp(1(3|4))?|pty(set|v)?|acr))|E(s(cr|im)|c(y|irc|aron)|ta|o(pf|gon)|NG|dot|uml|TH|psilon|qu(ilibrium|al(Tilde)?)|fr|lement|acute|grave|x(ists|ponentialE)|m(pty(SmallSquare|VerySmallSquare)|acr)))\n| (f(scr|nof|cy|ilig|o(pf|r(k(v)?|all))|jlig|partint|emale|f(ilig|l(ig|lig)|r)|l(tns|lig|at)|allingdotseq|r(own|a(sl|c(1(2|8|3|4|5|6)|78|2(3|5)|3(8|4|5)|45|5(8|6)))))|F(scr|cy|illed(SmallSquare|VerySmallSquare)|o(uriertrf|pf|rAll)|fr))\n| (G(scr|c(y|irc|edil)|t|opf|dot|T|Jcy|fr|amma(d)?|reater(Greater|SlantEqual|Tilde|Equal(Less)?|FullEqual|Less)|g|breve)|g(s(cr|im(e|l)?)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|irc)|t(c(c|ir)|dot|quest|lPar|r(sim|dot|eq(qless|less)|less|a(pprox|rr)))?|imel|opf|dot|jcy|e(s(cc|dot(o(l)?)?|l(es)?)?|q(slant|q)?|l)?|v(nE|ertneqq)|fr|E(l)?|l(j|E|a)?|a(cute|p|mma(d)?)|rave|g(g)?|breve))\n| (h(s(cr|trok|lash)|y(phen|bull)|circ|o(ok(leftarrow|rightarrow)|pf|arr|rbar|mtht)|e(llip|arts(uit)?|rcon)|ks(earow|warow)|fr|a(irsp|lf|r(dcy|r(cir|w)?)|milt)|bar|Arr)|H(s(cr|trok)|circ|ilbertSpace|o(pf|rizontalLine)|ump(DownHump|Equal)|fr|a(cek|t)|ARDcy))\n| (i(s(cr|in(s(v)?|dot|v|E)?)|n(care|t(cal|prod|e(rcal|gers)|larhk)?|odot|fin(tie)?)?|c(y|irc)?|t(ilde)?|i(nfin|i(nt|int)|ota)?|o(cy|ta|pf|gon)|u(kcy|ml)|jlig|prod|e(cy|xcl)|quest|f(f|r)|acute|grave|m(of|ped|a(cr|th|g(part|e|line))))|I(scr|n(t(e(rsection|gral))?|visible(Comma|Times))|c(y|irc)|tilde|o(ta|pf|gon)|dot|u(kcy|ml)|Ocy|Jlig|fr|Ecy|acute|grave|m(plies|a(cr|ginaryI))?))\n| (j(s(cr|ercy)|c(y|irc)|opf|ukcy|fr|math)|J(s(cr|ercy)|c(y|irc)|opf|ukcy|fr))\n| (k(scr|hcy|c(y|edil)|opf|jcy|fr|appa(v)?|green)|K(scr|c(y|edil)|Hcy|opf|Jcy|fr|appa))\n| (l(s(h|cr|trok|im(e|g)?|q(uo(r)?|b)|aquo)|h(ar(d|u(l)?)|blk)|n(sim|e(q(q)?)?|E|ap(prox)?)|c(y|ub|e(il|dil)|aron)|Barr|t(hree|c(c|ir)|imes|dot|quest|larr|r(i(e|f)?|Par))?|Har|o(ng(left(arrow|rightarrow)|rightarrow|mapsto)|times|z(enge|f)?|oparrow(left|right)|p(f|lus|ar)|w(ast|bar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|r(dhar|ushar))|ur(dshar|uhar)|jcy|par(lt)?|e(s(s(sim|dot|eq(qgtr|gtr)|approx|gtr)|cc|dot(o(r)?)?|g(es)?)?|q(slant|q)?|ft(harpoon(down|up)|threetimes|leftarrows|arrow(tail)?|right(squigarrow|harpoons|arrow(s)?))|g)?|v(nE|ertneqq)|f(isht|loor|r)|E(g)?|l(hard|corner|tri|arr)?|a(ng(d|le)?|cute|t(e(s)?|ail)?|p|emptyv|quo|rr(sim|hk|tl|pl|fs|lp|b(fs)?)?|gran|mbda)|r(har(d)?|corner|tri|arr|m)|g(E)?|m(idot|oust(ache)?)|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr))|L(s(h|cr|trok)|c(y|edil|aron)|t|o(ng(RightArrow|left(arrow|rightarrow)|rightarrow|Left(RightArrow|Arrow))|pf|wer(RightArrow|LeftArrow))|T|e(ss(Greater|SlantEqual|Tilde|EqualGreater|FullEqual|Less)|ft(Right(Vector|Arrow)|Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|rightarrow|Floor|A(ngleBracket|rrow(RightArrow|Bar)?)))|Jcy|fr|l(eftarrow)?|a(ng|cute|placetrf|rr|mbda)|midot))\n| (M(scr|cy|inusPlus|opf|u|e(diumSpace|llintrf)|fr|ap)|m(s(cr|tpos)|ho|nplus|c(y|omma)|i(nus(d(u)?|b)?|cro|d(cir|dot|ast)?)|o(dels|pf)|dash|u(ltimap|map)?|p|easuredangle|DDot|fr|l(cp|dr)|a(cr|p(sto(down|up|left)?)?|l(t(ese)?|e)|rker)))\n| (n(s(hort(parallel|mid)|c(cue|e|r)?|im(e(q)?)?|u(cc(eq)?|p(set(eq(q)?)?|e|E)?|b(set(eq(q)?)?|e|E)?)|par|qsu(pe|be)|mid)|Rightarrow|h(par|arr|Arr)|G(t(v)?|g)|c(y|ong(dot)?|up|edil|a(p|ron))|t(ilde|lg|riangle(left(eq)?|right(eq)?)|gl)|i(s(d)?|v)?|o(t(ni(v(c|a|b))?|in(dot|v(c|a|b)|E)?)?|pf)|dash|u(m(sp|ero)?)?|jcy|p(olint|ar(sl|t|allel)?|r(cue|e(c(eq)?)?)?)|e(s(im|ear)|dot|quiv|ar(hk|r(ow)?)|xist(s)?|Arr)?|v(sim|infin|Harr|dash|Dash|l(t(rie)?|e|Arr)|ap|r(trie|Arr)|g(t|e))|fr|w(near|ar(hk|r(ow)?)|Arr)|V(dash|Dash)|l(sim|t(ri(e)?)?|dr|e(s(s)?|q(slant|q)?|ft(arrow|rightarrow))?|E|arr|Arr)|a(ng|cute|tur(al(s)?)?|p(id|os|prox|E)?|bla)|r(tri(e)?|ightarrow|arr(c|w)?|Arr)|g(sim|t(r)?|e(s|q(slant|q)?)?|E)|mid|L(t(v)?|eft(arrow|rightarrow)|l)|b(sp|ump(e)?))|N(scr|c(y|edil|aron)|tilde|o(nBreakingSpace|Break|t(R(ightTriangle(Bar|Equal)?|everseElement)|Greater(Greater|SlantEqual|Tilde|Equal|FullEqual|Less)?|S(u(cceeds(SlantEqual|Tilde|Equal)?|perset(Equal)?|bset(Equal)?)|quareSu(perset(Equal)?|bset(Equal)?))|Hump(DownHump|Equal)|Nested(GreaterGreater|LessLess)|C(ongruent|upCap)|Tilde(Tilde|Equal|FullEqual)?|DoubleVerticalBar|Precedes(SlantEqual|Equal)?|E(qual(Tilde)?|lement|xists)|VerticalBar|Le(ss(Greater|SlantEqual|Tilde|Equal|Less)?|ftTriangle(Bar|Equal)?))?|pf)|u|e(sted(GreaterGreater|LessLess)|wLine|gative(MediumSpace|Thi(nSpace|ckSpace)|VeryThinSpace))|Jcy|fr|acute))\n| (o(s(cr|ol|lash)|h(m|bar)|c(y|ir(c)?)|ti(lde|mes(as)?)|S|int|opf|d(sold|iv|ot|ash|blac)|uml|p(erp|lus|ar)|elig|vbar|f(cir|r)|l(c(ir|ross)|t|ine|arr)|a(st|cute)|r(slope|igof|or|d(er(of)?|f|m)?|v|arr)?|g(t|on|rave)|m(i(nus|cron|d)|ega|acr))|O(s(cr|lash)|c(y|irc)|ti(lde|mes)|opf|dblac|uml|penCurly(DoubleQuote|Quote)|ver(B(ar|rac(e|ket))|Parenthesis)|fr|Elig|acute|r|grave|m(icron|ega|acr)))\n| (p(s(cr|i)|h(i(v)?|one|mmat)|cy|i(tchfork|v)?|o(intint|und|pf)|uncsp|er(cnt|tenk|iod|p|mil)|fr|l(us(sim|cir|two|d(o|u)|e|acir|mn|b)?|an(ck(h)?|kv))|ar(s(im|l)|t|a(llel)?)?|r(sim|n(sim|E|ap)|cue|ime(s)?|o(d|p(to)?|f(surf|line|alar))|urel|e(c(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?)?|E|ap)?|m)|P(s(cr|i)|hi|cy|i|o(incareplane|pf)|fr|lusMinus|artialD|r(ime|o(duct|portion(al)?)|ecedes(SlantEqual|Tilde|Equal)?)?))\n| (q(scr|int|opf|u(ot|est(eq)?|at(int|ernions))|prime|fr)|Q(scr|opf|UOT|fr))\n| (R(s(h|cr)|ho|c(y|edil|aron)|Barr|ight(Ceiling|T(ee(Vector|Arrow)?|riangle(Bar|Equal)?)|Do(ubleBracket|wn(TeeVector|Vector(Bar)?))|Up(TeeVector|DownVector|Vector(Bar)?)|Vector(Bar)?|arrow|Floor|A(ngleBracket|rrow(Bar|LeftArrow)?))|o(undImplies|pf)|uleDelayed|e(verse(UpEquilibrium|E(quilibrium|lement)))?|fr|EG|a(ng|cute|rr(tl)?)|rightarrow)|r(s(h|cr|q(uo(r)?|b)|aquo)|h(o(v)?|ar(d|u(l)?))|nmid|c(y|ub|e(il|dil)|aron)|Barr|t(hree|imes|ri(e|f|ltri)?)|i(singdotseq|ng|ght(squigarrow|harpoon(down|up)|threetimes|left(harpoons|arrows)|arrow(tail)?|rightarrows))|Har|o(times|p(f|lus|ar)|a(ng|rr)|brk)|d(sh|ca|quo(r)?|ldhar)|uluhar|p(polint|ar(gt)?)|e(ct|al(s|ine|part)?|g)|f(isht|loor|r)|l(har|arr|m)|a(ng(d|e|le)?|c(ute|e)|t(io(nals)?|ail)|dic|emptyv|quo|rr(sim|hk|c|tl|pl|fs|w|lp|ap|b(fs)?)?)|rarr|x|moust(ache)?|b(arr|r(k(sl(d|u)|e)|ac(e|k))|brk)|A(tail|arr|rr)))\n| (s(s(cr|tarf|etmn|mile)|h(y|c(hcy|y)|ort(parallel|mid)|arp)|c(sim|y|n(sim|E|ap)|cue|irc|polint|e(dil)?|E|a(p|ron))?|t(ar(f)?|r(ns|aight(phi|epsilon)))|i(gma(v|f)?|m(ne|dot|plus|e(q)?|l(E)?|rarr|g(E)?)?)|zlig|o(pf|ftcy|l(b(ar)?)?)|dot(e|b)?|u(ng|cc(sim|n(sim|eqq|approx)|curlyeq|eq|approx)?|p(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|hs(ol|ub)|1|n(e|E)|2|d(sub|ot)|3|plus|e(dot)?|E|larr|mult)?|m|b(s(im|u(p|b)|et(neq(q)?|eq(q)?)?)|n(e|E)|dot|plus|e(dot)?|E|rarr|mult)?)|pa(des(uit)?|r)|e(swar|ct|tm(n|inus)|ar(hk|r(ow)?)|xt|mi|Arr)|q(su(p(set(eq)?|e)?|b(set(eq)?|e)?)|c(up(s)?|ap(s)?)|u(f|ar(e|f))?)|fr(own)?|w(nwar|ar(hk|r(ow)?)|Arr)|larr|acute|rarr|m(t(e(s)?)?|i(d|le)|eparsl|a(shp|llsetminus))|bquo)|S(scr|hort(RightArrow|DownArrow|UpArrow|LeftArrow)|c(y|irc|edil|aron)?|tar|igma|H(cy|CHcy)|opf|u(c(hThat|ceeds(SlantEqual|Tilde|Equal)?)|p(set|erset(Equal)?)?|m|b(set(Equal)?)?)|OFTcy|q(uare(Su(perset(Equal)?|bset(Equal)?)|Intersection|Union)?|rt)|fr|acute|mallCircle))\n| (t(s(hcy|c(y|r)|trok)|h(i(nsp|ck(sim|approx))|orn|e(ta(sym|v)?|re(4|fore))|k(sim|ap))|c(y|edil|aron)|i(nt|lde|mes(d|b(ar)?)?)|o(sa|p(cir|f(ork)?|bot)?|ea)|dot|prime|elrec|fr|w(ixt|ohead(leftarrow|rightarrow))|a(u|rget)|r(i(sb|time|dot|plus|e|angle(down|q|left(eq)?|right(eq)?)?|minus)|pezium|ade)|brk)|T(s(cr|trok)|RADE|h(i(nSpace|ckSpace)|e(ta|refore))|c(y|edil|aron)|S(cy|Hcy)|ilde(Tilde|Equal|FullEqual)?|HORN|opf|fr|a(u|b)|ripleDot))\n| (u(scr|h(ar(l|r)|blk)|c(y|irc)|t(ilde|dot|ri(f)?)|Har|o(pf|gon)|d(har|arr|blac)|u(arr|ml)|p(si(h|lon)?|harpoon(left|right)|downarrow|uparrows|lus|arrow)|f(isht|r)|wangle|l(c(orn(er)?|rop)|tri)|a(cute|rr)|r(c(orn(er)?|rop)|tri|ing)|grave|m(l|acr)|br(cy|eve)|Arr)|U(scr|n(ion(Plus)?|der(B(ar|rac(e|ket))|Parenthesis))|c(y|irc)|tilde|o(pf|gon)|dblac|uml|p(si(lon)?|downarrow|Tee(Arrow)?|per(RightArrow|LeftArrow)|DownArrow|Equilibrium|arrow|Arrow(Bar|DownArrow)?)|fr|a(cute|rr(ocir)?)|ring|grave|macr|br(cy|eve)))\n| (v(s(cr|u(pn(e|E)|bn(e|E)))|nsu(p|b)|cy|Bar(v)?|zigzag|opf|dash|prop|e(e(eq|bar)?|llip|r(t|bar))|Dash|fr|ltri|a(ngrt|r(s(igma|u(psetneq(q)?|bsetneq(q)?))|nothing|t(heta|riangle(left|right))|p(hi|i|ropto)|epsilon|kappa|r(ho)?))|rtri|Arr)|V(scr|cy|opf|dash(l)?|e(e|r(yThinSpace|t(ical(Bar|Separator|Tilde|Line))?|bar))|Dash|vdash|fr|bar))\n| (w(scr|circ|opf|p|e(ierp|d(ge(q)?|bar))|fr|r(eath)?)|W(scr|circ|opf|edge|fr))\n| (X(scr|i|opf|fr)|x(s(cr|qcup)|h(arr|Arr)|nis|c(irc|up|ap)|i|o(time|dot|p(f|lus))|dtri|u(tri|plus)|vee|fr|wedge|l(arr|Arr)|r(arr|Arr)|map))\n| (y(scr|c(y|irc)|icy|opf|u(cy|ml)|en|fr|ac(y|ute))|Y(scr|c(y|irc)|opf|uml|Icy|Ucy|fr|acute|Acy))\n| (z(scr|hcy|c(y|aron)|igrarr|opf|dot|e(ta|etrf)|fr|w(nj|j)|acute)|Z(scr|c(y|aron)|Hcy|opf|dot|e(ta|roWidthSpace)|fr|acute))\n)\n(;)\n",
+          "name": "constant.character.entity.named.$2.astro"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.astro"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.astro"
+            }
+          },
+          "match": "(&)#[0-9]+(;)",
+          "name": "constant.character.entity.numeric.decimal.astro"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.astro"
+            },
+            "3": {
+              "name": "punctuation.definition.entity.astro"
+            }
+          },
+          "match": "(&)#[xX][0-9a-fA-F]+(;)",
+          "name": "constant.character.entity.numeric.hexadecimal.astro"
+        },
+        {
+          "match": "&(?=[a-zA-Z0-9]+;)",
+          "name": "invalid.illegal.ambiguous-ampersand.astro"
+        }
+      ]
+    },
     "frontmatter": {
       "begin": "\\A(-{3})\\s*$",
       "beginCaptures": {
@@ -513,9 +557,17 @@
           "include": "#interpolation"
         },
         {
-          "begin": "(?<=>|})",
-          "end": "(?=<|{)",
-          "name": "text.astro"
+          "include": "#entities"
+        },
+        {
+          "begin": "(?<=^|>|})",
+          "end": "(?=<|{|$)",
+          "name": "text.astro",
+          "patterns": [
+            {
+              "include": "#entities"
+            }
+          ]
         }
       ]
     },

package/grammars/markdown.json

@@ -1540,7 +1540,7 @@
       ]
     },
     "fenced_code_block_powershell": {
-      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(powershell|ps1|psm1|psd1)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
+      "begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(powershell|ps1|psm1|psd1|pwsh)((\\s+|:|,|\\{|\\?)[^`]*)?$)",
       "beginCaptures": {
         "3": {
           "name": "punctuation.definition.markdown"

package/grammars/move.json

@@ -15,10 +15,17 @@
       "include": "#script"
     },
     {
-      "include": "#macros"
+      "include": "#attributes"
     }
   ],
   "repository": {
+    "=== DEPRECATED_BELOW ===": {
+    },
+    "abilities": {
+      "comment": "Ability",
+      "match": "\\b(store|key|drop|copy)\\b",
+      "name": "entity.name.type.ability.move"
+    },
     "address": {
       "begin": "\\b(address)\\b",
       "beginCaptures": {
@@ -57,39 +64,19 @@
         }
       ]
     },
-    "address_literal": {
-      "patterns": [
-        {
-          "comment": "16-byte (or shorter) hex address in Libra",
-          "match": "\\b(0x[A-Fa-f0-9][A-Fa-f0-9]{,31})\\b",
-          "name": "support.constant.diem.address.move"
-        },
-        {
-          "comment": "Bech32 with wallet1 prefix - Dfinance format",
-          "match": "\\b(wallet1\\w{38})",
-          "name": "support.constant.dfinance.address.move"
-        },
-        {
-          "comment": "Named address parameter (as build flag)",
-          "match": "\\s([@]\\w+)\\b",
-          "name": "support.constant.named.address.move"
-        }
-      ]
-    },
     "as": {
-      "comment": "Keyword as",
+      "comment": "Keyword as (highlighted)",
       "match": "\\b(as)\\b",
-      "name": "keyword.control.move"
+      "name": "keyword.control.as.move"
     },
     "as-import": {
-      "comment": "Keyword as in import statement",
+      "comment": "Keyword as in import statement; not highlighted",
       "match": "\\b(as)\\b",
-      "name": "meta.import_as.move"
+      "name": "meta.import.as.move"
     },
-    "assert": {
-      "comment": "Assert built-in",
-      "match": "\\b(assert)\\b",
-      "name": "support.function.assert.move"
+    "attributes": {
+      "match": "#\\[(?:[\\w0-9=,_\\(\\)\\s\"\\:=]+)\\]",
+      "name": "support.constant.attribute.move"
     },
     "block": {
       "begin": "{",
@@ -98,43 +85,7 @@
       "name": "meta.block.move",
       "patterns": [
         {
-          "include": "#comments"
-        },
-        {
-          "include": "#as"
-        },
-        {
-          "include": "#mut"
-        },
-        {
-          "include": "#let"
-        },
-        {
-          "include": "#types"
-        },
-        {
-          "include": "#assert"
-        },
-        {
-          "include": "#literals"
-        },
-        {
-          "include": "#control"
-        },
-        {
-          "include": "#move_copy"
-        },
-        {
-          "include": "#resource_methods"
-        },
-        {
-          "include": "#module_access"
-        },
-        {
-          "include": "#fun_call"
-        },
-        {
-          "include": "#block"
+          "include": "#expr"
         }
       ]
     },
@@ -182,9 +133,6 @@
         {
           "include": "#primitives"
         },
-        {
-          "include": "#vector"
-        },
         {
           "include": "#literals"
         },
@@ -199,94 +147,123 @@
       "match": "\\b(return|while|loop|if|else|break|continue|abort)\\b",
       "name": "keyword.control.move"
     },
-    "entry_fun": {
-      "begin": "\\b(entry)\\b",
+    "entry": {
+      "comment": "entry",
+      "match": "\\b(entry)\\b",
+      "name": "storage.modifier.visibility.entry.move"
+    },
+    "enum": {
+      "begin": "\\b(enum)\\b",
       "beginCaptures": {
         "1": {
-          "name": "storage.modifier.entry.move"
+          "name": "keyword.control.enum.move"
         }
       },
-      "comment": "entry fun name() {}",
+      "comment": "Enum syntax",
       "end": "(?<=})",
-      "name": "meta.entry_fun.move",
+      "name": "meta.enum.move",
       "patterns": [
         {
           "include": "#comments"
         },
         {
-          "comment": "entry native function",
-          "match": "\\b(native)\\b",
-          "name": "storage.modifier.native.move"
+          "include": "#escaped_identifier"
         },
         {
-          "comment": "entry public function",
-          "match": "\\b(public)\\b",
-          "name": "storage.modifier.public.move"
+          "include": "#type_param"
         },
         {
-          "include": "#fun"
-        }
-      ]
-    },
-    "friend": {
-      "begin": "\\b(friend)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.type.move"
-        }
-      },
-      "end": ";",
-      "name": "meta.friend.move",
-      "patterns": [
+          "comment": "Enum name (ident)",
+          "match": "\\b[A-Z][a-zA-Z_0-9]*\\b",
+          "name": "entity.name.type.enum.move"
+        },
         {
-          "include": "#comments"
+          "include": "#has"
         },
         {
-          "include": "#address_literal"
+          "include": "#abilities"
         },
         {
-          "comment": "Name of the imported module",
-          "match": "\\b(\\w+)\\b",
-          "name": "entity.name.type.module.move"
+          "begin": "{",
+          "end": "}",
+          "name": "meta.enum.definition.move",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "begin": "\\(",
+              "end": "\\)",
+              "name": "meta.enum.tuple.move",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#types"
+                }
+              ]
+            },
+            {
+              "begin": "{",
+              "end": "}",
+              "name": "meta.enum.struct.move",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#escaped_identifier"
+                },
+                {
+                  "include": "#types"
+                }
+              ]
+            }
+          ]
         }
       ]
     },
-    "fun": {
+    "error_const": {
+      "match": "\\b(E[A-Z][A-Za-z_]*)\\b",
+      "name": "variable.language.error.move"
+    },
+    "escaped_identifier": {
+      "begin": "`",
+      "comment": "Escaped variable",
+      "end": "`",
+      "name": "variable.language.escaped.move"
+    },
+    "expr": {
+      "comment": "Aggregate Expression",
+      "name": "meta.expression.move",
       "patterns": [
         {
-          "include": "#fun_signature"
+          "include": "#comments"
         },
         {
-          "include": "#fun_body"
-        }
-      ]
-    },
-    "fun_body": {
-      "begin": "{",
-      "comment": "Function body",
-      "end": "}",
-      "name": "meta.fun_body.move",
-      "patterns": [
+          "include": "#escaped_identifier"
+        },
         {
-          "include": "#comments"
+          "include": "#expr_generic"
         },
         {
-          "include": "#import"
+          "include": "#error_const"
         },
         {
-          "include": "#as"
+          "include": "#packed_field"
         },
         {
-          "include": "#mut"
+          "include": "#import"
         },
         {
-          "include": "#let"
+          "include": "#as"
         },
         {
-          "include": "#types"
+          "include": "#mut"
         },
         {
-          "include": "#assert"
+          "include": "#let"
         },
         {
           "include": "#literals"
@@ -307,13 +284,97 @@
           "include": "#module_access"
         },
         {
-          "include": "#fun_call"
+          "include": "#label"
+        },
+        {
+          "include": "#macro_call"
+        },
+        {
+          "include": "#local_call"
+        },
+        {
+          "include": "#method_call"
+        },
+        {
+          "include": "#path_access"
+        },
+        {
+          "match": "\\$(?=[a-z])",
+          "name": "keyword.operator.macro.dollar.move"
+        },
+        {
+          "match": "(?<=[$])[a-z][A-Z_0-9a-z]*",
+          "name": "variable.other.meta.move"
+        },
+        {
+          "include": "#paren"
+        },
+        {
+          "include": "#block"
+        }
+      ]
+    },
+    "expr_generic": {
+      "begin": "<(?=([\\sa-z_,0-9A-Z<>]+>))",
+      "comment": "< angle brackets >",
+      "end": ">",
+      "name": "meta.expression.generic.type.move",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#types"
+        },
+        {
+          "include": "#expr_generic"
+        }
+      ]
+    },
+    "friend": {
+      "begin": "\\b(friend)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.type.move"
+        }
+      },
+      "end": ";",
+      "name": "meta.friend.move",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#address_literal"
+        },
+        {
+          "comment": "Name of the imported module",
+          "match": "\\b([a-zA-Z][A-Za-z_0-9]*)\\b",
+          "name": "entity.name.type.module.move"
+        }
+      ]
+    },
+    "fun": {
+      "patterns": [
+        {
+          "include": "#fun_signature"
         },
         {
           "include": "#block"
         }
       ]
     },
+    "fun_body": {
+      "begin": "{",
+      "comment": "Function body",
+      "end": "(?<=})",
+      "name": "meta.fun_body.move",
+      "patterns": [
+        {
+          "include": "#expr"
+        }
+      ]
+    },
     "fun_call": {
       "begin": "\\b(\\w+)\\s*(?:<[\\w\\s,]+>)?\\s*[(]",
       "beginCaptures": {
@@ -389,6 +450,9 @@
             {
               "include": "#comments"
             },
+            {
+              "include": "#escaped_identifier"
+            },
             {
               "match": "\\b(\\w+)\\b",
               "name": "entity.name.function.move"
@@ -428,6 +492,15 @@
         }
       ]
     },
+    "has": {
+      "comment": "Has Abilities",
+      "match": "\\b(has)\\b",
+      "name": "keyword.control.ability.has.move"
+    },
+    "ident": {
+      "match": "\\b([a-zA-Z][A-Z_a-z0-9]*)\\b",
+      "name": "meta.identifier.move"
+    },
     "import": {
       "begin": "\\b(use)\\b",
       "beginCaptures": {
@@ -441,6 +514,9 @@
         {
           "include": "#comments"
         },
+        {
+          "include": "#use_fun"
+        },
         {
           "include": "#address_literal"
         },
@@ -477,6 +553,11 @@
         }
       ]
     },
+    "label": {
+      "comment": "Label",
+      "match": "'[a-z][a-z_0-9]*",
+      "name": "string.quoted.single.label.move"
+    },
     "let": {
       "comment": "Keyword let",
       "match": "\\b(let)\\b",
@@ -489,10 +570,22 @@
       "name": "comment.line.double-slash.move"
     },
     "literals": {
+      "comment": "Literals supported in Move",
+      "name": "meta.literal.move",
       "patterns": [
         {
-          "comment": "Hex literal (still to find out)",
-          "match": "0x[_a-fA-F0-9]+(?:[iu](?:8|16|32|64|size))?",
+          "comment": "base16 address literal",
+          "match": "@0x[A-F0-9a-f]+",
+          "name": "support.constant.address.base16.move"
+        },
+        {
+          "comment": "named address literal @[ident]",
+          "match": "@[a-zA-Z][a-zA-Z_0-9]*",
+          "name": "support.constant.address.name.move"
+        },
+        {
+          "comment": "Hex literal",
+          "match": "0x[_a-fA-F0-9]+(?:u(?:8|16|32|64|128|256))?",
           "name": "constant.numeric.hex.move"
         },
         {
@@ -500,20 +593,11 @@
           "match": "(?<!(?:\\w|(?:(?<!\\.)\\.)))[0-9][_0-9]*(?:\\.(?!\\.)(?:[0-9][_0-9]*)?)?(?:[eE][+\\-]?[_0-9]+)?(?:[u](?:8|16|32|64|128|256))?",
           "name": "constant.numeric.move"
         },
-        {
-          "captures": {
-            "1": {
-              "name": "constant.character.move"
-            }
-          },
-          "comment": "Bytearray hex literal",
-          "match": "\\b(?:h)(\"[a-fA-F0-9]+\")"
-        },
         {
           "begin": "\\bb\"",
-          "comment": "ASCII Bytestring literal",
+          "comment": "vector ascii bytestring literal",
           "end": "\"",
-          "name": "meta.ascii_literal.move",
+          "name": "meta.vector.literal.ascii.move",
           "patterns": [
             {
               "comment": "Special symbol escape",
@@ -533,28 +617,79 @@
           ]
         },
         {
-          "captures": {
-            "1": {
-              "name": "constant.numeric.hex.move"
+          "begin": "x\"",
+          "comment": "vector hex literal",
+          "end": "\"",
+          "name": "meta.vector.literal.hex.move",
+          "patterns": [
+            {
+              "comment": "vector hex literal",
+              "match": "[A-Fa-f0-9]+",
+              "name": "constant.character.move"
             }
-          },
-          "comment": "vector<u8> as hex literal: x",
-          "match": "x\"([A-F0-9a-f]+)\"",
-          "name": "meta.hex_literal.move"
+          ]
         },
         {
-          "comment": "Booleans",
+          "comment": "bool literal",
           "match": "\\b(?:true|false)\\b",
           "name": "constant.language.boolean.move"
         },
         {
-          "include": "#address_literal"
+          "begin": "vector\\[",
+          "comment": "vector literal (macro?)",
+          "end": "\\]",
+          "name": "meta.vector.literal.macro.move",
+          "patterns": [
+            {
+              "include": "#expr"
+            }
+          ]
         }
       ]
     },
-    "macros": {
-      "match": "#\\[(?:[\\w0-9=,_\\(\\)\\s\"\\:=]+)\\]",
-      "name": "support.constant.macro.move"
+    "local_call": {
+      "comment": "call to a local / imported fun",
+      "match": "\\b([a-z][_a-z0-9]*)(?=[<\\(])",
+      "name": "entity.name.function.call.local.move"
+    },
+    "macro": {
+      "begin": "\\b(macro)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.macro.move"
+        }
+      },
+      "comment": "macro fun [ident] {}",
+      "end": "(?<=})",
+      "name": "meta.macro.move",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#fun"
+        }
+      ]
+    },
+    "macro_call": {
+      "captures": {
+        "2": {
+          "name": "support.function.macro.move"
+        }
+      },
+      "comment": "Macro fun call",
+      "match": "(\\b|\\.)([a-z][A-Za-z0-9_]*)!",
+      "name": "meta.macro.call"
+    },
+    "method_call": {
+      "captures": {
+        "1": {
+          "name": "entity.name.function.call.path.move"
+        }
+      },
+      "comment": "<expr>.[ident]<>?() call",
+      "match": "\\.([a-z][_a-z0-9]*)(?=[<\\(])",
+      "name": "meta.path.call.move"
     },
     "module": {
       "begin": "\\b(module|spec)\\b",
@@ -578,6 +713,9 @@
             {
               "include": "#comments"
             },
+            {
+              "include": "#escaped_identifier"
+            },
             {
               "begin": "(?<=(module|spec))",
               "comment": "Module namespace / address",
@@ -602,7 +740,19 @@
               "include": "#comments"
             },
             {
-              "include": "#macros"
+              "include": "#attributes"
+            },
+            {
+              "include": "#entry"
+            },
+            {
+              "include": "#public-scope"
+            },
+            {
+              "include": "#public"
+            },
+            {
+              "include": "#native"
             },
             {
               "include": "#import"
@@ -617,13 +767,10 @@
               "include": "#struct"
             },
             {
-              "include": "#entry_fun"
+              "include": "#enum"
             },
             {
-              "include": "#native_fun"
-            },
-            {
-              "include": "#public_fun"
+              "include": "#macro"
             },
             {
               "include": "#fun"
@@ -657,39 +804,35 @@
       "name": "variable.language.move"
     },
     "mut": {
-      "comment": "&mut reference",
-      "match": "(?<=&)(mut)\\b",
+      "comment": "Mutable reference and let mut",
+      "match": "\\b(mut)\\b",
       "name": "storage.modifier.mut.move"
     },
-    "native_fun": {
-      "begin": "\\b(native)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.native.move"
-        }
-      },
-      "comment": "Native function",
-      "end": "(?<=[;}])",
-      "name": "meta.native_fun.move",
+    "native": {
+      "comment": "native",
+      "match": "\\b(native)\\b",
+      "name": "storage.modifier.visibility.native.move"
+    },
+    "packed_field": {
+      "comment": "[ident]: ",
+      "match": "[a-z][a-z0-9_]+\\s*:\\s[^:]",
+      "name": "meta.struct.field.move"
+    },
+    "paren": {
+      "begin": "\\(",
+      "end": "\\)",
+      "name": "meta.paren.move",
       "patterns": [
         {
-          "include": "#comments"
-        },
-        {
-          "comment": "native public function",
-          "match": "\\b(public)\\b",
-          "name": "storage.modifier.public.move"
-        },
-        {
-          "comment": "native entry function",
-          "match": "\\b(entry)\\b",
-          "name": "storage.modifier.entry.move"
-        },
-        {
-          "include": "#fun_signature"
+          "include": "#expr"
         }
       ]
     },
+    "path_access": {
+      "comment": "<expr>.[ident] access",
+      "match": "\\.[a-z][_a-z0-9]*\\b",
+      "name": "meta.path.access.move"
+    },
     "phantom": {
       "comment": "Keyword phantom inside type parameters",
       "match": "\\b(phantom)\\b",
@@ -700,47 +843,23 @@
       "match": "\\b(u8|u16|u32|u64|u128|u256|address|bool|signer)\\b",
       "name": "support.type.primitives.move"
     },
-    "public_fun": {
-      "begin": "\\b(public)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.public.move"
-        }
-      },
-      "comment": "Public function",
-      "end": "(?<=[;}])",
-      "name": "meta.public_fun.move",
+    "public": {
+      "comment": "public",
+      "match": "\\b(public)\\b",
+      "name": "storage.modifier.visibility.public.move"
+    },
+    "public-scope": {
+      "begin": "(?<=(public))\\s*\\(",
+      "comment": "public (friend/script/package)",
+      "end": "\\)",
+      "name": "meta.public.scoped.move",
       "patterns": [
         {
           "include": "#comments"
         },
         {
-          "comment": "Public native function",
-          "match": "\\b(native)\\b",
-          "name": "storage.modifier.native.move"
-        },
-        {
-          "comment": "Public entry function",
-          "match": "\\b(entry)\\b",
-          "name": "storage.modifier.entry.move"
-        },
-        {
-          "begin": "\\(",
-          "comment": "Script visibility",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#comments"
-            },
-            {
-              "comment": "Friend or Script visibility",
-              "match": "\\b(script|friend)\\b",
-              "name": "storage.modifier.public.script.move"
-            }
-          ]
-        },
-        {
-          "include": "#fun"
+          "match": "\\b(friend|script|package)\\b",
+          "name": "keyword.control.public.scope.move"
         }
       ]
     },
@@ -945,7 +1064,7 @@
           "name": "storage.modifier.type.move"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=[};])",
       "name": "meta.struct.move",
       "patterns": [
         {
@@ -954,37 +1073,64 @@
         {
           "begin": "(?<=struct)",
           "comment": "Struct definition",
-          "end": "(?={)",
-          "name": "meta.struct_def.move",
+          "end": "(?=[;{])",
+          "name": "meta.struct.definition.move",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "comment": "Has Abilities",
-              "match": "\\b(has)\\b",
-              "name": "keyword.control.ability.has.move"
+              "include": "#escaped_identifier"
             },
             {
-              "comment": "Ability",
-              "match": "\\b(store|key|drop|copy)\\b",
-              "name": "entity.name.type.ability.move"
+              "include": "#has"
             },
             {
-              "comment": "Struct name",
-              "match": "\\b(\\w+)\\b",
-              "name": "entity.name.type.move"
+              "include": "#abilities"
+            },
+            {
+              "comment": "Struct name (ident)",
+              "match": "\\b[A-Z][a-zA-Z_0-9]*\\b",
+              "name": "entity.name.type.struct.move"
+            },
+            {
+              "begin": "\\(",
+              "comment": "Simple struct",
+              "end": "\\)",
+              "name": "meta.struct.paren.move",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#types"
+                }
+              ]
             },
             {
               "include": "#type_param"
             }
           ]
         },
+        {
+          "begin": "\\(",
+          "comment": "Simple struct",
+          "end": "\\)",
+          "name": "meta.struct.paren.move",
+          "patterns": [
+            {
+              "include": "#comments"
+            },
+            {
+              "include": "#types"
+            }
+          ]
+        },
         {
           "begin": "{",
           "comment": "Struct body",
           "end": "}",
-          "name": "meta.struct_body.move",
+          "name": "meta.struct.body.move",
           "patterns": [
             {
               "include": "#comments"
@@ -1002,6 +1148,17 @@
         }
       ]
     },
+    "struct_pack": {
+      "begin": "(?<=[A-Za-z0-9_>])\\s*{",
+      "comment": "Struct { field: value... }; identified as generic / ident followed by curly's",
+      "end": "}",
+      "name": "meta.struct.pack.move",
+      "patterns": [
+        {
+          "include": "#comments"
+        }
+      ]
+    },
     "type_param": {
       "begin": "<",
       "comment": "Generic type param",
@@ -1018,9 +1175,7 @@
           "include": "#module_access"
         },
         {
-          "comment": "Trait-like condition",
-          "match": "\\b(store|drop|key|copy)\\b",
-          "name": "entity.name.type.kind.move"
+          "include": "#abilities"
         }
       ]
     },
@@ -1036,7 +1191,7 @@
         },
         {
           "comment": "Capitalized type names",
-          "match": "\\b([A-Z][A-Za-z_]+)\\b",
+          "match": "\\b([A-Z][A-Za-z_]*)\\b",
           "name": "entity.name.type"
         },
         {
@@ -1046,23 +1201,39 @@
         }
       ]
     },
-    "vector": {
-      "begin": "\\b(vector)<",
+    "use_fun": {
+      "begin": "\\b(fun)\\b",
       "beginCaptures": {
         "1": {
-          "name": "support.type.vector.move"
+          "name": "storage.modifier.fun.move"
         }
       },
-      "end": ">",
-      "name": "meta.vector.move",
+      "comment": "use { fun } internals",
+      "end": "(?=;)",
+      "name": "meta.import.fun.move",
       "patterns": [
         {
-          "include": "#primitives"
+          "include": "#comments"
         },
         {
-          "include": "#vector"
+          "include": "#as-import"
+        },
+        {
+          "comment": "Self keyword",
+          "match": "\\b(Self)\\b",
+          "name": "variable.language.self.use.fun.move"
+        },
+        {
+          "comment": "Function name",
+          "match": "\\b([a-z][a-z_0-9]+)\\b",
+          "name": "entity.name.function.use.move"
         }
       ]
+    },
+    "vector": {
+      "comment": "vector type",
+      "match": "\\b(vector)\\b",
+      "name": "support.type.vector.move"
     }
   },
   "scopeName": "source.move"

package/index.js

@@ -152,7 +152,7 @@ export const grammars = [
     source: 'https://github.com/13xforever/x86_64-assembly-vscode/blob/15c07b12741ac75f5bb6e7701dc7c0d742add8dd/syntaxes/language-x86_64-assembly.tmLanguage',
   },
   {
-    byteSize: 10881,
+    byteSize: 23427,
     categories: [
       'web',
     ],
@@ -169,13 +169,13 @@ export const grammars = [
       'postcss',
       'tsx',
     ],
-    lastUpdate: '2023-12-29T02:14:17Z',
+    lastUpdate: '2024-03-13T17:14:29Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/withastro/language-tools/main/LICENSE',
     name: 'astro',
     scopeName: 'source.astro',
-    sha: '37434ab5ee2149dd74a7c1e800d8c279a0617912',
-    source: 'https://github.com/withastro/language-tools/blob/37434ab5ee2149dd74a7c1e800d8c279a0617912/packages/vscode/syntaxes/astro.tmLanguage.src.yaml',
+    sha: 'db49ff7cbeb2910ddac6ce0b15f3973b72827ccd',
+    source: 'https://github.com/withastro/language-tools/blob/db49ff7cbeb2910ddac6ce0b15f3973b72827ccd/packages/vscode/syntaxes/astro.tmLanguage.src.yaml',
   },
   {
     byteSize: 5303,
@@ -1489,7 +1489,7 @@ export const grammars = [
     aliases: [
       'md',
     ],
-    byteSize: 53837,
+    byteSize: 53842,
     categories: [
       'web',
       'markup',
@@ -1549,13 +1549,13 @@ export const grammars = [
       'bibtex',
       'html-derivative',
     ],
-    lastUpdate: '2023-12-13T12:08:01Z',
+    lastUpdate: '2024-03-13T17:25:52Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt',
     name: 'markdown',
     scopeName: 'text.html.markdown',
-    sha: '3c86ede5f554f6e196c832394e126b291a1de606',
-    source: 'https://github.com/microsoft/vscode/blob/3c86ede5f554f6e196c832394e126b291a1de606/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json',
+    sha: '6b0a582e595fab7da09fcd267f4f8248e7ec437e',
+    source: 'https://github.com/microsoft/vscode/blob/6b0a582e595fab7da09fcd267f4f8248e7ec437e/extensions/markdown-basics/syntaxes/markdown.tmLanguage.json',
   },
   {
     byteSize: 18747,
@@ -1689,15 +1689,15 @@ export const grammars = [
     source: 'https://github.com/modularml/mojo-syntax/blob/a2241dda06d9a20503394c3affa606114d007049/syntaxes/mojo.syntax.json',
   },
   {
-    byteSize: 14150,
+    byteSize: 16667,
     displayName: 'Move',
-    lastUpdate: '2023-05-22T07:53:33Z',
+    lastUpdate: '2024-03-13T20:37:02Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE',
     name: 'move',
     scopeName: 'source.move',
-    sha: 'de9244e81505ff9154dc9422dbce434ac86fb981',
-    source: 'https://github.com/damirka/move-syntax/blob/de9244e81505ff9154dc9422dbce434ac86fb981/syntaxes/move.tmLanguage.json',
+    sha: 'ec2884fdaee236db42d8999e5f9cd2923e317f8b',
+    source: 'https://github.com/damirka/move-syntax/blob/ec2884fdaee236db42d8999e5f9cd2923e317f8b/syntaxes/move.tmLanguage.json',
   },
   {
     aliases: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "packageManager": "pnpm@8.15.1",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",