tm-grammars 1.22.18 → 1.23.0

package/grammars/vyper.json

@@ -44,8 +44,8 @@
       "name": "keyword.operator.assignment.python"
     },
     "backticks": {
-      "begin": "\\`",
-      "end": "(?:\\`|(?<!\\\\)(\\n))",
+      "begin": "`",
+      "end": "(?:`|(?<!\\\\)(\\n))",
       "name": "invalid.deprecated.backtick.python",
       "patterns": [
         {
@@ -163,7 +163,7 @@
     "class-declaration": {
       "patterns": [
         {
-          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*(:|\\())",
+          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*([:(]))",
           "beginCaptures": {
             "1": {
               "name": "storage.type.class.python"
@@ -203,7 +203,7 @@
       "name": "meta.class.inheritance.python",
       "patterns": [
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.arguments.python"
         },
         {
@@ -269,12 +269,12 @@
           "name": "keyword.codetag.notation.python"
         }
       },
-      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)"
+      "match": "\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b"
     },
     "comments": {
       "patterns": [
         {
-          "begin": "(?:\\#\\s*(type:)\\s*+(?!$|\\#))",
+          "begin": "#\\s*(type:)\\s*+(?!$|#)",
           "beginCaptures": {
             "0": {
               "name": "meta.typehint.comment.python"
@@ -284,11 +284,11 @@
             }
           },
           "contentName": "meta.typehint.comment.python",
-          "end": "(?:$|(?=\\#))",
+          "end": "(?:$|(?=#))",
           "name": "comment.line.number-sign.python",
           "patterns": [
             {
-              "match": "\\Gignore(?=\\s*(?:$|\\#))",
+              "match": "\\Gignore(?=\\s*(?:$|#))",
               "name": "comment.typehint.ignore.notation.python"
             },
             {
@@ -296,7 +296,7 @@
               "name": "comment.typehint.type.notation.python"
             },
             {
-              "match": "([\\[\\]\\(\\),\\.\\=\\*]|(->))",
+              "match": "([\\[\\](),.=*]|(->))",
               "name": "comment.typehint.punctuation.notation.python"
             },
             {
@@ -311,7 +311,7 @@
       ]
     },
     "comments-base": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -326,7 +326,7 @@
       ]
     },
     "comments-string-double-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -341,7 +341,7 @@
       ]
     },
     "comments-string-single-three": {
-      "begin": "(\\#)",
+      "begin": "(#)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.comment.python"
@@ -362,7 +362,7 @@
           "name": "punctuation.definition.dict.begin.python"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.dict.end.python"
@@ -388,7 +388,7 @@
           "name": "punctuation.definition.decorator.python"
         }
       },
-      "end": "(\\))(?:(.*?)(?=\\s*(?:\\#|$)))|(?=\\n|\\#)",
+      "end": "(\\))(.*?)(?=\\s*(?:#|$))|(?=[\\n#])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.arguments.end.python"
@@ -433,7 +433,7 @@
               "name": "invalid.illegal.decorator.python"
             }
           },
-          "match": "\\s*([^([:alpha:]\\s_\\.#\\\\].*?)(?=\\#|$)",
+          "match": "\\s*([^([:alpha:]\\s_.#\\\\].*?)(?=#|$)",
           "name": "invalid.illegal.decorator.python"
         }
       ]
