tm-grammars 1.12.8 → 1.12.9

package/README.md

@@ -134,7 +134,7 @@ import { grammars } from 'tm-grammars'
 | `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) |  | 24.78 kB |
 | `mojo` |  | [modularml/mojo-syntax](https://github.com/modularml/mojo-syntax/blob/46eccdaeda2b1587e9b82808cdb35670f359d16d/syntaxes/mojo.syntax.json) | [MIT](https://raw.githubusercontent.com/modularml/mojo-syntax/main/LICENSE) |  | 72.91 kB |
-| `move` |  | [damirka/move-syntax](https://github.com/damirka/move-syntax/blob/7909b9096669930da1c9c08a2202e991c7187bfe/syntaxes/move.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE) |  | 17.41 kB |
+| `move` |  | [damirka/move-syntax](https://github.com/damirka/move-syntax/blob/4a9b54dbbebf6156ae987d4b9710191dd5952a7d/syntaxes/move.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE) |  | 18.46 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/move.json

@@ -15,13 +15,58 @@
       "include": "#script"
     },
     {
-      "include": "#attributes"
+      "include": "#annotation"
     },
     {
       "begin": "\\b(while)\\b",
       "comment": "While experiment",
       "name": "keyword.control.while.whaaat.move",
       "while": "[a-z]"
+    },
+    {
+      "include": "#comments"
+    },
+    {
+      "include": "#annotation"
+    },
+    {
+      "include": "#entry"
+    },
+    {
+      "include": "#public-scope"
+    },
+    {
+      "include": "#public"
+    },
+    {
+      "include": "#native"
+    },
+    {
+      "include": "#import"
+    },
+    {
+      "include": "#friend"
+    },
+    {
+      "include": "#const"
+    },
+    {
+      "include": "#struct"
+    },
+    {
+      "include": "#has_ability"
+    },
+    {
+      "include": "#enum"
+    },
+    {
+      "include": "#macro"
+    },
+    {
+      "include": "#fun"
+    },
+    {
+      "include": "#spec"
     }
   ],
   "repository": {
@@ -70,6 +115,29 @@
         }
       ]
     },
+    "annotation": {
+      "begin": "#\\[",
+      "end": "\\]",
+      "name": "support.constant.annotation.move",
+      "patterns": [
+        {
+          "comment": "Annotation name",
+          "match": "\\b(\\w+)\\s*(?=\\=)",
+          "name": "meta.annotation.name.move"
+        },
+        {
+          "begin": "=",
+          "comment": "Annotation value",
+          "end": "(?=[,\\]])",
+          "name": "meta.annotation.value.move",
+          "patterns": [
+            {
+              "include": "#literals"
+            }
+          ]
+        }
+      ]
+    },
     "as": {
       "comment": "Keyword as (highlighted)",
       "match": "\\b(as)\\b",
@@ -80,10 +148,6 @@
       "match": "\\b(as)\\b",
       "name": "meta.import.as.move"
     },
-    "attributes": {
-      "match": "#\\[(?:[\\w0-9=,_\\(\\)\\s\"\\:=]+)\\]",
-      "name": "support.constant.attribute.move"
-    },
     "block": {
       "begin": "{",
       "comment": "Block expression or definition",
@@ -96,7 +160,6 @@
       ]
     },
     "block-comments": {
-      "comment": "Supported since https://github.com/diem/diem/pull/3714",
       "patterns": [
         {
           "begin": "/\\*[\\*!](?![\\*/])",
@@ -781,7 +844,7 @@
         }
       },
       "comment": "Module definition",
-      "end": "(?<=})",
+      "end": "(?<=[;}])",
       "name": "meta.module.move",
       "patterns": [
         {
@@ -790,7 +853,7 @@
         {
           "begin": "(?<=(module|spec))",
           "comment": "Module name",
-          "end": "(?={)",
+          "end": "(?=[;{])",
           "patterns": [
             {
               "include": "#comments"
@@ -802,13 +865,29 @@
               "begin": "(?<=\\b(module|spec))",
               "comment": "Module namespace / address",
               "end": "(?=[(::){])",
-              "name": "constant.other.move"
+              "name": "constant.other.move",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#escaped_identifier"
+                }
+              ]
             },
             {
               "begin": "(?<=::)",
               "comment": "Module name",
-              "end": "(?=[\\s{])",
-              "name": "entity.name.type.move"
+              "end": "(?=[\\s;{])",
+              "name": "entity.name.type.move",
+              "patterns": [
+                {
+                  "include": "#comments"
+                },
+                {
+                  "include": "#escaped_identifier"
+                }
+              ]
             }
           ]
         },
@@ -822,7 +901,7 @@
               "include": "#comments"
             },
             {
-              "include": "#attributes"
+              "include": "#annotation"
             },
             {
               "include": "#entry"
@@ -880,6 +959,32 @@
       "match": "\\b(\\w+)::(\\w+)\\b",
       "name": "meta.module_access.move"
     },
+    "module_label": {
+      "begin": "^\\s*(module)\\b",
+      "comment": "Module label, inline module definition",
+      "end": ";\\s*$",
+      "name": "meta.module.label.move",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#escaped_identifier"
+        },
+        {
+          "begin": "(?<=\\b(module|spec))",
+          "comment": "Module namespace / address",
+          "end": "(?=[(::){])",
+          "name": "constant.other.move"
+        },
+        {
+          "begin": "(?<=::)",
+          "comment": "Module name",
+          "end": "(?=[\\s{])",
+          "name": "entity.name.type.move"
+        }
+      ]
+    },
     "move_copy": {
       "comment": "Keywords move and copy",
       "match": "\\b(move|copy)\\b",

package/index.js

@@ -1899,15 +1899,15 @@ export const grammars = [
     source: 'https://github.com/modularml/mojo-syntax/blob/46eccdaeda2b1587e9b82808cdb35670f359d16d/syntaxes/mojo.syntax.json',
   },
   {
-    byteSize: 17828,
+    byteSize: 18899,
     displayName: 'Move',
-    lastUpdate: '2024-05-24T08:48:59Z',
+    lastUpdate: '2024-06-08T23:07:51Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE',
     name: 'move',
     scopeName: 'source.move',
-    sha: '7909b9096669930da1c9c08a2202e991c7187bfe',
-    source: 'https://github.com/damirka/move-syntax/blob/7909b9096669930da1c9c08a2202e991c7187bfe/syntaxes/move.tmLanguage.json',
+    sha: '4a9b54dbbebf6156ae987d4b9710191dd5952a7d',
+    source: 'https://github.com/damirka/move-syntax/blob/4a9b54dbbebf6156ae987d4b9710191dd5952a7d/syntaxes/move.tmLanguage.json',
   },
   {
     aliases: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.12.8",
+  "version": "1.12.9",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",