tm-grammars 1.22.3 → 1.22.4

package/grammars/ballerina.json

@@ -13,7 +13,7 @@
     "access-modifier": {
       "patterns": [
         {
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private)(?![_$0-9A-Za-z])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(public|private)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "storage.modifier.ballerina keyword.other.ballerina"
         }
       ]
@@ -35,7 +35,7 @@
               "name": "support.type.ballerina"
             }
           },
-          "match": "(@)((?:[_$A-Za-z][_$0-9A-Za-z]*))\\s*(:?)\\s*((?:[_$A-Za-z][_$0-9A-Za-z]*)?)"
+          "match": "(@)((?:[_$[:alpha:]][_$[:alnum:]]*))\\s*(:?)\\s*((?:[_$[:alpha:]][_$[:alnum:]]*)?)"
         }
       ]
     },
@@ -164,7 +164,7 @@
     "call": {
       "patterns": [
         {
-          "match": "(?:\\')?([_$A-Za-z][_$0-9A-Za-z]*)\\s*(?=\\()",
+          "match": "(?:\\')?([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()",
           "name": "entity.name.function.ballerina"
         }
       ]
@@ -245,7 +245,7 @@
         },
         {
           "begin": "(?<=:)\\s*",
-          "end": "(?=\\s|[;),}\\]:\\-+]|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))"
+          "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))"
         },
         {
           "include": "#decl-block"
@@ -280,7 +280,7 @@
               "name": "entity.name.type.class.ballerina"
             }
           },
-          "match": "[_$A-Za-z][_$0-9A-Za-z]*"
+          "match": "[_$[:alpha:]][_$[:alnum:]]*"
         },
         {
           "include": "#class-body"
@@ -367,7 +367,7 @@
               "include": "#constrainType"
             },
             {
-              "match": "\\b([_$A-Za-z][_$0-9A-Za-z]*)\\b",
+              "match": "\\b([_$[:alpha:]][_$[:alnum:]]*)\\b",
               "name": "storage.type.ballerina"
             }
           ]
@@ -377,7 +377,7 @@
     "control-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(return)(?![_$0-9A-Za-z])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(return)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "beginCaptures": {
             "0": {
               "name": "keyword.control.flow.ballerina"
@@ -397,7 +397,7 @@
           "include": "#if-statement"
         },
         {
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(else|if)(?![_$0-9A-Za-z])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(else|if)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "keyword.control.conditional.ballerina"
         }
       ]
@@ -575,7 +575,7 @@
       ]
     },
     "enum-decl": {
-      "begin": "(?:\\b(const)\\s+)?\\b(enum)\\s+([_$A-Za-z][_$0-9A-Za-z]*)",
+      "begin": "(?:\\b(const)\\s+)?\\b(enum)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.ballerina"
@@ -617,7 +617,7 @@
               "include": "#mdDocumentation"
             },
             {
-              "begin": "([_$A-Za-z][_$0-9A-Za-z]*)",
+              "begin": "([_$[:alpha:]][_$[:alnum:]]*)",
               "beginCaptures": {
                 "0": {
                   "name": "variable.other.enummember.ballerina"
@@ -695,7 +695,7 @@
     "expression-operators": {
       "patterns": [
         {
-          "match": "\\*=|(?<!\\()/=|%=|\\+=|-=",
+          "match": "\\*=|(?<!\\()/=|%=|\\+=|\\-=",
           "name": "keyword.operator.assignment.compound.ballerina"
         },
         {
@@ -726,10 +726,10 @@
               "name": "keyword.operator.arithmetic.ballerina"
             }
           },
-          "match": "(?<=[_$0-9A-Za-z])(!)\\s*(?:(/=)|(?:(/)(?![/*])))"
+          "match": "(?<=[_$[:alnum:]])(\\!)\\s*(?:(/=)|(?:(/)(?![/*])))"
         },
         {
-          "match": "!|&&|\\|\\||\\?\\?",
+          "match": "\\!|&&|\\|\\||\\?\\?",
           "name": "keyword.operator.logical.ballerina"
         },
         {
@@ -737,7 +737,7 @@
           "name": "keyword.operator.bitwise.ballerina"
         },
         {
-          "match": "=",
+          "match": "\\=",
           "name": "keyword.operator.assignment.ballerina"
         },
         {
@@ -824,7 +824,7 @@
       ]
     },
     "for-loop": {
-      "begin": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))foreach\\s*",
+      "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))foreach\\s*",
       "beginCaptures": {
         "0": {
           "name": "keyword.control.loop.ballerina"
@@ -906,7 +906,7 @@
           "include": "#decl-block"
         },
         {
-          "begin": "=>",
+          "begin": "\\=>",
           "beginCaptures": {
             "0": {
               "name": "meta.arrow.ballerina storage.type.function.arrow.ballerina"
@@ -1046,7 +1046,7 @@
               "name": "meta.definition.function.ballerina entity.name.function.ballerina"
             }
           },
-          "match": "\\s+(\\b(self)|\\b(is|new|isolated|null|function|in)\\b|(string|int|boolean|float|byte|decimal|json|xml|anydata)\\b|\\b(readonly|error|map)\\b|([_$A-Za-z][_$0-9A-Za-z]*))"
+          "match": "\\s+(\\b(self)|\\b(is|new|isolated|null|function|in)\\b|(string|int|boolean|float|byte|decimal|json|xml|anydata)\\b|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))"
         }
       ]
     },