@@ -441,7 +441,7 @@
     "docstring": {
       "patterns": [
         {
-          "begin": "(\\'\\'\\'|\\\"\\\"\\\")",
+          "begin": "('''|\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.python"
@@ -467,7 +467,7 @@
           ]
         },
         {
-          "begin": "([rR])(\\'\\'\\'|\\\"\\\"\\\")",
+          "begin": "([rR])('''|\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "storage.type.string.python"
@@ -496,7 +496,7 @@
           ]
         },
         {
-          "begin": "(\\'|\\\")",
+          "begin": "(['\"])",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.string.begin.python"
@@ -522,7 +522,7 @@
           ]
         },
         {
-          "begin": "([rR])(\\'|\\\")",
+          "begin": "([rR])(['\"])",
           "beginCaptures": {
             "1": {
               "name": "storage.type.string.python"
@@ -571,11 +571,11 @@
           "name": "keyword.control.flow.python"
         }
       },
-      "match": "(?:(?:^|\\G)\\s*((?:>>>|\\.\\.\\.)\\s)(?=\\s*\\S))"
+      "match": "(?:^|\\G)\\s*((?:>>>|\\.\\.\\.)\\s)(?=\\s*\\S)"
     },
     "docstring-statement": {
-      "begin": "^(?=\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
-      "end": "((?<=\\1)|^)(?!\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
+      "begin": "^(?=\\s*[rR]?('''|\"\"\"|['\"]))",
+      "end": "((?<=\\1)|^)(?!\\s*[rR]?('''|\"\"\"|['\"]))",
       "patterns": [
         {
           "include": "#docstring"
@@ -585,10 +585,10 @@
     "double-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -600,7 +600,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?=\"))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -615,7 +615,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -646,7 +646,7 @@
       ]
     },
     "double-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -814,7 +814,7 @@
       ]
     },
     "double-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -886,10 +886,10 @@
     "double-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -901,7 +901,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\"\"\"))",
+          "end": "(]|(?=\"\"\"))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -916,7 +916,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -947,7 +947,7 @@
       ]
     },
     "double-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -1133,7 +1133,7 @@
       ]
     },
     "double-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -1216,13 +1216,13 @@
       "name": "constant.other.ellipsis.python"
     },
     "escape-sequence": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
+      "match": "\\\\(x\\h{2}|[0-7]{1,3}|[\\\\\"'abfnrtv])",
       "name": "constant.character.escape.python"
     },
     "escape-sequence-unicode": {
       "patterns": [
         {
-          "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8}|N\\{[\\w\\s]+?\\})",
+          "match": "\\\\(u\\h{4}|U\\h{8}|N\\{[\\w\\s]+?})",
           "name": "constant.character.escape.python"
         }
       ]
@@ -1357,7 +1357,7 @@
           "include": "#fstring-formatting-braces"
         },
         {
-          "match": "\\{.*?\\}"
+          "match": "\\{.*?}"
         },
         {
           "include": "#regexp-base-common"
@@ -1365,7 +1365,7 @@
       ]
     },
     "fregexp-quantifier": {
-      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}\\}",
+      "match": "\\{\\{(\\d+|\\d+,(\\d+)?|,\\d+)}}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "fstring-fnorm-quoted-multi-line": {
@@ -1468,10 +1468,10 @@
               "name": "constant.character.format.placeholder.other.python"
             }
           },
-          "match": "({)(\\s*?)(})"
+          "match": "(\\{)(\\s*?)(})"
         },
         {
-          "match": "({{|}})",
+          "match": "(\\{\\{|}})",
           "name": "constant.character.escape.python"
         }
       ]
@@ -1510,7 +1510,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1532,7 +1532,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1548,7 +1548,7 @@
       ]
     },
     "fstring-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.multi.python"
     },
     "fstring-normf-quoted-multi-line": {
@@ -1638,7 +1638,7 @@
       ]
     },
     "fstring-raw-multi-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|'''|\"\"\"))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|'''|\"\"\"))|\\n",
       "name": "string.interpolated.python string.quoted.raw.multi.python"
     },
     "fstring-raw-quoted-multi-line": {
@@ -1712,7 +1712,7 @@
       ]
     },
     "fstring-raw-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.raw.single.python"
     },
     "fstring-single-brace": {
@@ -1722,7 +1722,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "end": "(\\})|(?=\\n)",
+      "end": "(})|(?=\\n)",
       "endCaptures": {
         "1": {
           "name": "constant.character.format.placeholder.other.python"
@@ -1738,7 +1738,7 @@
       ]
     },
     "fstring-single-core": {
-      "match": "(.+?)(($\\n?)|(?=[\\\\\\}\\{]|(['\"])|((?<!\\\\)\\n)))|\\n",
+      "match": "(.+?)(($\\n?)|(?=[\\\\}{]|(['\"])|((?<!\\\\)\\n)))|\\n",
       "name": "string.interpolated.python string.quoted.single.python"
     },
     "fstring-terminator-multi": {
@@ -1760,7 +1760,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=\\^]?[\\-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-multi-tail"
@@ -1768,7 +1768,7 @@
       ]
     },
     "fstring-terminator-multi-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1802,15 +1802,15 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
