tm-grammars 1.23.3 → 1.23.4

package/grammars/common-lisp.json

@@ -119,7 +119,7 @@
           "name": "constant.language.commonlisp"
         },
         {
-          "match": "(?<=^|[\\s(]|,@|,\\.|,)([+\\-]?[0-9]+(?:/[0-9]+)*|[\\-+]?[0-9]*\\.?[0-9]+([eE][\\-+]?[0-9]+)?|(#[bB])[01/+\\-]+|(#[oO])[0-7/+\\-]+|(#[xX])[/+\\-\\h]+|(#[0-9]+[rR]?)[0-9a-zA-Z/+\\-]+)(?=([\\s)]))",
+          "match": "(?<=^|[\\s(]|,@|,\\.|,)([+-]?[0-9]+(?:/[0-9]+)*|[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?|(#[bB])[01/+-]+|(#[oO])[0-7/+-]+|(#[xX])[/+\\-\\h]+|(#[0-9]+[rR]?)[0-9a-zA-Z/+-]+)(?=([\\s)]))",
           "name": "constant.numeric.commonlisp"
         },
         {
@@ -127,7 +127,7 @@
           "name": "variable.other.constant.dot.commonlisp"
         },
         {
-          "match": "(?<=^|[\\s(]|,@|,\\.|,)([+\\-]?[0-9]*\\.[0-9]*(([esfdlESFDL])[+\\-]?[0-9]+)?|[+\\-]?[0-9]+(\\.[0-9]*)?([esfdlESFDL])[+\\-]?[0-9]+)(?=([\\s)]))",
+          "match": "(?<=^|[\\s(]|,@|,\\.|,)([+-]?[0-9]*\\.[0-9]*(([esfdlESFDL])[+-]?[0-9]+)?|[+-]?[0-9]+(\\.[0-9]*)?([esfdlESFDL])[+-]?[0-9]+)(?=([\\s)]))",
           "name": "constant.numeric.commonlisp"
         }
       ]
@@ -175,7 +175,7 @@
               ]
             }
           },
-          "match": "(?i)(?<=^|[\\s(])(def(?:un|setf|method|macro|ine-symbol-macro|ine-setf-expander|ine-modify-macro|ine-method-combination|ine-compiler-macro|generic))\\s+(\\(\\s*([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+)\\s*((,(?:[@.]|))?)([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)|((,(?:[@.]|))?)([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?))(?=([\\s()]))"
+          "match": "(?i)(?<=^|[\\s(])(def(?:un|setf|method|macro|ine-symbol-macro|ine-setf-expander|ine-modify-macro|ine-method-combination|ine-compiler-macro|generic))\\s+(\\(\\s*([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+)\\s*((,(?:[@.]|))?)([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)|((,(?:[@.]|))?)([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?))(?=([\\s()]))"
         },
         {
           "captures": {
@@ -186,7 +186,7 @@
               "name": "entity.name.type.commonlisp"
             }
           },
-          "match": "(?i)(?<=^|[\\s(])(def(?:type|package|ine-condition|class))\\s+([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
+          "match": "(?i)(?<=^|[\\s(])(def(?:type|package|ine-condition|class))\\s+([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         },
         {
           "captures": {
@@ -205,7 +205,7 @@
               ]
             }
           },
-          "match": "(?i)(?<=^|[\\s(])(defconstant)\\s+([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
+          "match": "(?i)(?<=^|[\\s(])(defconstant)\\s+([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         },
         {
           "captures": {
@@ -224,7 +224,7 @@
               "name": "entity.name.type.commonlisp"
             }
           },
-          "match": "(?i)(?<=^|[\\s(])(defstruct)\\s+\\(?\\s*([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
+          "match": "(?i)(?<=^|[\\s(])(defstruct)\\s+\\(?\\s*([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         },
         {
           "captures": {
@@ -243,7 +243,7 @@
               ]
             }
           },
