tm-grammars 1.22.19 → 1.23.0

package/grammars/apex.json

@@ -25,7 +25,7 @@
   ],
   "repository": {
     "annotation-declaration": {
-      "begin": "([@][_[:alpha:]]+)\\b",
+      "begin": "(@[_[:alpha:]]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "storage.type.annotation.apex"
@@ -83,7 +83,7 @@
       ]
     },
     "array-creation-expression": {
-      "begin": "\\b(new)\\b\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))?\\s*(?=\\[)",
+      "begin": "\\b(new)\\b\\s*(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)?\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.new.apex"
@@ -99,7 +99,7 @@
           ]
         }
       },
-      "end": "(?<=\\])",
+      "end": "(?<=])",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -113,7 +113,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -144,7 +144,7 @@
           "name": "punctuation.squarebracket.open.apex"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.apex"
@@ -195,7 +195,7 @@
           "name": "punctuation.parenthesis.close.apex"
         }
       },
-      "match": "(\\()\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(\\))(?=\\s*@?[_[:alnum:]\\(])"
+      "match": "(\\()\\s*(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(\\))(?=\\s*@?[_[:alnum:](])"
     },
     "catch-clause": {
       "begin": "(?<!\\.)\\b(catch)\\b",
@@ -204,7 +204,7 @@
           "name": "keyword.control.try.catch.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\(",
@@ -236,7 +236,7 @@
                   "name": "entity.name.variable.local.apex"
                 }
               },
-              "match": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
+              "match": "(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?:(\\g<identifier>)\\b)?"
             }
           ]
         },
@@ -250,7 +250,7 @@
     },
     "class-declaration": {
       "begin": "(?=\\bclass\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\b(class)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*",
@@ -288,7 +288,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -408,7 +408,7 @@
       ]
     },
     "conditional-operator": {
-      "begin": "(?<!\\?)\\?(?!\\?|\\.|\\[)",
+      "begin": "(?<!\\?)\\?(?![?.\\[])",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.question-mark.apex"
@@ -428,7 +428,7 @@
     },
     "constructor-declaration": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*\\s*\\()",
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "captures": {
@@ -467,7 +467,7 @@
       ]
     },
     "constructor-initializer": {
-      "begin": "\\b(?:(this))\\b\\s*(?=\\()",
+      "begin": "\\b(this)\\b\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.this.apex"
@@ -486,7 +486,7 @@
           "name": "keyword.operator.query.date.apex"
         }
       },
-      "match": "\\b((LAST_N_DAYS|NEXT_N_DAYS|NEXT_N_WEEKS|LAST_N_WEEKS|NEXT_N_MONTHS|LAST_N_MONTHS|NEXT_N_QUARTERS|LAST_N_QUARTERS|NEXT_N_YEARS|LAST_N_YEARS|NEXT_N_FISCAL_QUARTERS|LAST_N_FISCAL_QUARTERS|NEXT_N_FISCAL_YEARS|LAST_N_FISCAL_YEARS)\\s*\\:\\d+)\\b"
+      "match": "\\b((LAST_N_DAYS|NEXT_N_DAYS|NEXT_N_WEEKS|LAST_N_WEEKS|NEXT_N_MONTHS|LAST_N_MONTHS|NEXT_N_QUARTERS|LAST_N_QUARTERS|NEXT_N_YEARS|LAST_N_YEARS|NEXT_N_FISCAL_QUARTERS|LAST_N_FISCAL_QUARTERS|NEXT_N_FISCAL_YEARS|LAST_N_FISCAL_YEARS)\\s*:\\d+)\\b"
     },
     "date-literals": {
       "captures": {
@@ -520,7 +520,7 @@
           "name": "keyword.control.loop.do.apex"
         }
       },
-      "end": "(?=;|})",
+      "end": "(?=[;}])",
       "patterns": [
         {
           "include": "#statement"
@@ -547,7 +547,7 @@
           "name": "keyword.operator.null-conditional.apex"
         }
       },
