tm-grammars 1.22.18 → 1.23.0

package/grammars/csv.json

@@ -38,7 +38,7 @@
           "name": "markup.bold.rainbow9"
         }
       },
-      "match": "((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?((?: *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$))|(?:[^,]*(?:,|$)))?",
+      "match": "( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?( *\"(?:[^\"]*\"\")*[^\"]*\" *(?:,|$)|[^,]*(?:,|$))?",
       "name": "rainbowgroup"
     }
   ],

package/grammars/cue.json

@@ -20,12 +20,12 @@
           "name": "entity.name.namespace"
         }
       },
-      "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(package)[ \\t]+([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)(?![\\p{L}\\p{Nd}_\\$\\#])"
+      "match": "(?<![\\p{L}\\d_$#])(package)[ \\t]+([\\p{L}$#][\\p{L}\\d_$#]*)(?![\\p{L}\\d_$#])"
     },
     {
       "patterns": [
         {
-          "begin": "(?<![\\p{L}\\p{Nd}_\\$\\#])(import)[ \\t]+(\\()",
+          "begin": "(?<![\\p{L}\\d_$#])(import)[ \\t]+(\\()",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.import"
@@ -69,7 +69,7 @@
                   "name": "punctuation.definition.string.end"
                 }
               },
-              "match": "(?:([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*))?(\")",
+              "match": "(?:([\\p{L}$#][\\p{L}\\d_$#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}$#][\\p{L}\\d_$#]*))?(\")",
               "name": "meta.import-spec"
             },
             {
@@ -105,7 +105,7 @@
               "name": "punctuation.definition.string.end"
             }
           },
-          "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(import)[ \\t]+(?:([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*))?(\")",
+          "match": "(?<![\\p{L}\\d_$#])(import)[ \\t]+(?:([\\p{L}$#][\\p{L}\\d_$#]*)[ \\t]+)?(\")([^:\"]+)(?:(:)([\\p{L}$#][\\p{L}\\d_$#]*))?(\")",
           "name": "meta.import"
         }
       ]