-          "match": "(?i)(?<=^|[\\s(])(macrolet|labels|flet)\\s+\\(\\s*\\(\\s*([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
+          "match": "(?i)(?<=^|[\\s(])(macrolet|labels|flet)\\s+\\(\\s*\\(\\s*([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(?=([\\s()]))"
         }
       ]
     },
@@ -280,7 +280,7 @@
       ]
     },
     "lambda-list": {
-      "match": "(?i)(?<=^|[\\s(])&(?:[#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?|whole|rest|optional|key|environment|body|aux|allow-other-keys)(?=([\\s()]))",
+      "match": "(?i)(?<=^|[\\s(])&(?:[#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?|whole|rest|optional|key|environment|body|aux|allow-other-keys)(?=([\\s()]))",
       "name": "keyword.other.lambdalist.commonlisp"
     },
     "macro": {
@@ -310,7 +310,7 @@
               "name": "support.type.package.commonlisp"
             }
           },
-          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(([A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)|(#))(?=:(?::|))"
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(([A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)|(#))(?=:(?::|))"
         }
       ]
     },
@@ -321,7 +321,7 @@
           "name": "variable.other.constant.singlequote.commonlisp"
         },
         {
-          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,):[#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?(?=([\\s()]))",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,):[#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?(?=([\\s()]))",
           "name": "entity.name.variable.commonlisp"
         },
         {
@@ -396,7 +396,7 @@
           "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#)([0-9]+)(#)(?=.)"
         },
         {
-          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#([+\\-]))(?=\\S)",
+          "match": "(?i)(?<=^|[\\s(]|,@|,\\.|,)(#([+-]))(?=\\S)",
           "name": "variable.other.constant.sharpsign.commonlisp"
         },
         {
@@ -472,7 +472,7 @@
               "name": "storage.type.function.formattedstring.commonlisp"
             }
           },
-          "match": "(?i)(~)(((([+\\-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)([()\\[\\];{}<>\\^])"
+          "match": "(?i)(~)(((([+-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)([()\\[\\];{}<>^])"
         },
         {
           "captures": {
@@ -489,7 +489,7 @@
               "name": "entity.name.variable.commonlisp"
             }
           },
-          "match": "(?i)(~)(((([+\\-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)([ASDBOXRPCFEG$%\\&|~T*?_WI])"
+          "match": "(?i)(~)(((([+-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)([ASDBOXRPCFEG$%\\&|~T*?_WI])"
         },
         {
           "captures": {
@@ -512,7 +512,7 @@
               "name": "entity.name.variable.commonlisp"
             }
           },
-          "match": "(?i)(~)(((([+\\-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)(/)([#:A-Za-z0-9+\\-*/@$%\\^\\&_=<>~!?\\[\\]{}.]+?)(/)"
+          "match": "(?i)(~)(((([+-]?[0-9]+)|('.)|[V#])*?(,)?)*?)((:@|@:|[:@])?)(/)([#:A-Za-z0-9+\\-*/@$%^\\&_=<>~!?\\[\\]{}.]+?)(/)"
         },
         {
           "match": "(~\\n)",

package/grammars/cpp-macro.json

@@ -5172,7 +5172,7 @@
       ]
     },
     "operator_overload": {
-      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(operator)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(?:(?:((?:delete\\[]|delete|new\\[]|<=>|<<=|new|>>=|->\\*|/=|%=|&=|>=|\\|=|\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|<<|>>|--|<=|\\^=|==|!=|&&|\\|\\||\\+=|-=|\\*=|[,+\\-!~*\\&/%<>\\^|=]))|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:\\[])?)))|(\"\")((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[<(])",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(operator)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(?:(?:((?:delete\\[]|delete|new\\[]|<=>|<<=|new|>>=|->\\*|/=|%=|&=|>=|\\|=|\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|<<|>>|--|<=|\\^=|==|!=|&&|\\|\\||\\+=|-=|\\*=|[,+\\-!~*\\&/%<>^|=]))|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:\\[])?)))|(\"\")((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[<(])",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.operator-overload.cpp"
@@ -6028,7 +6028,7 @@
           "name": "keyword.operator.logical.cpp"
         },
         {
-          "match": "[\\&|\\^~]",
+          "match": "[\\&|^~]",
           "name": "keyword.operator.bitwise.cpp"
         },
         {
@@ -7231,7 +7231,7 @@
               "name": "invalid.illegal.delimiter-too-long"
             }
           },