-      "end": "(?<=\\])(?!\\s*\\[)",
+      "end": "(?<=])(?!\\s*\\[)",
       "patterns": [
         {
           "include": "#bracketed-argument-list"
@@ -561,7 +561,7 @@
           "name": "keyword.control.conditional.else.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#statement"
@@ -570,7 +570,7 @@
     },
     "enum-declaration": {
       "begin": "(?=\\benum\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "(?=enum)",
@@ -602,7 +602,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -625,7 +625,7 @@
                   "name": "entity.name.variable.enum-member.apex"
                 }
               },
-              "end": "(?=(,|\\}))",
+              "end": "(?=([,}]))",
               "patterns": [
                 {
                   "include": "#javadoc-comment"
@@ -716,7 +716,7 @@
           "name": "keyword.operator.arrow.apex"
         }
       },
-      "end": "(?=[,\\);}])",
+      "end": "(?=[,);}])",
       "patterns": [
         {
           "include": "#expression"
@@ -730,7 +730,7 @@
           "name": "keyword.operator.assignment.compound.apex"
         },
         {
-          "match": "\\&=|\\^=|<<=|>>=|\\|=",
+          "match": "&=|\\^=|<<=|>>=|\\|=",
           "name": "keyword.operator.assignment.compound.bitwise.apex"
         },
         {
@@ -742,19 +742,19 @@
           "name": "keyword.operator.comparison.apex"
         },
         {
-          "match": "<=|>=|<|>",
+          "match": "<=|>=|[<>]",
           "name": "keyword.operator.relational.apex"
         },
         {
-          "match": "\\!|&&|\\|\\|",
+          "match": "!|&&|\\|\\|",
           "name": "keyword.operator.logical.apex"
         },
         {
-          "match": "\\&|~|\\^|\\|",
+          "match": "[\\&~\\^|]",
           "name": "keyword.operator.bitwise.apex"
         },
         {
-          "match": "\\=",
+          "match": "=",
           "name": "keyword.operator.assignment.apex"
         },
         {
@@ -766,7 +766,7 @@
           "name": "keyword.operator.increment.apex"
         },
         {
-          "match": "%|\\*|/|-|\\+",
+          "match": "[%*/\\-+]",
           "name": "keyword.operator.arithmetic.apex"
         }
       ]
@@ -781,10 +781,10 @@
           "name": "entity.name.type.extends.apex"
         }
       },
-      "end": "(?={|implements)"
+      "end": "(?=\\{|implements)"
     },
     "field-declaration": {
-      "begin": "(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+(\\g<identifier>)\\s*(?!=>|==)(?=,|;|=|$)",
+      "begin": "(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+(\\g<identifier>)\\s*(?!=[>=])(?=[,;=]|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -827,7 +827,7 @@
           "name": "keyword.control.try.finally.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -856,7 +856,7 @@
           "name": "keyword.operator.iterator.colon.apex"
         }
       },
-      "match": "([_.[:alpha:]][_.[:alnum:]]+)\\s+([_.[:alpha:]][_.[:alnum:]]*)\\s*(\\:)"
+      "match": "([_.[:alpha:]][_.[:alnum:]]+)\\s+([_.[:alpha:]][_.[:alnum:]]*)\\s*(:)"
     },
     "for-statement": {
       "begin": "(?<!\\.)\\b(for)\\b\\s*(?=\\()",
@@ -865,7 +865,7 @@
           "name": "keyword.control.loop.for.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -915,7 +915,7 @@
           "name": "storage.type.apex"
         }
       },
-      "match": "(FROM)\\b\\s*([_\\.[:alnum:]]+\\b)?"
+      "match": "(FROM)\\b\\s*([_.[:alnum:]]+\\b)?"
     },
     "goto-statement": {
       "begin": "(?<!\\.)\\b(goto)\\b",
@@ -965,7 +965,7 @@
           "name": "keyword.control.conditional.if.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -1001,10 +1001,10 @@
           "name": "entity.name.type.implements.apex"
         }
       },
-      "end": "(?={|extends)"
+      "end": "(?=\\{|extends)"
     },
     "indexer-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1027,7 +1027,7 @@
           "name": "keyword.other.this.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1050,7 +1050,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -1067,7 +1067,7 @@
     },
     "interface-declaration": {
       "begin": "(?=\\binterface\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "(interface)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)",