@@ -1077,7 +1077,7 @@
           "name": "keyword.other.ballerina"
         }
       },
-      "end": "(?==>)|(=)|(?=\\{)|(\\))|(?=\\;)",
+      "end": "(?==>)|(\\=)|(?=\\{)|(\\))|(?=\\;)",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.ballerina"
@@ -1126,7 +1126,7 @@
           "include": "#keywords"
         },
         {
-          "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+          "match": "[_$[:alpha:]][_$[:alnum:]]*",
           "name": "variable.other.readwrite.ballerina"
         }
       ]
@@ -1140,7 +1140,7 @@
               "name": "keyword.ballerina"
             }
           },
-          "end": "(?=\\,)|(?=\\|)|(?=:)|(?==>)|(?=\\))|(?=\\])",
+          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==>)|(?=\\))|(?=\\])",
           "patterns": [
             {
               "include": "#comment"
@@ -1230,13 +1230,13 @@
     "functionTypeReturnsParameter": {
       "patterns": [
         {
-          "begin": "((?=record|object|function)|(?:[_$A-Za-z][_$0-9A-Za-z]*))",
+          "begin": "((?=record|object|function)|(?:[_$[:alpha:]][_$[:alnum:]]*))",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?=\\,)|(?:\\|)|(?::)|(?==>)|(?=\\))|(?=\\])",
+          "end": "(?=\\,)|(?:\\|)|(?:\\:)|(?==>)|(?=\\))|(?=\\])",
           "patterns": [
             {
               "include": "#record"
@@ -1260,7 +1260,7 @@
               "include": "#parameterTuple"
             },
             {
-              "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*",
               "name": "default.variable.parameter.ballerina"
             }
           ]
@@ -1270,7 +1270,7 @@
     "functionTypeType": {
       "patterns": [
         {
-          "begin": "[_$A-Za-z][_$0-9A-Za-z]*",
+          "begin": "[_$[:alpha:]][_$[:alnum:]]*",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
@@ -1294,7 +1294,7 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[\\d])))\\s*)?([_$A-Za-z][_$0-9A-Za-z]*)(?=\\s*=\\s*((((function\\s*[(<*])|(function\\s+)|([_$A-Za-z][_$0-9A-Za-z]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*>)*>)*>\\s*)?[(]\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+\\})+\\s*)?=\\s*))))))|((<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*>)*>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$A-Za-z][_$0-9A-Za-z]*\\s*:)))|((<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$A-Za-z]))([^()\\'\\\"\\`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+\\})+)?\\s*=>)))))"
+          "match": "(?:(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*)?([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*=\\s*((((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>)))))"
         },
         {
           "captures": {
@@ -1308,7 +1308,7 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[\\d])))\\s*(\\#?[_$A-Za-z][_$0-9A-Za-z]*)\\s*(?=\\()"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()"
         },
         {
           "captures": {
@@ -1322,7 +1322,7 @@
               "name": "variable.other.property.ballerina"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[\\d])))\\s*(\\#?[_$A-Za-z][_$0-9A-Za-z]*)"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))\\s*(\\#?[_$[:alpha:]][_$[:alnum:]]*)"
         },
         {
           "include": "#type-primitive"
@@ -1359,10 +1359,10 @@
               "name": "punctuation.definition.parameters.end.ballerina"
             }
           },