-          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?|(?=(?<!\\\\)\n)",
+          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?|(?=(?<!\\\\)\\n)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end"

package/grammars/cpp.json

@@ -2658,7 +2658,7 @@
                   "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric.cpp"
                 }
               ]
@@ -2666,7 +2666,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])*"
     },
     "decltype": {
       "begin": "((?<!\\w)decltype(?!\\w))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(\\()",
@@ -7017,7 +7017,7 @@
                   "match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=\\h)'(?=\\h)))*)(?:(?<!')([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)'(?=\\h))*))?((?:[uU]|[uU]ll?|[uU]LL?|ll?[uU]?|LL?[uU]?|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)"
                 },
                 {
-                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])+",
+                  "match": "(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])+",
                   "name": "invalid.illegal.constant.numeric.cpp"
                 }
               ]
@@ -7025,10 +7025,10 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+\\-])*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_.']|(?<=[eEpP])[+-])*"
     },
     "operator_overload": {
-      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(operator)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(?:(?:((?:delete\\[]|delete|new\\[]|<=>|<<=|new|>>=|->\\*|/=|%=|&=|>=|\\|=|\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|<<|>>|--|<=|\\^=|==|!=|&&|\\|\\||\\+=|-=|\\*=|[,+\\-!~*\\&/%<>\\^|=]))|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:\\[])?)))|(\"\")((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[<(])",
+      "begin": "((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(\\s*+((?:(?:(?:\\[\\[.*?]]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?(?!(?:transaction_safe_dynamic|__has_cpp_attribute|reinterpret_cast|transaction_safe|atomic_noexcept|atomic_commit|__has_include|atomic_cancel|synchronized|thread_local|dynamic_cast|static_cast|const_cast|constexpr|co_return|constinit|namespace|protected|consteval|constexpr|constexpr|co_return|consteval|co_await|continue|template|reflexpr|volatile|register|co_await|co_yield|restrict|noexcept|volatile|override|explicit|decltype|operator|noexcept|noexcept|typename|requires|co_yield|nullptr|alignof|alignas|default|mutable|virtual|mutable|private|include|warning|_Pragma|defined|typedef|__asm__|concept|define|module|sizeof|switch|delete|pragma|and_eq|inline|xor_eq|typeid|import|extern|public|bitand|static|export|return|friend|ifndef|not_eq|false|final|break|const|catch|endif|ifdef|undef|error|audit|while|using|axiom|or_eq|compl|throw|bitor|const|line|case|else|this|true|goto|else|NULL|elif|new|asm|xor|and|try|not|for|do|if|or|if)\\b)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*\\b((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)?(?![\\w<:.]))(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))?((?:__(?:cdecl|clrcall|stdcall|fastcall|thiscall|vectorcall))?)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(operator)((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)\\s*+(((?<!<)<(?!<)(?:/\\*(?:[^*]++|\\*+(?!/))*+\\*/|\"(?:[^\"]*|\\\\\")\"|'(?:[^']*|\\\\')'|\\g<55>|(?:[^'\"<>/]|/[^*])++)*>)\\s*+)?::)*+)(?:(?:((?:delete\\[]|delete|new\\[]|<=>|<<=|new|>>=|->\\*|/=|%=|&=|>=|\\|=|\\+\\+|--|\\(\\)|\\[]|->|\\+\\+|<<|>>|--|<=|\\^=|==|!=|&&|\\|\\||\\+=|-=|\\*=|[,+\\-!~*\\&/%<>^|=]))|((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)(((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))?(?:[\\&*]((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z)))*[\\&*])?((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?:\\[])?)))|(\"\")((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))((?<!\\w)(?:[a-zA-Z_]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*(?!\\w)))((?:(?:\\s*+(/\\*)((?:[^*]++|\\*+(?!/))*+(\\*/))\\s*+)+|\\s++|(?<=\\W)|(?=\\W)|^|\\n?$|\\A|\\Z))(?=[<(])",
       "beginCaptures": {
         "0": {
           "name": "meta.head.function.definition.special.operator-overload.cpp"
@@ -7884,7 +7884,7 @@
           "name": "keyword.operator.logical.cpp"
         },
         {
-          "match": "[\\&|\\^~]",
+          "match": "[\\&|^~]",
           "name": "keyword.operator.bitwise.cpp"
         },
         {
@@ -13133,7 +13133,7 @@
               "name": "invalid.illegal.delimiter-too-long"
             }
           },
-          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?",
+          "end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|\\\\(?:u\\h{4}|U\\h{8}))(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*)|(_(?:[a-zA-Z0-9_]|\\\\(?:u\\h{4}|U\\h{8}))*))?",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.string.end"

package/grammars/crystal.json

@@ -4,7 +4,7 @@
     "cr"
   ],
   "firstLineMatch": "^#!/.*\\bcrystal",