@@ -1102,7 +1102,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -1247,7 +1247,7 @@
       ]
     },
     "local-constant-declaration": {
-      "begin": "(?<const_keyword>\\b(?:const)\\b)\\s*(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+(\\g<identifier>)\\s*(?=,|;|=)",
+      "begin": "(?<const_keyword>\\bconst\\b)\\s*(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+(\\g<identifier>)\\s*(?=[,;=])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.apex"
@@ -1291,7 +1291,7 @@
       ]
     },
     "local-variable-declaration": {
-      "begin": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*)))\\s+(\\g<identifier>)\\s*(?=,|;|=|\\))",
+      "begin": "(?:(?:(\\bref)\\s+)?(\\bvar\\b)|(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*))\\s+(\\g<identifier>)\\s*(?=[,;=)])",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.apex"
@@ -1313,7 +1313,7 @@
           "name": "entity.name.variable.local.apex"
         }
       },
-      "end": "(?=;|\\))",
+      "end": "(?=[;)])",
       "patterns": [
         {
           "match": "@?[_[:alpha:]][_[:alnum:]]*",
@@ -1348,7 +1348,7 @@
               "name": "variable.other.object.property.apex"
             }
           },
-          "match": "(\\??\\.)\\s*(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:]]|\\(|(\\?)?\\[|<)"
+          "match": "(\\??\\.)\\s*(@?[_[:alpha:]][_[:alnum:]]*)\\s*(?![_[:alnum:](]|(\\?)?\\[|<)"
         },
         {
           "captures": {
@@ -1392,7 +1392,7 @@
           "name": "support.function.apex"
         }
       },
-      "end": "(?<=\\;)",
+      "end": "(?<=;)",
       "patterns": [
         {
           "include": "#object-creation-expression"
@@ -1420,10 +1420,10 @@
           "name": "punctuation.terminator.statement.apex"
         }
       },
-      "match": "([_[:alpha:]]*)\\b\\s+([_[:alpha:]]*)\\b\\s*(\\;)"
+      "match": "([_[:alpha:]]*)\\b\\s+([_[:alpha:]]*)\\b\\s*(;)"
     },
     "method-declaration": {
-      "begin": "(?<return_type>(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
+      "begin": "(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(\\g<identifier>)\\s*(<([^<>]+)>)?\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1463,7 +1463,7 @@
           ]
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1493,7 +1493,7 @@
           "name": "punctuation.separator.colon.apex"
         }
       },
-      "end": "(?=(,|\\)|\\]))",
+      "end": "(?=([,)\\]]))",
       "patterns": [
         {
           "include": "#expression"
@@ -1507,39 +1507,39 @@
     "numeric-literal": {
       "patterns": [
         {
-          "match": "\\b(\\d{4}\\-\\d{2}\\-\\d{2}T\\d{2}\\:\\d{2}\\:\\d{2}(\\.\\d{1,3})?(\\-|\\+)\\d{2}\\:\\d{2})\\b",
+          "match": "\\b(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{1,3})?([\\-+])\\d{2}:\\d{2})\\b",
           "name": "constant.numeric.datetime.apex"
         },
         {
-          "match": "\\b(\\d{4}\\-\\d{2}\\-\\d{2}T\\d{2}\\:\\d{2}\\:\\d{2}(\\.\\d{1,3})?(Z)?)\\b",
+          "match": "\\b(\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{1,3})?(Z)?)\\b",
           "name": "constant.numeric.datetime.apex"
         },
         {
-          "match": "\\b(\\d{4}\\-\\d{2}\\-\\d{2})\\b",
+          "match": "\\b(\\d{4}-\\d{2}-\\d{2})\\b",
           "name": "constant.numeric.date.apex"
         },
         {
-          "match": "\\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
+          "match": "\\b0([xX])[_\\h]+([UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
           "name": "constant.numeric.hex.apex"
         },
         {
-          "match": "\\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
+          "match": "\\b0([bB])[01_]+([UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
           "name": "constant.numeric.binary.apex"
         },
         {
-          "match": "\\b([0-9_]+)?\\.[0-9_]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\\b",
+          "match": "\\b([0-9_]+)?\\.[0-9_]+(([eE])[0-9]+)?([FfDdMm])?\\b",
           "name": "constant.numeric.decimal.apex"
         },
         {
-          "match": "\\b[0-9_]+(e|E)[0-9_]+(F|f|D|d|M|m)?\\b",
+          "match": "\\b[0-9_]+([eE])[0-9_]+([FfDdMm])?\\b",
           "name": "constant.numeric.decimal.apex"
         },
         {
-          "match": "\\b[0-9_]+(F|f|D|d|M|m)\\b",
+          "match": "\\b[0-9_]+([FfDdMm])\\b",
           "name": "constant.numeric.decimal.apex"
         },
         {
-          "match": "\\b[0-9_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
+          "match": "\\b[0-9_]+([UuLl]|UL|Ul|uL|ul|LU|Lu|lU|lu)?\\b",
           "name": "constant.numeric.decimal.apex"
         }
       ]
@@ -1576,10 +1576,10 @@
           ]
         }
       },