-          "match": "([_$A-Za-z][_$0-9A-Za-z]*)((\\.)([_$A-Za-z][_$0-9A-Za-z]*)(\\()(\\)))?"
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)((\\.)([_$[:alpha:]][_$[:alnum:]]*)(\\()(\\)))?"
         },
         {
-          "match": "(\\')([_$A-Za-z][_$0-9A-Za-z]*)",
+          "match": "(\\')([_$[:alpha:]][_$[:alnum:]]*)",
           "name": "variable.other.property.ballerina"
         },
         {
@@ -1373,14 +1373,14 @@
     "if-statement": {
       "patterns": [
         {
-          "begin": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\b\\s*(?!\\{))",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=\\bif\\b\\s*(?!\\{))",
           "end": "(?<=\\})",
           "patterns": [
             {
               "include": "#comment"
             },
             {
-              "begin": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(if)\\s*(\\()?",
+              "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(if)\\s*(\\()?",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.conditional.ballerina"
@@ -1438,7 +1438,7 @@
               ]
             },
             {
-              "begin": "(?<=\\))(?=\\s|=)",
+              "begin": "(?<=\\))(?=\\s|\\=)",
               "end": "(?=\\{)",
               "patterns": [
                 {
@@ -1476,10 +1476,10 @@
               "name": "variable.other.readwrite.alias.ballerina"
             }
           },
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$A-Za-z][_$0-9A-Za-z]*))"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bdefault)|(\\*)|(\\b[_$[:alpha:]][_$[:alnum:]]*))"
         },
         {
-          "match": "([_$A-Za-z][_$0-9A-Za-z]*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)",
           "name": "variable.other.readwrite.alias.ballerina"
         }
       ]
@@ -1500,7 +1500,7 @@
       "name": "meta.import.ballerina",
       "patterns": [
         {
-          "match": "(\\')([_$A-Za-z][_$0-9A-Za-z]*)",
+          "match": "(\\')([_$[:alpha:]][_$[:alnum:]]*)",
           "name": "variable.other.property.ballerina"
         },
         {
@@ -1548,7 +1548,7 @@
           "name": "meta.arrow.ballerina storage.type.function.arrow.ballerina"
         },
         {
-          "match": "(!|%|\\+|-|~=|===|==|=|!=|!==|<|>|&|\\||\\?:|\\.\\.\\.|<=|>=|&&|\\|\\||~|>>|>>>)",
+          "match": "(!|%|\\+|\\-|~=|===|==|=|!=|!==|<|>|&|\\||\\?:|\\.\\.\\.|<=|>=|&&|\\|\\||~|>>|>>>)",
           "name": "keyword.operator.ballerina"
         },
         {
@@ -1615,7 +1615,7 @@
               "include": "#code"
             },
             {
-              "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*",
               "name": "variable.parameter.ballerina"
             }
           ]
@@ -1718,7 +1718,7 @@
     "mdDocumentationParamDescription": {
       "patterns": [
         {
-          "begin": "(\\+\\s+)(\\'?[_$A-Za-z][_$0-9A-Za-z]*)(\\s*-\\s+)",
+          "begin": "(\\+\\s+)(\\'?[_$[:alpha:]][_$[:alnum:]]*)(\\s*\\-\\s+)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.ballerina"
@@ -1774,7 +1774,7 @@
     "multiType": {
       "patterns": [
         {
-          "match": "(?<=\\|)([_$A-Za-z][_$0-9A-Za-z]*)|([_$A-Za-z][_$0-9A-Za-z]*)(?=\\|)",
+          "match": "(?<=\\|)([_$[:alpha:]][_$[:alnum:]]*)|([_$[:alpha:]][_$[:alnum:]]*)(?=\\|)",
           "name": "storage.type.ballerina"
         },
         {
@@ -1833,7 +1833,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?=:)|((?<=[\\]])(?=\\s*[(<]))",
+          "end": "(?=:)|((?<=[\\]])(?=\\s*[\\(\\<]))",
           "name": "meta.object.member.ballerina meta.object-literal.key.ballerina",
           "patterns": [
             {
@@ -1843,7 +1843,7 @@
         },
         {
           "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[(<,}])|(\\n*})|(\\s+(as)\\s+))))",
+          "end": "(?=:)|((?<=[\\'\\\"\\`])(?=((\\s*[\\(\\<,}])|(\\n*})|(\\s+(as)\\s+))))",
           "name": "meta.object.member.ballerina meta.object-literal.key.ballerina",
           "patterns": [
             {
@@ -1855,8 +1855,8 @@
           ]
         },
         {
-          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b\\d[0-9_]*(\\.)\\d[0-9_]*[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(\\.)[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\B(\\.)\\d[0-9_]*[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*[eE][+-]?\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(\\.)\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)\\d[0-9_]*(n)?\\b)|(?:\\b\\d[0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
-          "end": "(?=:)|(?=\\s*([(<,}])|(\\s+as\\s+))",
+          "begin": "(?=(\\b(?<!\\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:b|B)[01][01_]*(n)?\\b(?!\\$))|(\\b(?<!\\$)0(?:o|O)?[0-7][0-7_]*(n)?\\b(?!\\$))|((?<!\\$)(?:(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\B(\\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(\\.)(n)?\\B)|(?:\\B(\\.)[0-9][0-9_]*(n)?\\b)|(?:\\b[0-9][0-9_]*(n)?\\b(?!\\.)))(?!\\$)))",
+          "end": "(?=:)|(?=\\s*([\\(\\<,}])|(\\s+as\\s+))",
           "name": "meta.object.member.ballerina meta.object-literal.key.ballerina",
           "patterns": [
             {
@@ -1868,7 +1868,7 @@
           ]
         },
         {
-          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[(<])",
+          "begin": "(?<=[\\]\\'\\\"\\`])(?=\\s*[\\(\\<])",
           "end": "(?=\\}|;|,)|(?<=\\})",
           "name": "meta.method.declaration.ballerina",
           "patterns": [
@@ -1886,7 +1886,7 @@
               "name": "constant.numeric.decimal.ballerina"
             }
           },
-          "match": "(?![_$A-Za-z])([\\d]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?![_$[:alpha:]])([[:digit:]]+)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1898,7 +1898,7 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(?:([_$A-Za-z][_$0-9A-Za-z]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*((((function\\s*[(<*])|(function\\s+)|([_$A-Za-z][_$0-9A-Za-z]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*>)*>)*>\\s*)?[(]\\s*((([{\\[]\\s*)?$)|((\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+\\})+\\s*)?=\\s*))))))|((<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*>)*>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$A-Za-z][_$0-9A-Za-z]*\\s*:)))|((<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|<\\s*([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*>)*>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$A-Za-z]|(\\{([^{}]|(\\{([^{}]|\\{[^{}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$A-Za-z]))([^()\\'\\\"\\`]|(\\(([^()]|(\\(([^()]|\\([^()]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>(){}]|<([^<>]|<([^<>]|<[^<>]+>)+>)+>|\\([^()]+\\)|\\{[^{}]+\\})+)?\\s*=>))))))",
+          "match": "(?:([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:(\\s*\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/)*\\s*((((function\\s*[(<*])|(function\\s+)|([_$[:alpha:]][_$[:alnum:]]*\\s*=>)))|((((<\\s*$)|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[\\(]\\s*((([\\{\\[]\\s*)?$)|((\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})\\s*((:\\s*\\{?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*)))|((\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])\\s*((:\\s*\\[?$)|((\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+\\s*)?=\\s*))))))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?[(]\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([)]\\s*:)|((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:)))|((<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\]))([^=<>]|=[^<])*\\>)*\\>)*>\\s*)?\\(\\s*(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*(([_$[:alpha:]]|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\.\\.\\.\\s*[_$[:alpha:]]))([^()\\'\\\"\\`]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))*)?\\)(\\s*:\\s*([^<>\\(\\)\\{\\}]|\\<([^<>]|\\<([^<>]|\\<[^<>]+\\>)+\\>)+\\>|\\([^\\(\\)]+\\)|\\{[^\\{\\}]+\\})+)?\\s*=>))))))",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1907,7 +1907,7 @@
               "name": "meta.object-literal.key.ballerina"
             }
           },
-          "match": "(?:[_$A-Za-z][_$0-9A-Za-z]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
+          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=(\\/\\*([^\\*]|(\\*[^\\/]))*\\*\\/\\s*)*:)",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1931,7 +1931,7 @@
               "name": "variable.other.readwrite.ballerina"
             }
           },
-          "match": "([_$A-Za-z][_$0-9A-Za-z]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
+          "match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=,|\\}|$|\\/\\/|\\/\\*)",
           "name": "meta.object.member.ballerina"
         },
         {
@@ -1943,21 +1943,21 @@
               "name": "storage.modifier.ballerina"
             }
           },
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+(const)(?=\\s*([,}]|$))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+(const)(?=\\s*([,}]|$))",
           "name": "meta.object.member.ballerina"
         },
         {
-          "begin": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
+          "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.as.ballerina"
             }
           },
-          "end": "(?=[;),}\\]:?\\-+>]|\\|\\||\\&\\&|!==|$|^|((?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
+          "end": "(?=[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|^|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as)\\s+))",
           "name": "meta.object.member.ballerina"
         },
         {
-          "begin": "(?=[_$A-Za-z][_$0-9A-Za-z]*\\s*=)",
+          "begin": "(?=[_$[:alpha:]][_$[:alnum:]]*\\s*=)",
           "end": "(?=,|\\}|$|\\/\\/|\\/\\*)",
           "name": "meta.object.member.ballerina",
           "patterns": [
@@ -2032,7 +2032,7 @@
               "include": "#code"
             },
             {
-              "match": "\\b([_$A-Za-z][_$0-9A-Za-z]*)\\b",
+              "match": "\\b([_$[:alpha:]][_$[:alnum:]]*)\\b",
               "name": "variable.parameter.ballerina"
             }
           ]