-  "foldingStartMarker": "^(\\s*+(annotation|module|class|struct|union|enum|def(?!.*\\bend\\s*$)|unless|if|case|begin|for|while|until|^=begin|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\s(do|begin|case)|(?<!\\$)[\\-+=\\&|*/~%\\^<>]\\s*+(if|unless)))\\b(?![^;]*+;.*?\\bend\\b)|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\{(?![^}]*+})|\\[(?![^\\]]*+]))).*$|#.*?\\(fold\\)\\s*+$",
+  "foldingStartMarker": "^(\\s*+(annotation|module|class|struct|union|enum|def(?!.*\\bend\\s*$)|unless|if|case|begin|for|while|until|^=begin|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\s(do|begin|case)|(?<!\\$)[-+=\\&|*/~%^<>]\\s*+(if|unless)))\\b(?![^;]*+;.*?\\bend\\b)|(\"(\\\\.|[^\"])*+\"|'(\\\\.|[^'])*+'|[^#\"'])*(\\{(?![^}]*+})|\\[(?![^\\]]*+]))).*$|#.*?\\(fold\\)\\s*+$",
   "foldingStopMarker": "((^|;)\\s*+end\\s*+(#.*)?$|(^|;)\\s*+end\\..*$|^\\s*+[}\\]],?\\s*+(#.*)?$|#.*?\\(end\\)\\s*+$|^=end)",
   "name": "crystal",
   "patterns": [
@@ -254,7 +254,7 @@
       "name": "variable.other.constant.crystal"
     },
     {
-      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[\\-+]@?|\\[][?=]?|\\[]=?))\\s*(\\()",
+      "begin": "(?=def\\b)(?<=^|\\s)(def)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|\\[]=?))\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.crystal"
@@ -311,19 +311,19 @@
           "name": "entity.name.function.crystal"
         }
       },
-      "match": "(?=def\\b)(?<=^|\\s)(def)\\b(\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[\\-+]@?|\\[][?=]?|\\[]=?)))?",
+      "match": "(?=def\\b)(?<=^|\\s)(def)\\b(\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|\\^|===?|!=|>[>=]?|<=>|<[<=]?|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|\\[]=?)))?",
       "name": "meta.function.method.without-arguments.crystal"
     },
     {
-      "match": "\\b[0-9][0-9_]*\\.[0-9][0-9_]*([eE][+\\-]?[0-9_]+)?(f(?:32|64))?\\b",
+      "match": "\\b[0-9][0-9_]*\\.[0-9][0-9_]*([eE][+-]?[0-9_]+)?(f(?:32|64))?\\b",
       "name": "constant.numeric.float.crystal"
     },
     {
-      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?[eE][+\\-]?[0-9_]+(f(?:32|64))?\\b",
+      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?[eE][+-]?[0-9_]+(f(?:32|64))?\\b",
       "name": "constant.numeric.float.crystal"
     },
     {
-      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+\\-]?[0-9_]+)?(f(?:32|64))\\b",
+      "match": "\\b[0-9][0-9_]*(\\.[0-9][0-9_]*)?([eE][+-]?[0-9_]+)?(f(?:32|64))\\b",
       "name": "constant.numeric.float.crystal"
     },
     {
@@ -963,7 +963,7 @@
           "name": "punctuation.definition.constant.crystal"
         }
       },
