@sava-info-systems/api-maker-with-extensions 1.19.5 → 1.19.7

package/dist/assets/monaco-assets/grammars/rust.tmLanguage.json

@@ -1,11 +1,9 @@
 {
-  "information_for_contributors": [
-    "This file has been converted from https://github.com/dustypomerleau/rust-syntax/blob/master/syntaxes/rust.tmLanguage.json",
-    "If you want to provide a fix or improvement, please create a pull request against the original repository.",
-    "Once accepted there, we are happy to receive an update request."
-  ],
-  "version": "https://github.com/dustypomerleau/rust-syntax/commit/20462d50ff97338f42c6b64c3f421c634fd60734",
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
   "name": "Rust",
+  "fileTypes": [
+    "rs"
+  ],
   "scopeName": "source.rust",
   "patterns": [
     {
@@ -52,7 +50,7 @@
     {
       "comment": "macro type metavariables",
       "name": "meta.macro.metavariable.type.rust",
-      "match": "(\\$)((crate)|([A-Z][A-Za-z0-9_]*))((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
+      "match": "(\\$)((crate)|([A-Z]\\w*))(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?",
       "captures": {
         "1": {
           "name": "keyword.operator.macro.dollar.rust"
@@ -79,7 +77,7 @@
     {
       "comment": "macro metavariables",
       "name": "meta.macro.metavariable.rust",
-      "match": "(\\$)([a-z][A-Za-z0-9_]*)((:)(block|expr|ident|item|lifetime|literal|meta|path?|stmt|tt|ty|vis))?",
+      "match": "(\\$)([a-z]\\w*)(\\s*(:)\\s*(block|expr(?:_2021)?|ident|item|lifetime|literal|meta|pat(?:_param)?|path|stmt|tt|ty|vis)\\b)?",
       "captures": {
         "1": {
           "name": "keyword.operator.macro.dollar.rust"
@@ -119,54 +117,6 @@
         }
       }
     },
-    {
-      "comment": "attributes",
-      "name": "meta.attribute.rust",
-      "begin": "(#)(\\!?)(\\[)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.attribute.rust"
-        },
-        "2": {
-          "name": "keyword.operator.attribute.inner.rust"
-        },
-        "3": {
-          "name": "punctuation.brackets.attribute.rust"
-        }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.brackets.attribute.rust"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#block-comments"
-        },
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#keywords"
-        },
-        {
-          "include": "#lifetimes"
-        },
-        {
-          "include": "#punctuation"
-        },
-        {
-          "include": "#strings"
-        },
-        {
-          "include": "#gtypes"
-        },
-        {
-          "include": "#types"
-        }
-      ]
-    },
     {
       "comment": "modules",
       "match": "(mod)\\s+((?:r#(?!crate|[Ss]elf|super))?[a-z][A-Za-z0-9_]*)",
@@ -257,6 +207,9 @@
     {
       "include": "#comments"
     },
+    {
+      "include": "#attributes"
+    },
     {
       "include": "#lvariables"
     },
@@ -300,12 +253,22 @@
         {
           "comment": "documentation comments",
           "name": "comment.line.documentation.rust",
-          "match": "^\\s*///.*"
+          "match": "(///).*$",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.rust"
+            }
+          }
         },
         {
           "comment": "line comments",
           "name": "comment.line.double-slash.rust",
-          "match": "\\s*//.*"
+          "match": "(//).*$",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.rust"
+            }
+          }
         }
       ]
     },