-      "match": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?=\\{|$)"
+      "match": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?=\\{|$)"
     },
     "object-creation-expression-with-parameters": {
-      "begin": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?=\\()",
+      "begin": "(delete|insert|undelete|update|upsert)?\\s*(new)\\s+(?<type_name>(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.apex"
@@ -1606,7 +1606,7 @@
       ]
     },
     "operator-assignment": {
-      "match": "(?<!=|!)(=)(?!=)",
+      "match": "(?<![=!])(=)(?!=)",
       "name": "keyword.operator.assignment.apex"
     },
     "operator-safe-navigation": {
@@ -1670,7 +1670,7 @@
           "name": "entity.name.variable.parameter.apex"
         }
       },
-      "match": "(?:(?:\\b(this)\\b)\\s+)?(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+(\\g<identifier>)"
+      "match": "(?:\\b(this)\\b\\s+)?(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+(\\g<identifier>)"
     },
     "parenthesized-expression": {
       "begin": "\\(",
@@ -1726,7 +1726,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -1734,7 +1734,7 @@
       },
       "patterns": [
         {
-          "match": "\\b(private|protected)\\b",
+          "match": "\\b(pr(?:ivate|otected))\\b",
           "name": "storage.modifier.apex"
         },
         {
@@ -1760,7 +1760,7 @@
       ]
     },
     "property-declaration": {
-      "begin": "(?!.*\\b(?:class|interface|enum)\\b)\\s*(?<return_type>(?<type_name>(?:(?:ref\\s+)?(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*)(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|$)",
+      "begin": "(?!.*\\b(?:class|interface|enum)\\b)\\s*(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<property_name>\\g<identifier>)\\s*(?=\\{|=>|$)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1783,7 +1783,7 @@
           "name": "entity.name.variable.property.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "include": "#comment"
@@ -1890,13 +1890,13 @@
       ]
     },
     "soql-colon-vars": {
-      "begin": "(\\:)\\s*",
+      "begin": "(:)\\s*",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.colon.apex"
         }
       },
-      "end": "(?![_[:alnum:]]|\\(|(\\?)?\\[|<)",
+      "end": "(?![_[:alnum:](]|(\\?)?\\[|<)",
       "patterns": [
         {
           "include": "#trigger-context-declaration"
@@ -2060,7 +2060,7 @@
           "name": "keyword.operator.query.select.apex"
         }
       },
-      "end": "(?=;)|(?=\\])|(?=\\))",
+      "end": "(?=;)|(?=])|(?=\\))",
       "patterns": [
         {
           "include": "#soql-query-body"
@@ -2092,7 +2092,7 @@
               "name": "punctuation.separator.comma.apex"
             }
           },
-          "match": "([_.[:alpha:]][_.[:alnum:]]*)\\s*(\\,)?"
+          "match": "([_.[:alpha:]][_.[:alnum:]]*)\\s*(,)?"
         }
       ]
     },
@@ -2178,7 +2178,7 @@
           "name": "punctuation.definition.string.begin.apex"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