@@ -124,7 +124,7 @@
     "attribute_element": {
       "patterns": [
         {
-          "begin": "([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(=)",
+          "begin": "([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(=)",
           "beginCaptures": {
             "1": {
               "name": "variable.other"
@@ -133,7 +133,7 @@
               "name": "punctuation.bind"
             }
           },
-          "end": "(?=[,\\)])",
+          "end": "(?=[,)])",
           "patterns": [
             {
               "include": "#attribute_string"
@@ -141,7 +141,7 @@
           ]
         },
         {
-          "begin": "([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(\\()",
+          "begin": "([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.other"
@@ -176,11 +176,11 @@
           "include": "#string"
         },
         {
-          "match": "[^\\n,\"'#=\\(\\)]+",
+          "match": "[^\\n,\"'#=()]+",
           "name": "string.unquoted"
         },
         {
-          "match": "[^,\\)]+",
+          "match": "[^,)]+",
           "name": "invalid"
         }
       ]
@@ -211,7 +211,7 @@
     "declaration": {
       "patterns": [
         {
-          "begin": "(@)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(\\()",
+          "begin": "(@)([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(\\()",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.annotation"
@@ -285,10 +285,10 @@
                   "name": "keyword.control.in"
                 }
               },
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(for)[ \\t]+([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(?:[ \\t]*(,)[ \\t]*([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+))?[ \\t]+(in)(?![\\p{L}\\p{Nd}_\\$\\#])"
+              "match": "(?<![\\p{L}\\d_$#])(for)[ \\t]+([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(?:[ \\t]*(,)[ \\t]*([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+))?[ \\t]+(in)(?![\\p{L}\\d_$#])"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])if(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])if(?![\\p{L}\\d_$#])",
               "name": "keyword.control.conditional"
             },
             {
@@ -303,22 +303,22 @@
                   "name": "punctuation.bind"
                 }
               },
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(let)[ \\t]+([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)[ \\t]*(=)(?![=])"
+              "match": "(?<![\\p{L}\\d_$#])(let)[ \\t]+([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)[ \\t]*(=)(?!=)"
             }
           ]
         },
         {
           "patterns": [
             {
-              "match": "[\\+\\-\\*]|/(?![/*])",
+              "match": "[+\\-*]|/(?![/*])",
               "name": "keyword.operator"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:div|mod|quo|rem)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:div|mod|quo|rem)(?![\\p{L}\\d_$#])",
               "name": "keyword.operator.word"
             },
             {
-              "match": "=[=~]|![=~]|<=|>=|[<](?![-=])|[>](?![=])",
+              "match": "=[=~]|![=~]|<=|>=|<(?![\\-=])|>(?!=)",
               "name": "keyword.operator.comparison"
             },
             {
@@ -340,24 +340,24 @@
               "name": "variable.other.member"
             }
           },
-          "match": "(?<!\\.)(\\.)([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(?![\\p{L}\\p{Nd}_\\$\\#])"
+          "match": "(?<!\\.)(\\.)([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(?![\\p{L}\\d_$#])"
         },
         {
           "patterns": [
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])_(?!\\|)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])_(?!\\|)(?![\\p{L}\\d_$#])",
               "name": "constant.language.top"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])_\\|_(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])_\\|_(?![\\p{L}\\d_$#])",
               "name": "constant.language.bottom"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])null(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])null(?![\\p{L}\\d_$#])",
               "name": "constant.language.null"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:true|false)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:true|false)(?![\\p{L}\\d_$#])",
               "name": "constant.language.bool"
             },
             {
@@ -365,15 +365,15 @@
                 {
                   "patterns": [
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])[0-9](?:_?[0-9])*\\.(?:[0-9](?:_?[0-9])*)?(?:[eE][\\+\\-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])[0-9](?:_?[0-9])*\\.(?:[0-9](?:_?[0-9])*)?(?:[eE][+\\-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.float.decimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])[0-9](?:_?[0-9])*[eE][\\+\\-]?[0-9](?:_?[0-9])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])[0-9](?:_?[0-9])*[eE][+\\-]?[0-9](?:_?[0-9])*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.float.decimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])\\.[0-9](?:_?[0-9])*(?:[eE][\\+\\-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])\\.[0-9](?:_?[0-9])*(?:[eE][+\\-]?[0-9](?:_?[0-9])*)?(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.float.decimal"
                     }
                   ]
@@ -383,29 +383,29 @@
                     {
                       "patterns": [
                         {
-                          "match": "(?<![\\p{L}\\p{Nd}_\\.])(?:0|[1-9](?:_?[0-9])*)(?:\\.[0-9](?:_?[0-9])*)?(?:[KMGTPEYZ]i?)(?![\\p{L}\\p{Nd}_\\.])",
+                          "match": "(?<![\\p{L}\\d_.])(?:0|[1-9](?:_?[0-9])*)(?:\\.[0-9](?:_?[0-9])*)?[KMGTPEYZ]i?(?![\\p{L}\\d_.])",
                           "name": "constant.numeric.integer.other"
                         },
                         {
-                          "match": "(?<![\\p{L}\\p{Nd}_\\.])\\.[0-9](?:_?[0-9])*(?:[KMGTPEYZ]i?)(?![\\p{L}\\p{Nd}_\\.])",
+                          "match": "(?<![\\p{L}\\d_.])\\.[0-9](?:_?[0-9])*[KMGTPEYZ]i?(?![\\p{L}\\d_.])",
                           "name": "constant.numeric.integer.other"
                         }
                       ]
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])(?:0|[1-9](?:_?[0-9])*)(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])(?:0|[1-9](?:_?[0-9])*)(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.decimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])0b[0-1](?:_?[0-1])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])0b[0-1](?:_?[0-1])*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.binary"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])0[xX][0-9a-fA-F](?:_?[0-9a-fA-F])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])0[xX]\\h(?:_?\\h)*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.hexadecimal"
                     },
                     {
-                      "match": "(?<![\\p{L}\\p{Nd}_\\.])0o?[0-7](?:_?[0-7])*(?![\\p{L}\\p{Nd}_\\.])",
+                      "match": "(?<![\\p{L}\\d_.])0o?[0-7](?:_?[0-7])*(?![\\p{L}\\d_.])",
                       "name": "constant.numeric.integer.octal"
                     }
                   ]