-          "match": "([-+ ])",
+          "match": "([\\-+ ])",
           "name": "storage.type.format.python"
         },
         {
-          "match": "([<>=^])",
+          "match": "([<>=\\^])",
           "name": "storage.type.format.python"
         },
         {
@@ -1838,7 +1838,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "((?:=?)(?:![rsa])?)(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
+          "match": "(=?(?:![rsa])?)(:\\w?[<>=\\^]?[\\-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)(?=})"
         },
         {
           "include": "#fstring-terminator-single-tail"
@@ -1846,7 +1846,7 @@
       ]
     },
     "fstring-terminator-single-tail": {
-      "begin": "((?:=?)(?:![rsa])?)(:)(?=.*?{)",
+      "begin": "(=?(?:![rsa])?)(:)(?=.*?\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.format.python"
@@ -1880,15 +1880,15 @@
           "name": "storage.type.format.python"
         },
         {
-          "match": "(\\#)",
+          "match": "(#)",
           "name": "storage.type.format.python"
         },
         {
-          "match": "([-+ ])",
+          "match": "([\\-+ ])",
           "name": "storage.type.format.python"
         },
         {
-          "match": "([<>=^])",
+          "match": "([<>=\\^])",
           "name": "storage.type.format.python"
         },
         {
@@ -1978,7 +1978,7 @@
       ]
     },
     "function-declaration": {
-      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def)\\s+(?=[[:alpha:]_][[:word:]]*\\s*\\()",
+      "begin": "\\s*(?:\\b(async)\\s+)?\\b(def)\\s+(?=[[:alpha:]_]\\p{word}*\\s*\\()",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.async.python"
@@ -2074,7 +2074,7 @@
           "name": "keyword.control.import.python"
         }
       },
-      "match": "\\b(?:(and|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[\\.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(as|import))\\b"
+      "match": "\\b(?:(and|assert|async|await|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|in|is|(?<=\\.)lambda|lambda(?=\\s*[.=])|nonlocal|not|or|pass|raise|return|try|while|with|yield)|(as|import))\\b"
     },
     "illegal-object-name": {
       "match": "\\b(True|False|None)\\b",
@@ -2164,7 +2164,7 @@
       "patterns": [
         {
           "begin": "\\b(?=[[:alpha:]_]\\w*\\s*\\[)",
-          "end": "(\\])",
+          "end": "(])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.arguments.end.python"
@@ -2193,7 +2193,7 @@
         }
       },
       "contentName": "meta.item-access.arguments.python",
-      "end": "(?=\\])",
+      "end": "(?=])",
       "patterns": [
         {
           "match": ":",
@@ -2232,7 +2232,7 @@
               "name": "keyword.control.flow.python"
             }
           },
-          "match": "((?<=\\.)lambda|lambda(?=\\s*[\\.=]))"
+          "match": "((?<=\\.)lambda|lambda(?=\\s*[.=]))"
         },
         {
           "captures": {
@@ -2263,7 +2263,7 @@
               "name": "keyword.operator.positional.parameter.python"
             },
             {
-              "match": "(\\*\\*|\\*)",
+              "match": "(\\*(?:\\*|))",
               "name": "keyword.operator.unpacking.parameter.python"
             },
             {
@@ -2355,7 +2355,7 @@
               "name": "punctuation.separator.continuation.line.python"
             }
           },