+      "end": "(')|([^\\\\\\n]$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.string.end.apex"
@@ -2228,13 +2228,13 @@
       "match": "\\b(ApexPages|Database|DMLException|Exception|PageReference|Savepoint|SchedulableContext|Schema|SObject|System|Test)\\b"
     },
     "support-expression": {
-      "begin": "(ApexPages|Database|DMLException|Exception|PageReference|Savepoint|SchedulableContext|Schema|SObject|System|Test)(?=\\.|\\s)",
+      "begin": "(ApexPages|Database|DMLException|Exception|PageReference|Savepoint|SchedulableContext|Schema|SObject|System|Test)(?=[.\\s])",
       "beginCaptures": {
         "1": {
           "name": "support.class.apex"
         }
       },
-      "end": "(?<=\\)|$)|(?=\\})|(?=;)|(?=\\)|(?=\\]))|(?=\\,)",
+      "end": "(?<=\\)|$)|(?=})|(?=;)|(?=\\)|(?=]))|(?=,)",
       "patterns": [
         {
           "include": "#support-type"
@@ -2248,7 +2248,7 @@
               "name": "support.function.apex"
             }
           },
-          "match": "(?:(\\.))([[:alpha:]]*)(?=\\()"
+          "match": "(\\.)(\\p{alpha}*)(?=\\()"
         },
         {
           "captures": {
@@ -2259,7 +2259,7 @@
               "name": "support.type.apex"
             }
           },
-          "match": "(?:(\\.))([[:alpha:]]+)"
+          "match": "(\\.)(\\p{alpha}+)"
         },
         {
           "begin": "\\(",
@@ -2310,7 +2310,7 @@
               "name": "support.function.apex"
             }
           },
-          "match": "(\\.)\\s*([[:alpha:]]*)(?=\\()"
+          "match": "(\\.)\\s*(\\p{alpha}*)(?=\\()"
         },
         {
           "begin": "\\(",
@@ -2365,7 +2365,7 @@
       ]
     },
     "switch-statement": {
-      "begin": "(switch)\\b\\s+(on)\\b\\s+(?:([_.?\\'\\(\\)[:alnum:]]+)\\s*)?(\\{)",
+      "begin": "(switch)\\b\\s+(on)\\b\\s+(?:([_.?'()[:alnum:]]+)\\s*)?(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.apex"
@@ -2387,7 +2387,7 @@
           "name": "punctuation.curlybrace.open.apex"
         }
       },
-      "end": "(\\})",
+      "end": "(})",
       "endCaptures": {
         "0": {
           "name": "punctuation.curlybrace.close.apex"
@@ -2426,7 +2426,7 @@
           "name": "keyword.other.this.apex"
         }
       },
-      "match": "\\b(?:(this))\\b"
+      "match": "\\b(this)\\b"
     },
     "throw-expression": {
       "captures": {
@@ -2451,7 +2451,7 @@
       ]
     },
     "trigger-context-declaration": {
-      "begin": "\\b(?:(Trigger))\\b(\\.)\\b",
+      "begin": "\\b(Trigger)\\b(\\.)\\b",
       "beginCaptures": {
         "1": {
           "name": "support.class.trigger.apex"
@@ -2460,7 +2460,7 @@
           "name": "punctuation.accessor.apex"
         }
       },
-      "end": "(?=\\})|(?=;)|(?=\\)|(?=\\]))",
+      "end": "(?=})|(?=;)|(?=\\)|(?=]))",
       "patterns": [
         {
           "match": "\\b(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size)\\b",
@@ -2482,7 +2482,7 @@
               "name": "support.function.trigger.apex"
             }
           },
-          "match": "(?:(\\??\\.))([[:alpha:]]+)(?=\\()"
+          "match": "(\\??\\.)(\\p{alpha}+)(?=\\()"
         },
         {
           "begin": "\\(",
@@ -2519,7 +2519,7 @@
     },
     "trigger-declaration": {
       "begin": "(?=\\btrigger\\b)",
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "begin": "\\b(trigger)\\b\\s+(@?[_[:alpha:]][_[:alnum:]]*)\\s*\\b(on)\\b\\s+([_[:alpha:]][_[:alnum:]]*)\\s*",
@@ -2585,7 +2585,7 @@
               "name": "punctuation.curlybrace.open.apex"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.curlybrace.close.apex"
@@ -2630,7 +2630,7 @@
           "name": "keyword.control.try.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#comment"
@@ -2711,7 +2711,7 @@
           "name": "punctuation.squarebracket.open.apex"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.squarebracket.close.apex"
@@ -2804,13 +2804,13 @@
       "match": "\\?"
     },
     "type-parameter-list": {
-      "begin": "\\<",
+      "begin": "<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.begin.apex"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.typeparameters.end.apex"
@@ -2842,13 +2842,13 @@
       "match": "((USING SCOPE)\\b\\s*(Delegated|Everything|Mine|My_Territory|My_Team_Territory|Team))\\b\\s*"
     },
     "variable-initializer": {
-      "begin": "(?<!=|!)(=)(?!=|>)",
+      "begin": "(?<![=!])(=)(?![=>])",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.assignment.apex"
         }
       },