@@ -2072,13 +2072,13 @@
     "parameter": {
       "patterns": [
         {
-          "begin": "((?=record|object|function)|([_$A-Za-z][_$0-9A-Za-z]*)(?=\\|)|(?:[_$A-Za-z][_$0-9A-Za-z]*))",
+          "begin": "((?=record|object|function)|([_$[:alpha:]][_$[:alnum:]]*)(?=\\|)|(?:[_$[:alpha:]][_$[:alnum:]]*))",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?:\\,)|(?:\\|)|(?::)|(?==>)|(?=\\))|(?=\\])",
+          "end": "(?:\\,)|(?:\\|)|(?:\\:)|(?==>)|(?=\\))|(?=\\])",
           "patterns": [
             {
               "include": "#parameterWithDescriptor"
@@ -2105,7 +2105,7 @@
               "include": "#parameterTuple"
             },
             {
-              "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*",
               "name": "default.variable.parameter.ballerina"
             }
           ]
@@ -2152,7 +2152,7 @@
               "name": "variable.parameter.ballerina"
             }
           },
-          "match": "(?:(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|(string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(is|new|isolated|null|function|in)\\b|\\b(true|false)\\b|\\b(check|foreach|if|checkpanic)\\b|\\b(readonly|error|map)\\b|([_$A-Za-z][_$0-9A-Za-z]*))(?![_$0-9A-Za-z])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
+          "match": "(?:(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+)?(?:(\\.\\.\\.)\\s*)?(?<!=|:)(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(this)|(string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(is|new|isolated|null|function|in)\\b|\\b(true|false)\\b|\\b(check|foreach|if|checkpanic)\\b|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*(\\??)"
         }
       ]
     },