@@ -362,7 +325,7 @@
         {
           "comment": "decimal integers and floats",
           "name": "constant.numeric.decimal.rust",
-          "match": "\\b\\d[\\d_]*(\\.?)[\\d_]*(?:(E)([+-])([\\d_]+))?(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
+          "match": "\\b\\d[\\d_]*(\\.?)[\\d_]*(?:(E|e)([+-]?)([\\d_]+))?(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
           "captures": {
             "1": {
               "name": "punctuation.separator.dot.decimal.rust"
@@ -421,7 +384,7 @@
     "escapes": {
       "comment": "escapes: ASCII, byte, Unicode, quote, regex",
       "name": "constant.character.escape.rust",
-      "match": "(\\\\)(?:(?:(x[0-7][0-7a-fA-F])|(u(\\{)[\\da-fA-F]{4,6}(\\}))|.))",
+      "match": "(\\\\)(?:(?:(x[0-7][\\da-fA-F])|(u(\\{)[\\da-fA-F]{4,6}(\\}))|.))",
       "captures": {
         "1": {
           "name": "constant.character.escape.backslash.rust"
@@ -440,6 +403,51 @@
         }
       }
     },
+    "attributes": {
+      "comment": "attributes",
+      "name": "meta.attribute.rust",
+      "begin": "(#)(\\!?)(\\[)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.attribute.rust"
+        },
+        "3": {
+          "name": "punctuation.brackets.attribute.rust"
+        }
+      },
+      "end": "\\]",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.brackets.attribute.rust"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#block-comments"
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#lifetimes"
+        },
+        {
+          "include": "#punctuation"
+        },
+        {
+          "include": "#strings"
+        },
+        {
+          "include": "#gtypes"
+        },
+        {
+          "include": "#types"
+        }
+      ]
+    },
     "functions": {
       "patterns": [
         {
@@ -472,10 +480,13 @@
               "name": "punctuation.brackets.angle.rust"
             }
           },
-          "end": "\\{|;",
+          "end": "(\\{)|(;)",
           "endCaptures": {
-            "0": {
+            "1": {
               "name": "punctuation.brackets.curly.rust"
+            },
+            "2": {
+              "name": "punctuation.semi.rust"
             }
           },
           "patterns": [
@@ -548,6 +559,9 @@
             {
               "include": "#comments"
             },
+            {
+              "include": "#attributes"
+            },
             {
               "include": "#keywords"
             },
@@ -608,6 +622,9 @@
             {
               "include": "#comments"
             },
+            {
+              "include": "#attributes"
+            },
             {
               "include": "#keywords"
             },
@@ -693,7 +710,7 @@
         {
           "comment": "other keywords",
           "name": "keyword.other.rust",
-          "match": "\\b(as|async|become|box|dyn|move|final|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual|where)\\b"
+          "match": "\\b(as|async|become|box|dyn|move|final|gen|impl|in|override|priv|pub|ref|typeof|union|unsafe|unsized|use|virtual|where)\\b"
         },
         {
           "comment": "fn",
@@ -804,7 +821,7 @@
         {
           "comment": "dashrocket, skinny arrow",
           "name": "keyword.operator.arrow.skinny.rust",
-          "match": "->"
+          "match": "->|<-"
         },
         {
           "comment": "hashrocket, fat arrow",
@@ -888,7 +905,7 @@
       "patterns": [
         {
           "comment": "namespace (non-type, non-function path segment)",
-          "match": "(?<![A-Za-z0-9_])([a-z0-9_]+)((?<!super|self)::)",
+          "match": "(?<![A-Za-z0-9_])([A-Za-z0-9_]+)((?<!super|self)::)",
           "captures": {
             "1": {
               "name": "entity.name.namespace.rust"
@@ -913,7 +930,7 @@
         },
         {
           "comment": "parameterized types",
-          "begin": "\\b([A-Z][A-Za-z0-9]*)(<)",
+          "begin": "\\b(_?[A-Z][A-Za-z0-9_]*)(<)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.type.rust"
@@ -962,7 +979,7 @@
         },
         {
           "comment": "trait declarations",
-          "match": "\\b(trait)\\s+([A-Z][A-Za-z0-9]*)\\b",
+          "match": "\\b(trait)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b",
           "captures": {
             "1": {
               "name": "keyword.declaration.trait.rust storage.type.rust"
@@ -974,7 +991,7 @@
         },
         {
           "comment": "struct declarations",
-          "match": "\\b(struct)\\s+([A-Z][A-Za-z0-9]*)\\b",
+          "match": "\\b(struct)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b",
           "captures": {
             "1": {
               "name": "keyword.declaration.struct.rust storage.type.rust"
@@ -986,7 +1003,7 @@
         },
         {
           "comment": "enum declarations",
-          "match": "\\b(enum)\\s+([A-Z][A-Za-z0-9_]*)\\b",
+          "match": "\\b(enum)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b",
           "captures": {
             "1": {
               "name": "keyword.declaration.enum.rust storage.type.rust"
@@ -998,7 +1015,7 @@
         },
         {
           "comment": "type declarations",
-          "match": "\\b(type)\\s+([A-Z][A-Za-z0-9_]*)\\b",
+          "match": "\\b(type)\\s+(_?[A-Z][A-Za-z0-9_]*)\\b",
           "captures": {
             "1": {
               "name": "keyword.declaration.type.rust storage.type.rust"
@@ -1011,7 +1028,7 @@
         {
           "comment": "types",
           "name": "entity.name.type.rust",
-          "match": "\\b[A-Z][A-Za-z0-9]*\\b(?!!)"
+          "match": "\\b_?[A-Z][A-Za-z0-9_]*\\b(?!!)"
         }
       ]
     },
@@ -1167,4 +1184,4 @@
       ]
     }
   }
-}
+}