-      "end": "(?=[,\\)\\];}])",
+      "end": "(?=[,)\\];}])",
       "patterns": [
         {
           "include": "#expression"
@@ -2865,7 +2865,7 @@
           "name": "keyword.control.switch.else.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2882,7 +2882,7 @@
           "name": "keyword.control.switch.when.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2905,7 +2905,7 @@
           "name": "entity.name.variable.local.apex"
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2916,7 +2916,7 @@
       ]
     },
     "when-statement": {
-      "begin": "(when)\\b\\s+([\\'_\\-[:alnum:]]+)\\s*",
+      "begin": "(when)\\b\\s+(['_\\-[:alnum:]]+)\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
@@ -2929,7 +2929,7 @@
           ]
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2940,7 +2940,7 @@
       ]
     },
     "when-string": {
-      "begin": "(when)(\\b\\s*)((\\')[_.\\,\\'\\s*[:alnum:]]+)",
+      "begin": "(when)(\\b\\s*)((')[_.,'\\s*[:alnum:]]+)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
@@ -2959,7 +2959,7 @@
           ]
         }
       },
-      "end": "(?<=\\})",
+      "end": "(?<=})",
       "patterns": [
         {
           "include": "#block"
@@ -2972,13 +2972,13 @@
     "when-string-statement": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.apex"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.apex"
@@ -3003,7 +3003,7 @@
           "name": "keyword.control.loop.while.apex"
         }
       },
-      "end": "(?<=\\})|(?=;)",
+      "end": "(?<=})|(?=;)",
       "patterns": [
         {
           "begin": "\\(",
@@ -3049,7 +3049,7 @@
               "name": "punctuation.separator.equals.apex"
             }
           },
-          "match": "(?:^|\\s+)((?:([-_[:alnum:]]+)(:))?([-_[:alnum:]]+))(=)"
+          "match": "(?:^|\\s+)((?:([\\-_[:alnum:]]+)(:))?([\\-_[:alnum:]]+))(=)"
         },
         {
           "include": "#xml-string"
@@ -3063,7 +3063,7 @@
           "name": "punctuation.definition.string.begin.apex"
         }
       },
-      "end": "\\]\\]>",
+      "end": "]]>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.apex"
@@ -3082,7 +3082,7 @@
               "name": "punctuation.definition.constant.apex"
             }
           },
-          "match": "(&)((?:[[:alpha:]:_][[:alnum:]:_.-]*)|(?:\\#[[:digit:]]+)|(?:\\#x[[:xdigit:]]+))(;)",
+          "match": "(&)([[:alpha:]:_][[:alnum:]:_.\\-]*|#\\d+|#x\\h+)(;)",
           "name": "constant.character.entity.apex"
         },
         {
@@ -3125,13 +3125,13 @@
     "xml-string": {
       "patterns": [
         {
-          "begin": "\\'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.apex"
             }
           },
-          "end": "\\'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.apex"
@@ -3145,13 +3145,13 @@
           ]
         },
         {
-          "begin": "\\\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.stringdoublequote.begin.apex"
             }
           },
-          "end": "\\\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.stringdoublequote.end.apex"
@@ -3167,7 +3167,7 @@
       ]
     },
     "xml-tag": {
-      "begin": "(</?)((?:([-_[:alnum:]]+)(:))?([-_[:alnum:]]+))",
+      "begin": "(</?)((?:([\\-_[:alnum:]]+)(:))?([\\-_[:alnum:]]+))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.apex"