-          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$))",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?('''|\"\"\"|['\"]))|(\\G$))",
           "patterns": [
             {
               "include": "#regexp"
@@ -2374,7 +2374,7 @@
           "name": "punctuation.definition.list.begin.python"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.list.end.python"
@@ -2546,7 +2546,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[bB])(_?[01])+\\b",
+      "match": "(?<![\\w.])(0[bB])(_?[01])+\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-dec": {
@@ -2558,7 +2558,7 @@
           "name": "invalid.illegal.dec.python"
         }
       },
-      "match": "(?<![\\w\\.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE\\.]))\\b",
+      "match": "(?<![\\w.])(?:[1-9](?:_?[0-9])*|0+|[0-9](?:_?[0-9])*([jJ])|0([0-9]+)(?![eE.]))\\b",
       "name": "constant.numeric.dec.python"
     },
     "number-float": {
@@ -2567,7 +2567,7 @@
           "name": "storage.type.imaginary.number.python"
         }
       },
-      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*(?:[eE][+-]?[0-9](?:_?[0-9])*))([jJ])?\\b",
+      "match": "(?<!\\w)(?:(?:\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.[0-9](?:_?[0-9])*|[0-9](?:_?[0-9])*\\.)(?:[eE][+\\-]?[0-9](?:_?[0-9])*)?|[0-9](?:_?[0-9])*[eE][+\\-]?[0-9](?:_?[0-9])*)([jJ])?\\b",
       "name": "constant.numeric.float.python"
     },
     "number-hex": {
@@ -2576,7 +2576,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[xX])(_?[0-9a-fA-F])+\\b",
+      "match": "(?<![\\w.])(0[xX])(_?\\h)+\\b",
       "name": "constant.numeric.hex.python"
     },
     "number-long": {
@@ -2585,7 +2585,7 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])([1-9][0-9]*|0)([lL])\\b",
+      "match": "(?<![\\w.])([1-9][0-9]*|0)([lL])\\b",
       "name": "constant.numeric.bin.python"
     },
     "number-oct": {
@@ -2594,11 +2594,11 @@
           "name": "storage.type.number.python"
         }
       },
-      "match": "(?<![\\w\\.])(0[oO])(_?[0-7])+\\b",
+      "match": "(?<![\\w.])(0[oO])(_?[0-7])+\\b",
       "name": "constant.numeric.oct.python"
     },
     "odd-function-call": {
-      "begin": "(?<=\\]|\\))\\s*(?=\\()",
+      "begin": "(?<=[\\])])\\s*(?=\\()",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -2632,7 +2632,7 @@
           "name": "keyword.operator.assignment.python"
         }
       },
-      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|(?:yield(?:\\s+from)?)))(?!\\s*:)\\b|(<<|>>|&|\\||\\^|~)|(\\*\\*|\\*|\\+|-|%|//|/|@)|(!=|==|>=|<=|<|>)|(:=)"
+      "match": "\\b(?<!\\.)(?:(and|or|not|in|is)|(for|if|else|await|yield(?:\\s+from)?))(?!\\s*:)\\b|(<<|>>|[\\&|\\^~])|(\\*\\*|[*+\\-%]|//|[/@])|(!=|==|>=|<=|[<>])|(:=)"
     },
     "parameter-special": {
       "captures": {
@@ -2671,7 +2671,7 @@
           "name": "keyword.operator.positional.parameter.python"
         },
         {
-          "match": "(\\*\\*|\\*)",
+          "match": "(\\*(?:\\*|))",
           "name": "keyword.operator.unpacking.parameter.python"
         },
         {
@@ -2748,7 +2748,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
         }
       },