-      "match": "(?<!:)(:)(?>[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%\\&`/|]|\\*\\*?|=?~|[\\-+]@?|\\[][?=]?|@@?[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*)",
+      "match": "(?<!:)(:)(?>[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%\\&`/|]|\\*\\*?|=?~|[-+]@?|\\[][?=]?|@@?[a-zA-Z_\\x{80}-\\x{10FFFF}][\\w\\x{80}-\\x{10FFFF}]*)",
       "name": "constant.other.symbol.crystal"
     },
     {
@@ -1416,7 +1416,7 @@
       ]
     },
     {
-      "match": "((?<=\\W)\\b|^)\\w+\\b(?=\\s*([\\])}=+\\-*/\\^$,.]|<\\s|<<[\\s|.]))",
+      "match": "((?<=\\W)\\b|^)\\w+\\b(?=\\s*([\\])}=+\\-*/^$,.]|<\\s|<<[\\s|.]))",
       "name": "variable.other.crystal"
     }
   ],

package/grammars/csharp.json

@@ -349,7 +349,7 @@
       "match": "(?<!\\.)\\b(as)\\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>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?(?!\\?))?(?:\\s*\\[\\s*(?:,\\s*)*](?:\\s*\\?(?!\\?))?)*)?"
     },
     "assignment-expression": {
-      "begin": "(?:[*/%+\\-]|\\?\\?|[\\&\\^]|<<|>>>?|\\|)?=(?![=>])",
+      "begin": "(?:[*/%+-]|\\?\\?|[\\&^]|<<|>>>?|\\|)?=(?![=>])",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -660,7 +660,7 @@
           "name": "punctuation.parenthesis.close.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#casted-constant-pattern"
@@ -1795,7 +1795,7 @@
           "name": "keyword.operator.logical.cs"
         },
         {
-          "match": "[\\&~\\^|]",
+          "match": "[\\&~^|]",
           "name": "keyword.operator.bitwise.cs"
         },
         {
@@ -2492,7 +2492,7 @@
           "name": "keyword.operator.expression.pattern.is.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=)",
       "patterns": [
         {
           "include": "#pattern"
@@ -2613,7 +2613,7 @@
     },
     "list-pattern": {
       "begin": "(?=\\[)",
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\[",
@@ -2639,7 +2639,7 @@
         },
         {
           "begin": "(?<=])",
-          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -3186,7 +3186,7 @@
                   "match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=\\h)_(?=\\h)))*)((?<!_)([eE])(\\+?)(-?)([0-9](?:[0-9]|(?<=\\h)_(?=\\h))*))?((?:(?:(?:(?:(?:[uU]|[uU]l)|[uU]L)|l[uU]?)|L[uU]?)|[fFdDmM])(?!\\w))?$"
                 },
                 {
-                  "match": "(?:[0-9a-zA-Z_]|(?<=[eE])[+\\-]|\\.\\d)+",
+                  "match": "(?:[0-9a-zA-Z_]|(?<=[eE])[+-]|\\.\\d)+",
                   "name": "invalid.illegal.constant.numeric.cs"
                 }
               ]
@@ -3194,7 +3194,7 @@
           ]
         }
       },