@@ -2160,7 +2160,7 @@
       "patterns": [
         {
           "begin": "\\[",
-          "end": "(?=\\,)|(?=\\|)|(?=:)|(?==>)|(?=\\))",
+          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==>)|(?=\\))",
           "patterns": [
             {
               "include": "#record"
@@ -2185,13 +2185,13 @@
       "patterns": [
         {
           "begin": "\\]",
-          "end": "(?=\\,)|(?=\\|)|(?=:)|(?==>)|(?=\\))",
+          "end": "(?=\\,)|(?=\\|)|(?=\\:)|(?==>)|(?=\\))",
           "patterns": [
             {
               "include": "#defaultWithParentheses"
             },
             {
-              "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*",
               "name": "default.variable.parameter.ballerina"
             }
           ]
@@ -2201,7 +2201,7 @@
     "parameterTupleType": {
       "patterns": [
         {
-          "begin": "[_$A-Za-z][_$0-9A-Za-z]*",
+          "begin": "[_$[:alpha:]][_$[:alnum:]]*",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
@@ -2328,7 +2328,7 @@
               "name": "punctuation.accessor.optional.ballerina"
             }
           },
-          "match": "(?:(\\.)|(\\?\\.(?!\\s*[\\d])))"
+          "match": "(?:(\\.)|(\\?\\.(?!\\s*[[:digit:]])))"
         }
       ]
     },
@@ -2543,7 +2543,7 @@
                   "name": "constant.character.escape.backslash.regexp"
                 }
               },
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\[^pPu]))-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\[^pPu]))",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\[^pPu]))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4}))|(\\\\[^pPu]))",
               "name": "constant.other.character-class.range.regexp.ballerina"
             },
             {
@@ -2585,10 +2585,10 @@
               "name": "entity.name.function.ballerina"
             }
           },