-      "match": "(\\()(\\?P=\\w+(?:\\s+[[:alnum:]]+)?)(\\))",
+      "match": "(\\()(\\?P=\\w+(?:\\s+\\p{alnum}+)?)(\\))",
       "name": "meta.backreference.named.regexp"
     },
     "regexp-backreference-number": {
@@ -2890,7 +2890,7 @@
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-character": {
-      "match": "\\\\(x[0-9A-Fa-f]{2}|0[0-7]{1,2}|[0-7]{3})",
+      "match": "\\\\(x\\h{2}|0[0-7]{1,2}|[0-7]{3})",
       "name": "constant.character.escape.regexp"
     },
     "regexp-escape-sequence": {
@@ -2917,7 +2917,7 @@
       "name": "support.other.escape.special.regexp"
     },
     "regexp-escape-unicode": {
-      "match": "\\\\(u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})",
+      "match": "\\\\(u\\h{4}|U\\h{8})",
       "name": "constant.character.unicode.regexp"
     },
     "regexp-flags": {
@@ -2925,11 +2925,11 @@
       "name": "storage.modifier.flag.regexp"
     },
     "regexp-quantifier": {
-      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)\\}",
+      "match": "\\{(\\d+|\\d+,(\\d+)?|,\\d+)}",
       "name": "keyword.operator.quantifier.regexp"
     },
     "regexp-single-one-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2944,7 +2944,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\')|(?<!\\\\)(\\n)",
+      "end": "(')|(?<!\\\\)(\\n)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -2961,7 +2961,7 @@
       ]
     },
     "regexp-single-three-line": {
-      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(\\'\\'\\')",
+      "begin": "\\b(([uU]r)|([bB]r)|(r[bB]?))(''')",
       "beginCaptures": {
         "2": {
           "name": "invalid.deprecated.prefix.python"
@@ -2976,7 +2976,7 @@
           "name": "punctuation.definition.string.begin.python"
         }
       },
-      "end": "(\\'\\'\\')",
+      "end": "(''')",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.python"
@@ -3032,7 +3032,7 @@
     "semicolon": {
       "patterns": [
         {
-          "match": "\\;$",
+          "match": ";$",
           "name": "invalid.deprecated.semicolon.python"
         }
       ]
@@ -3040,10 +3040,10 @@
     "single-one-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3055,7 +3055,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'))|((?=(?<!\\\\)\\n))",
+          "end": "(]|(?='))|((?=(?<!\\\\)\\n))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3070,7 +3070,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3084,7 +3084,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3101,7 +3101,7 @@
       ]
     },
     "single-one-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3110,7 +3110,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3178,7 +3178,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3203,7 +3203,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3228,7 +3228,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3253,7 +3253,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3269,7 +3269,7 @@
       ]
     },
     "single-one-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3278,7 +3278,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3301,7 +3301,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3323,7 +3323,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'))|((?=(?<!\\\\)\\n))",
+      "end": "(\\)|(?='))|((?=(?<!\\\\)\\n))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3341,10 +3341,10 @@
     "single-three-regexp-character-set": {
       "patterns": [
         {
-          "match": "\\[\\^?\\](?!.*?\\])"
+          "match": "\\[\\^?](?!.*?])"
         },
         {
-          "begin": "(\\[)(\\^)?(\\])?",
+          "begin": "(\\[)(\\^)?(])?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.character.set.begin.regexp constant.other.set.regexp"
@@ -3356,7 +3356,7 @@
               "name": "constant.character.set.regexp"
             }
           },
-          "end": "(\\]|(?=\\'\\'\\'))",
+          "end": "(]|(?='''))",
           "endCaptures": {
             "1": {
               "name": "punctuation.character.set.end.regexp constant.other.set.regexp"
@@ -3371,7 +3371,7 @@
               "include": "#regexp-charecter-set-escapes"
             },
             {
-              "match": "[^\\n]",
+              "match": "\\N",
               "name": "constant.character.set.regexp"
             }
           ]
@@ -3385,7 +3385,7 @@
           "name": "punctuation.comment.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "punctuation.comment.end.regexp"
@@ -3402,7 +3402,7 @@
       ]
     },
     "single-three-regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+\\p{alnum}+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -3411,7 +3411,7 @@
           "name": "punctuation.parenthesis.conditional.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.conditional.negative.regexp punctuation.parenthesis.conditional.end.regexp"