-      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_]|(?<=[eE])[+\\-]|\\.\\d)*"
+      "match": "(?<!\\w)\\.?\\d(?:[0-9a-zA-Z_]|(?<=[eE])[+-]|\\.\\d)*"
     },
     "object-creation-expression": {
       "patterns": [
@@ -3247,7 +3247,7 @@
       "name": "keyword.operator.assignment.cs"
     },
     "operator-declaration": {
-      "begin": "(?<type_name>(?:ref\\s+(?:readonly\\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>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*\\b(?<operator_keyword>operator)\\b\\s*(?<operator>[+\\-*/%\\&|\\^!=~<>]+|true|false)\\s*(?=\\()",
+      "begin": "(?<type_name>(?:ref\\s+(?:readonly\\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>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*\\??\\s*)*)\\s*\\b(?<operator_keyword>operator)\\b\\s*(?<operator>[+\\-*/%\\&|^!=~<>]+|true|false)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -3417,7 +3417,7 @@
     },
     "positional-pattern": {
       "begin": "(?=\\()",
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\(",
@@ -3443,7 +3443,7 @@
         },
         {
           "begin": "(?<=\\))",
-          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -3859,7 +3859,7 @@
     },
     "property-pattern": {
       "begin": "(?=\\{)",
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\{",
@@ -3885,7 +3885,7 @@
         },
         {
           "begin": "(?<=})",
-          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -4249,7 +4249,7 @@
           "name": "keyword.operator.relational.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#expression"
@@ -5135,11 +5135,11 @@
     },
     "type-pattern": {
       "begin": "(?=@?[_[:alpha:]][_[:alnum:]]*)",
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "begin": "\\G",
-          "end": "(?!\\G[@_[:alpha:]])(?=[({@_[:alpha:])}\\],;:=\\&|\\^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
+          "end": "(?!\\G[@_[:alpha:]])(?=[({@_[:alpha:])}\\],;:=\\&|^]|(?:\\s|^)\\?|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5151,7 +5151,7 @@
         },
         {
           "begin": "(?=[({@_[:alpha:]])",
-          "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5188,7 +5188,7 @@
               "name": "punctuation.separator.coloncolon.cs"
             }
           },
-          "end": "(?<=[_[:alnum:]])|(?=[.<\\[({)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?<=[_[:alnum:]])|(?=[.<\\[({)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5210,7 +5210,7 @@
               "name": "punctuation.accessor.cs"
             }
           },
-          "end": "(?<=[_[:alnum:]])|(?=[<\\[({)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+          "end": "(?<=[_[:alnum:]])|(?=[<\\[({)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
           "patterns": [
             {
               "include": "#intrusive"
@@ -5368,7 +5368,7 @@
           "name": "storage.type.var.cs"
         }
       },
-      "end": "(?=[)}\\],;:?=\\&|\\^]|!=|\\b(and|or|when)\\b)",
+      "end": "(?=[)}\\],;:?=\\&|^]|!=|\\b(and|or|when)\\b)",
       "patterns": [
         {
           "include": "#designation-pattern"
@@ -5551,7 +5551,7 @@
               "name": "punctuation.separator.equals.cs"
             }
           },
-          "match": "(?:^|\\s+)((?:([\\-_[:alnum:]]+)(:))?([\\-_[:alnum:]]+))(=)"
+          "match": "(?:^|\\s+)((?:([-_[:alnum:]]+)(:))?([-_[:alnum:]]+))(=)"
         },
         {
           "include": "#xml-string"
@@ -5584,7 +5584,7 @@
               "name": "punctuation.definition.constant.cs"
             }
           },
-          "match": "(&)([[:alpha:]:_][[:alnum:]:_.\\-]*|#\\d+|#x\\h+)(;)",
+          "match": "(&)([[:alpha:]:_][[:alnum:]:_.-]*|#\\d+|#x\\h+)(;)",
           "name": "constant.character.entity.cs"
         },
         {
@@ -5669,7 +5669,7 @@
       ]
     },
     "xml-tag": {
-      "begin": "(</?)((?:([\\-_[:alnum:]]+)(:))?([\\-_[:alnum:]]+))",
+      "begin": "(</?)((?:([-_[:alnum:]]+)(:))?([-_[:alnum:]]+))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.cs"