-          "match": "(\\bself\\b)\\s*(.)\\s*([_$A-Za-z][_$0-9A-Za-z]*)\\s*(?=\\()"
+          "match": "(\\bself\\b)\\s*(.)\\s*([_$[:alpha:]][_$[:alnum:]]*)\\s*(?=\\()"
         },
         {
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))self\\b(?!\\$)",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))self\\b(?!\\$)",
           "name": "variable.language.this.ballerina"
         }
       ]
@@ -2642,7 +2642,7 @@
           "include": "#string"
         },
         {
-          "match": "(\\/([_$A-Za-z][_$0-9A-Za-z]*)|\\\"[_$A-Za-z][_$0-9A-Za-z]*\\\")",
+          "match": "(\\/([_$[:alpha:]][_$[:alnum:]]*)|\\\"[_$[:alpha:]][_$[:alnum:]]*\\\")",
           "name": "entity.service.path.ballerina"
         }
       ]
@@ -2668,7 +2668,7 @@
     "source": {
       "patterns": [
         {
-          "begin": "(\\bsource\\b)\\s+([_$A-Za-z][_$0-9A-Za-z]*)",
+          "begin": "(\\bsource\\b)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.ballerina"
@@ -2759,7 +2759,7 @@
     "stringTemplate": {
       "patterns": [
         {
-          "begin": "((string)|([_$A-Za-z][_$0-9A-Za-z]*))?(`)",
+          "begin": "((string)|([_$[:alpha:]][_$[:alnum:]]*))?(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.ballerina"
@@ -2866,7 +2866,7 @@
       ]
     },
     "ternary-expression": {
-      "begin": "(?!\\?\\.\\s*[^\\d])(\\?)(?!\\?)",
+      "begin": "(?!\\?\\.\\s*[^[:digit:]])(\\?)(?!\\?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.operator.ternary.ballerina"
@@ -2900,7 +2900,7 @@
               "include": "#paranthesisedBracket"
             },
             {
-              "match": "\\b([_$A-Za-z][_$0-9A-Za-z]*)\\b",
+              "match": "\\b([_$[:alpha:]][_$[:alnum:]]*)\\b",
               "name": "storage.type.ballerina"
             }
           ]
@@ -2929,13 +2929,13 @@
     "type-annotation": {
       "patterns": [
         {
-          "begin": "(:)",
+          "begin": "(\\:)",
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.type.annotation.ballerina"
             }
           },
-          "end": "(?<![:|&])((?=$|^|[,);}\\]?>=>]|//)|(?==[^>])|((?<=[}>\\])]|[_$A-Za-z])\\s*(?=\\{)))(\\?)?",
+          "end": "(?<![:|&])((?=$|^|[,);\\}\\]\\?\\>\\=>]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))(\\?)?",
           "name": "meta.type.annotation.ballerina",
           "patterns": [
             {
@@ -2989,7 +2989,7 @@
                   "name": "entity.name.function.ballerina"
                 }
               },
-              "match": "\\b(is|new|isolated|null|function|in)\\b|\\b(true|false)\\b|\\b(check|foreach|if|checkpanic)\\b|\\b(readonly|error|map)\\b|\\b(var)\\b|([_$A-Za-z][_$0-9A-Za-z]*)((\\.)([_$A-Za-z][_$0-9A-Za-z]*)(\\()(\\)))?"
+              "match": "\\b(is|new|isolated|null|function|in)\\b|\\b(true|false)\\b|\\b(check|foreach|if|checkpanic)\\b|\\b(readonly|error|map)\\b|\\b(var)\\b|([_$[:alpha:]][_$[:alnum:]]*)((\\.)([_$[:alpha:]][_$[:alnum:]]*)(\\()(\\)))?"
             },
             {
               "match": "\\?",
@@ -3011,7 +3011,7 @@
     "type-primitive": {
       "patterns": [
         {
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|int|boolean|float|byte|decimal|json|xml|anydata)(?![_$0-9A-Za-z])(?:(?=\\.\\.\\.)|(?!\\.))",
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(string|int|boolean|float|byte|decimal|json|xml|anydata)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))",
           "name": "support.type.primitive.ballerina"
         }
       ]
@@ -3053,7 +3053,7 @@
               "name": "punctuation.separator.label.ballerina"
             }
           },