@@ -416,13 +416,13 @@
               "include": "#string"
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:bool|u?int(?:8|16|32|64|128)?|float(?:32|64)?|string|bytes|number|rune)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:bool|u?int(?:8|16|32|64|128)?|float(?:32|64)?|string|bytes|number|rune)(?![\\p{L}\\d_$#])",
               "name": "support.type"
             },
             {
               "patterns": [
                 {
-                  "begin": "(?<![\\p{L}\\p{Nd}_\\$\\#])(len|close|and|or)(\\()",
+                  "begin": "(?<![\\p{L}\\d_$#])(len|close|and|or)(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "support.function"
@@ -457,7 +457,7 @@
                   ]
                 },
                 {
-                  "begin": "(?<![\\p{L}\\p{Nd}_\\$\\#])([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*)(\\.)(\\p{Lu}[\\p{L}\\p{Nd}_\\$\\#]*)(\\()",
+                  "begin": "(?<![\\p{L}\\d_$#])([\\p{L}$#][\\p{L}\\d_$#]*)(\\.)(\\p{Lu}[\\p{L}\\d_$#]*)(\\()",
                   "beginCaptures": {
                     "1": {
                       "name": "support.module"
@@ -500,7 +500,7 @@
               ]
             },
             {
-              "match": "(?<![\\p{L}\\p{Nd}_\\$\\#])(?:[\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)(?![\\p{L}\\p{Nd}_\\$\\#])",
+              "match": "(?<![\\p{L}\\d_$#])(?:[\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)(?![\\p{L}\\d_$#])",
               "name": "variable.other"
             },
             {
@@ -510,7 +510,7 @@
                   "name": "punctuation.definition.struct.begin"
                 }
               },
-              "end": "\\}",
+              "end": "}",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.definition.struct.end"
@@ -545,7 +545,7 @@
                   "name": "punctuation.section.brackets.begin"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "endCaptures": {
                 "0": {
                   "name": "punctuation.section.brackets.end"
@@ -577,7 +577,7 @@
                       "name": "punctuation.alias"
                     }
                   },
-                  "match": "([\\p{L}\\$\\#][\\p{L}\\p{Nd}_\\$\\#]*|_[\\p{L}\\p{Nd}_\\$\\#]+)[ \\t]*(=)"
+                  "match": "([\\p{L}$#][\\p{L}\\d_$#]*|_[\\p{L}\\d_$#]+)[ \\t]*(=)"
                 },
                 {
                   "include": "#expression"
@@ -625,11 +625,11 @@
       ]
     },
     "invalid_in_braces": {
-      "match": "[^\\}]+",
+      "match": "[^}]+",
       "name": "invalid"
     },
     "invalid_in_parens": {
-      "match": "[^\\)]+",
+      "match": "[^)]+",
       "name": "invalid"
     },
     "punctuation_colon": {
@@ -663,11 +663,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:\"\"\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:\"\"\"|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -720,11 +720,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:[\"/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -777,11 +777,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:'''|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:'''|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
@@ -834,11 +834,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\#(?:'|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\#(?:['/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\#(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\#(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
@@ -891,11 +891,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:\"\"\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:\"\"\"|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -948,11 +948,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:\"|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:[\"/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "invalid.illegal"
             },
             {
@@ -1005,11 +1005,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:'''|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:'''|[/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {
@@ -1062,11 +1062,11 @@
           "name": "meta.string",
           "patterns": [
             {
-              "match": "\\\\(?:'|/|\\\\|[abfnrtv]|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+              "match": "\\\\(?:['/\\\\abfnrtv]|u\\h{4}|U\\h{8})",
               "name": "constant.character.escape"
             },
             {
-              "match": "\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2})",
+              "match": "\\\\(?:[0-7]{3}|x\\h{2})",
               "name": "constant.character.escape"
             },
             {

package/grammars/cypher.json

@@ -130,7 +130,7 @@
           "name": "keyword.other.order.cypher"
         },
         {
-          "begin": "(?i)\\b(node|relationship|rel)((:)([\\p{L}_-][\\p{L}0-9_]*))?(?=\\s*\\()",
+          "begin": "(?i)\\b(node|relationship|rel)((:)([\\p{L}_\\-][\\p{L}0-9_]*))?(?=\\s*\\()",
           "beginCaptures": {
             "1": {
               "name": "support.class.starting-functions-point.cypher"
@@ -149,7 +149,7 @@
           "name": "source.starting-functions.cypher",
           "patterns": [
             {
-              "match": "((?:`.+?`)|(?:[\\p{L}_][\\p{L}0-9_]*))",
+              "match": "(`.+?`|[\\p{L}_][\\p{L}0-9_]*)",
               "name": "variable.parameter.relationship-name.cypher"
             },
             {
@@ -180,11 +180,11 @@
     "operators": {
       "patterns": [
         {
-          "match": "(\\+|\\-|\\/|\\*|\\%|\\?|!)",
+          "match": "([+\\-/*%?!])",
           "name": "keyword.operator.math.cypher"
         },
         {
-          "match": "(<=|=>|<>|<|>|=~|=)",
+          "match": "(<=|=>|<>|[<>]|=~|=)",
           "name": "keyword.operator.compare.cypher"
         },
         {
@@ -213,7 +213,7 @@
               "name": "keyword.operator.relationship-pattern-start.cypher"
             }
           },
-          "end": "(])(->|-)",
+          "end": "(])(-(?:>|))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.relationship-pattern-end.cypher"
@@ -236,7 +236,7 @@
                   "name": "entity.name.class.relationship.type.cypher"
                 }
               },
-              "match": "(:)((?:`.+?`)|(?:[\\p{L}_][\\p{L}0-9_]*))",
+              "match": "(:)(`.+?`|[\\p{L}_][\\p{L}0-9_]*)",
               "name": "entity.name.class.relationship-type.cypher"
             },
             {
@@ -248,11 +248,11 @@
                   "name": "entity.name.class.relationship.type-or.cypher"
                 }
               },
-              "match": "(\\|)(\\s*)((?:`.+?`)|(?:[\\p{L}_][\\p{L}0-9_]*))",
+              "match": "(\\|)(\\s*)(`.+?`|[\\p{L}_][\\p{L}0-9_]*)",
               "name": "entity.name.class.relationship-type-ored.cypher"
             },
             {
-              "match": "(?:\\?\\*|\\?|\\*)\\s*(?:\\d+\\s*(?:\\.\\.\\s*\\d+)?)?",
+              "match": "(?:\\?\\*|[?*])\\s*(?:\\d+\\s*(?:\\.\\.\\s*\\d+)?)?",
               "name": "support.function.relationship-pattern.quant.cypher"
             },
             {
@@ -265,7 +265,7 @@
     "properties_literal": {
       "patterns": [
         {
-          "begin": "{",
+          "begin": "\\{",
           "beginCaptures": {
             "0": {
               "name": "keyword.control.properties_literal.cypher"
@@ -280,7 +280,7 @@
           "name": "source.cypher",
           "patterns": [
             {
-              "match": ":|,",
+              "match": "[:,]",
               "name": "keyword.control.properties_literal.seperator.cypher"
             },
             {
@@ -314,7 +314,7 @@
           "name": "string.quoted.double.cypher"
         }
       },
-      "match": "(\\\\\\\\|\\\\[tbnrf])|(\\\\'|\\\\\")",
+      "match": "(\\\\[\\\\tbnrf])|(\\\\['\"])",
       "name": "constant.character.escape.cypher"
     },
     "strings": {