@@ -3485,7 +3485,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3513,7 +3513,7 @@
           "name": "punctuation.parenthesis.lookahead.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookahead.negative.regexp punctuation.parenthesis.lookahead.end.regexp"
@@ -3541,7 +3541,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3569,7 +3569,7 @@
           "name": "punctuation.parenthesis.lookbehind.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.lookbehind.negative.regexp punctuation.parenthesis.lookbehind.end.regexp"
@@ -3588,7 +3588,7 @@
       ]
     },
     "single-three-regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+\\p{alnum}+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"
@@ -3597,7 +3597,7 @@
           "name": "entity.name.tag.named.group.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.end.regexp"
@@ -3623,7 +3623,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.end.regexp"
@@ -3648,7 +3648,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.begin.regexp"
         }
       },
-      "end": "(\\)|(?=\\'\\'\\'))",
+      "end": "(\\)|(?='''))",
       "endCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.non-capturing.end.regexp"
@@ -3667,7 +3667,7 @@
       ]
     },
     "special-names": {
-      "match": "\\b(_*[[:upper:]][_\\d]*[[:upper:]])[[:upper:]\\d]*(_\\w*)?\\b",
+      "match": "\\b(_*\\p{upper}[_\\d]*\\p{upper})[[:upper:]\\d]*(_\\w*)?\\b",
       "name": "constant.other.caps.python"
     },
     "special-variables": {
@@ -3780,7 +3780,7 @@
               "name": "keyword.control.flow.python"
             }
           },
-          "match": "^\\s*(case|match)(?=\\s*([-+\\w\\d(\\[{'\":#]|$))\\b"
+          "match": "^\\s*(case|match)(?=\\s*([\\-+\\w\\d(\\[{'\":#]|$))\\b"
         }
       ]
     },
@@ -3896,7 +3896,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+ ]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
+          "match": "(\\{\\{|}}|\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:\\w?[<>=\\^]?[\\-+ ]?#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?})",
           "name": "meta.format.brace.python"
         },
         {
@@ -3911,7 +3911,7 @@
               "name": "storage.type.format.python"
             }
           },
-          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
+          "match": "(\\{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.python"
         }
       ]
@@ -3938,7 +3938,7 @@
           "name": "constant.character.format.placeholder.other.python"
         }
       },
-      "match": "(%(\\([\\w\\s]*\\))?[-+#0 ]*(\\d+|\\*)?(\\.(\\d+|\\*))?([hlL])?[diouxXeEfFgGcrsab%])",
+      "match": "(%(\\([\\w\\s]*\\))?[\\-+#0 ]*(\\d+|\\*)?(\\.(\\d+|\\*))?([hlL])?[diouxXeEfFgGcrsab%])",
       "name": "meta.format.percent.python"
     },
     "string-line-continuation": {
@@ -3946,7 +3946,7 @@
       "name": "constant.language.python"
     },
     "string-multi-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3955,7 +3955,7 @@
       ]
     },
     "string-multi-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%\\})",
+      "begin": "(?=\\{%(.*?(?!'''|\"\"\"))%})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3970,7 +3970,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -3982,7 +3982,7 @@
       ]
     },
     "string-multi-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:\\.\\[}\\w]).*?(?!'''|\"\"\")\\})",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!'''|\"\"\")[^!:.\\[}\\w]).*?(?!'''|\"\"\")})",
       "end": "(?='''|\"\"\")",
       "patterns": [
         {
@@ -4209,7 +4209,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-raw": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4218,7 +4218,7 @@
       ]
     },
     "string-single-bad-brace1-formatting-unicode": {
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
+      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4233,7 +4233,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-raw": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {
@@ -4245,7 +4245,7 @@
       ]
     },
     "string-single-bad-brace2-formatting-unicode": {
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
+      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))})",
       "end": "(?=(['\"])|((?<!\\\\)\\n))",
       "patterns": [
         {