-          "match": "(?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$A-Za-z][_$0-9A-Za-z]*)\\s*(\\?)?\\s*(:)"
+          "match": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?)?\\s*(:)"
         },
         {
           "include": "#identifiers"
@@ -3069,7 +3069,7 @@
     "typeDefinition": {
       "patterns": [
         {
-          "begin": "(\\btype\\b)\\s+([_$A-Za-z][_$0-9A-Za-z]*)",
+          "begin": "(\\btype\\b)\\s+([_$[:alpha:]][_$[:alnum:]]*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.ballerina"
@@ -3110,7 +3110,7 @@
               "include": "#type-primitive"
             },
             {
-              "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*",
               "name": "variable.other.readwrite.ballerina"
             },
             {
@@ -3129,7 +3129,7 @@
     "typeDescription": {
       "patterns": [
         {
-          "begin": "[_$A-Za-z][_$0-9A-Za-z]*",
+          "begin": "[_$[:alpha:]][_$[:alnum:]]*",
           "end": "(?=;)",
           "patterns": [
             {
@@ -3142,7 +3142,7 @@
               "include": "#type-primitive"
             },
             {
-              "match": "[_$A-Za-z][_$0-9A-Za-z]*",
+              "match": "[_$[:alpha:]][_$[:alnum:]]*",
               "name": "storage.type.ballerina"
             }
           ]
@@ -3236,11 +3236,11 @@
               "name": "storage.modifier.ballerina support.type.primitive.ballerina"
             }
           },
-          "end": "(?!\\b(var))((?=;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=(if)\\s+))|((?<!^string|[^\\._$0-9A-Za-z]string|^int|[^\\._$0-9A-Za-z]int)(?=\\s*$)))",
+          "end": "(?!\\b(var))((?=;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?=(if)\\s+))|((?<!^string|[^\\._$[:alnum:]]string|^int|[^\\._$[:alnum:]]int)(?=\\s*$)))",
           "name": "meta.var.expr.ballerina",
           "patterns": [
             {
-              "begin": "\\b(var)(?=\\s+|\\[|\\?|\\||:)",
+              "begin": "\\b(var)(?=\\s+|\\[|\\?|\\||\\:)",
               "beginCaptures": {
                 "0": {
                   "name": "support.type.primitive.ballerina"
@@ -3302,7 +3302,7 @@
         },
         {
           "begin": "(?=\\b(const(?!\\s+enum\\b)))",
-          "end": "(?!\\b(const(?!\\s+enum\\b)))((?=\\bannotation\\b|;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<!^string|[^\\._$0-9A-Za-z]string|^int|[^\\._$0-9A-Za-z]int)(?=\\s*$)))",
+          "end": "(?!\\b(const(?!\\s+enum\\b)))((?=\\bannotation\\b|;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<!^string|[^\\._$[:alnum:]]string|^int|[^\\._$[:alnum:]]int)(?=\\s*$)))",
           "name": "meta.var.expr.ballerina",
           "patterns": [
             {
@@ -3341,20 +3341,20 @@
           "include": "#punctuation-comma"
         },
         {
-          "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|\\[|\\?|\\||:)",
+          "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|\\[|\\?|\\||\\:)",
           "beginCaptures": {
             "0": {
               "name": "support.type.primitive.ballerina"
             }
           },
-          "end": "(?!\\b(var))((?=;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<!^string|[^\\._$0-9A-Za-z]string|^int|[^\\._$0-9A-Za-z]int)(?=\\s*$)))",
+          "end": "(?!\\b(var))((?=;|}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|service|type|var)\\b))|((?<!^string|[^\\._$[:alnum:]]string|^int|[^\\._$[:alnum:]]int)(?=\\s*$)))",
           "name": "meta.var.expr.ballerina",
           "patterns": [
             {
               "include": "#xml"
             },
             {
-              "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|\\[|\\?|\\||:)",
+              "begin": "(string|int|boolean|float|byte|decimal|json|xml|anydata)(?=\\s+|\\[|\\?|\\||\\:)",
               "beginCaptures": {
                 "0": {
                   "name": "support.type.primitive.ballerina"
@@ -3424,20 +3424,20 @@
           "include": "#types"
         },
         {
-          "begin": "([_$A-Za-z][_$0-9A-Za-z]*)",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ballerina variable.other.constant.ballerina"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+))"
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+))"
         }
       ]
     },
     "var-single-variable": {
       "patterns": [
         {
-          "begin": "((string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(readonly|error|map)\\b|([_$A-Za-z][_$0-9A-Za-z]*))(?=\\s+|\\;|>|\\|)",
+          "begin": "((string|int|boolean|float|byte|decimal|json|xml|anydata)|\\b(readonly|error|map)\\b|([_$[:alpha:]][_$[:alnum:]]*))(?=\\s+|\\;|\\>|\\|)",
           "beginCaptures": {
             "2": {
               "name": "support.type.primitive.ballerina"
@@ -3478,7 +3478,7 @@
           ]
         },
         {
-          "begin": "([_$A-Za-z][_$0-9A-Za-z]*)\\s+(!)?",
+          "begin": "([_$[:alpha:]][_$[:alnum:]]*)\\s+(\\!)?",
           "beginCaptures": {
             "1": {
               "name": "meta.definition.variable.ballerina variable.other.readwrite.ballerina"
@@ -3487,7 +3487,7 @@
               "name": "keyword.operator.definiteassignment.ballerina"
             }
           },
-          "end": "(?=$|^|[;,=}]|((?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+))",
+          "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+))",
           "name": "meta.var-single-variable.expr.ballerina"
         }
       ]
@@ -3504,7 +3504,7 @@
           "end": "(?=$|[,);}\\]])",
           "patterns": [
             {
-              "match": "(\\')([_$A-Za-z][_$0-9A-Za-z]*)",
+              "match": "(\\')([_$[:alpha:]][_$[:alnum:]]*)",
               "name": "variable.other.property.ballerina"
             },
             {
@@ -3531,7 +3531,7 @@
               "name": "keyword.operator.assignment.ballerina"
             }
           },
-          "end": "(?=[,);}\\]]|((?<![_$0-9A-Za-z])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+))|(?=^\\s*$)|(?<=\\S)(?<!=)(?=\\s*$)",
+          "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))\\s+))|(?=^\\s*$)|(?<=\\S)(?<!=)(?=\\s*$)",
           "patterns": [
             {
               "include": "#expression"
@@ -3543,13 +3543,13 @@
     "variableDef": {
       "patterns": [
         {
-          "begin": "(?:(?!\\+)[_$A-Za-z][_$0-9A-Za-z]*)(?: |\\t)|(?=\\()",
+          "begin": "(?:(?!\\+)[_$[:alpha:]][_$[:alnum:]]*)(?: |\\t)|(?=\\()",
           "beginCaptures": {
             "0": {
               "name": "storage.type.ballerina"
             }
           },
-          "end": "(?:[_$A-Za-z][_$0-9A-Za-z]*)|(?=\\,)|(?=;)|\\.\\.\\.",
+          "end": "(?:[_$[:alpha:]][_$[:alnum:]]*)|(?=\\,)|(?=;)|\\.\\.\\.",
           "patterns": [
             {
               "include": "#tupleType"