From 48eb3ba4a00ef70d8839a558fb0e7176e160ea75 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Tue, 16 Apr 2019 17:52:21 +0200
Subject: [PATCH] Update cpp grammar and make small themes change

---
 extensions/cpp/cgmanifest.json                |    4 +-
 extensions/cpp/syntaxes/c.tmLanguage.json     |    6 +-
 extensions/cpp/syntaxes/cpp.tmLanguage.json   | 2022 +++++++++--------
 .../theme-defaults/themes/dark_plus.json      |    5 +-
 .../theme-defaults/themes/hc_black.json       |    3 +-
 .../theme-defaults/themes/light_plus.json     |    3 +-
 .../themes/kimbie-dark-color-theme.json       |    3 +-
 .../themes/dimmed-monokai-color-theme.json    |    3 +-
 8 files changed, 1083 insertions(+), 966 deletions(-)

diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json
index 3ab00d30368..ce577b0c4e3 100644
--- a/extensions/cpp/cgmanifest.json
+++ b/extensions/cpp/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jeff-hykin/cpp-textmate-grammar",
 					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "84a65f7cce43f15aceaf1854c5bcc779c8575fe7"
+					"commitHash": "5381f0d02bd043a279ad6c2e55dc5de6812cb15a"
 				}
 			},
 			"license": "MIT",
-			"version": "1.7.6",
+			"version": "1.8.0",
 			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
 		},
 		{
diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json
index b7213b949df..e3178b20718 100644
--- a/extensions/cpp/syntaxes/c.tmLanguage.json
+++ b/extensions/cpp/syntaxes/c.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/d450ac8fb4bd1750389acfd88be341e1a91a02f3",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/4adcc1a8832391412fc7f55d08c79c52e83c9a3e",
 	"name": "C",
 	"scopeName": "source.c",
 	"patterns": [
@@ -944,11 +944,11 @@
 		"storage_types": {
 			"patterns": [
 				{
-					"match": "(?-mix:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)",
+					"match": "(?-mix:(?<!\\w)(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)(?!\\w))",
 					"name": "storage.type.built-in.primitive.c"
 				},
 				{
-					"match": "(?-mix:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)",
+					"match": "(?-mix:(?<!\\w)(?:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)(?!\\w))",
 					"name": "storage.type.built-in.c"
 				},
 				{
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json
index 3b58f791cc4..c31be82df64 100644
--- a/extensions/cpp/syntaxes/cpp.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.tmLanguage.json
@@ -4,470 +4,12 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/84a65f7cce43f15aceaf1854c5bcc779c8575fe7",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/5381f0d02bd043a279ad6c2e55dc5de6812cb15a",
 	"name": "C++",
 	"scopeName": "source.cpp",
 	"patterns": [
 		{
-			"include": "#special_block"
-		},
-		{
-			"match": "##[a-zA-Z_]\\w*(?!\\w)",
-			"name": "variable.other.macro.argument.cpp"
-		},
-		{
-			"include": "#strings"
-		},
-		{
-			"match": "(?<!\\w)(?:inline|constexpr|mutable|friend|explicit|virtual)(?!\\w)",
-			"name": "storage.modifier.specificer.functional.pre-parameters.$0.cpp"
-		},
-		{
-			"match": "(?<!\\w)(?:final|override|volatile|const|noexcept)(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r]))",
-			"name": "storage.modifier.specifier.functional.post-parameters.$0.cpp"
-		},
-		{
-			"match": "(?<!\\w)(?:const|static|volatile|register|restrict|extern)(?!\\w)",
-			"name": "storage.modifier.specifier.$0.cpp"
-		},
-		{
-			"match": "(?<!\\w)(?:private|protected|public)\\s*:",
-			"name": "storage.type.modifier.access.control.$0.cpp"
-		},
-		{
-			"match": "(?<!\\w)(?:throw|try|catch)(?!\\w)",
-			"name": "keyword.control.exception.$0.cpp"
-		},
-		{
-			"match": "(?<!\\w)(using|typedef)(?!\\w)",
-			"name": "keyword.other.$0.cpp"
-		},
-		{
-			"include": "#memory_operators"
-		},
-		{
-			"match": "(?<!\\w)this(?!\\w)",
-			"name": "variable.language.this.cpp"
-		},
-		{
-			"include": "#constants"
-		},
-		{
-			"include": "#template_isolated_definition"
-		},
-		{
-			"include": "#template_definition"
-		},
-		{
-			"include": "#scope_resolution"
-		},
-		{
-			"match": "(?-mix:\\b(constexpr|export|mutable|typename|thread_local)\\b)",
-			"name": "storage.modifier.cpp"
-		},
-		{
-			"name": "meta.function.destructor.cpp",
-			"begin": "(?x)\n(?:\n  ^ |                  # beginning of line\n  (?:(?<!else|new|=))  # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\()              # opening bracket",
-			"beginCaptures": {
-				"1": {
-					"name": "entity.name.function.destructor.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.parameters.begin.destructor.cpp"
-				}
-			},
-			"end": "(?-mix:\\))",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.parameters.end.destructor.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "$base"
-				}
-			]
-		},
-		{
-			"name": "meta.function.destructor.prototype.cpp",
-			"begin": "(?x)\n(?:\n  ^ |                  # beginning of line\n  (?:(?<!else|new|=))  # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\()              # opening bracket",
-			"beginCaptures": {
-				"1": {
-					"name": "entity.name.function.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.parameters.begin.cpp"
-				}
-			},
-			"end": "(?-mix:\\))",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.parameters.end.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "$base"
-				}
-			]
-		},
-		{
-			"include": "#lambdas"
-		},
-		{
-			"include": "#preprocessor-rule-enabled"
-		},
-		{
-			"include": "#preprocessor-rule-disabled"
-		},
-		{
-			"include": "#preprocessor-rule-conditional"
-		},
-		{
-			"match": "(?<!\\w)#(?:endif|else|elif)(?!\\w)",
-			"name": "keyword.control.directive.$0.cpp"
-		},
-		{
-			"include": "#comments"
-		},
-		{
-			"name": "meta.conditional.case.cpp",
-			"begin": "((?<!\\w)case(?!\\w))",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.case.cpp"
-				}
-			},
-			"end": "(:)",
-			"endCaptures": {
-				"1": {
-					"name": "colon.cpp punctuation.separator.case.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "$base"
-				}
-			]
-		},
-		{
-			"match": "(?<!\\w)(?:throw|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default)(?!\\w)",
-			"name": "keyword.control.$0.cpp"
-		},
-		{
-			"include": "#storage_types"
-		},
-		{
-			"match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
-			"name": "storage.modifier.cpp"
-		},
-		{
-			"include": "#operator_overload"
-		},
-		{
-			"include": "#number_literal"
-		},
-		{
-			"include": "#strings_c"
-		},
-		{
-			"name": "meta.preprocessor.macro.cpp",
-			"begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+\t# define\n((?<id>(?-mix:[a-zA-Z_$][\\w$]*)))\t  # macro name\n(?:\n  (\\()\n\t(\n\t  \\s* \\g<id> \\s*\t\t # first argument\n\t  ((,) \\s* \\g<id> \\s*)*  # additional arguments\n\t  (?:\\.\\.\\.)?\t\t\t# varargs ellipsis?\n\t)\n  (\\))\n)?",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.define.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				},
-				"3": {
-					"name": "entity.name.function.preprocessor.cpp"
-				},
-				"5": {
-					"name": "punctuation.definition.parameters.begin.cpp"
-				},
-				"6": {
-					"name": "variable.parameter.preprocessor.cpp"
-				},
-				"8": {
-					"name": "punctuation.separator.parameters.cpp"
-				},
-				"9": {
-					"name": "punctuation.definition.parameters.end.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#preprocessor-rule-define-line-contents"
-				}
-			]
-		},
-		{
-			"name": "meta.preprocessor.diagnostic.cpp",
-			"begin": "^\\s*((#)\\s*(error|warning))\\b\\s*",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.diagnostic.$3.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"begin": "\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "\"|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"name": "string.quoted.double.cpp",
-					"patterns": [
-						{
-							"include": "#line_continuation_character"
-						}
-					]
-				},
-				{
-					"begin": "'",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "'|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"name": "string.quoted.single.cpp",
-					"patterns": [
-						{
-							"include": "#line_continuation_character"
-						}
-					]
-				},
-				{
-					"begin": "[^'\"]",
-					"end": "(?<!\\\\)(?=\\s*\\n)",
-					"name": "string.unquoted.single.cpp",
-					"patterns": [
-						{
-							"include": "#line_continuation_character"
-						},
-						{
-							"include": "#comments"
-						}
-					]
-				}
-			]
-		},
-		{
-			"name": "meta.preprocessor.include.cpp",
-			"begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.$3.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#line_continuation_character"
-				},
-				{
-					"begin": "\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "\"",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"name": "string.quoted.double.include.cpp"
-				},
-				{
-					"begin": "<",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": ">",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"name": "string.quoted.other.lt-gt.include.cpp"
-				}
-			]
-		},
-		{
-			"include": "#pragma-mark"
-		},
-		{
-			"name": "meta.preprocessor.cpp",
-			"begin": "^\\s*((#)\\s*line)\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.line.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#strings_c"
-				},
-				{
-					"include": "#number_literal"
-				},
-				{
-					"include": "#line_continuation_character"
-				}
-			]
-		},
-		{
-			"name": "meta.preprocessor.cpp",
-			"begin": "^\\s*(?:((#)\\s*undef))\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.undef.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"match": "(?-mix:[a-zA-Z_$][\\w$]*)",
-					"name": "entity.name.function.preprocessor.cpp"
-				},
-				{
-					"include": "#line_continuation_character"
-				}
-			]
-		},
-		{
-			"name": "meta.preprocessor.pragma.cpp",
-			"begin": "^\\s*(?:((#)\\s*pragma))\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.pragma.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#strings_c"
-				},
-				{
-					"match": "[a-zA-Z_$][\\w\\-$]*",
-					"name": "entity.other.attribute-name.pragma.preprocessor.cpp"
-				},
-				{
-					"include": "#number_literal"
-				},
-				{
-					"include": "#line_continuation_character"
-				}
-			]
-		},
-		{
-			"include": "#operators"
-		},
-		{
-			"match": "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b",
-			"name": "support.type.sys-types.cpp"
-		},
-		{
-			"match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
-			"name": "support.type.pthread.cpp"
-		},
-		{
-			"match": "(?x) \\b\n(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t\n|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t\n|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t\n|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t\n|uintmax_t|uintmax_t)\n\\b",
-			"name": "support.type.stdint.cpp"
-		},
-		{
-			"match": "(?<!\\w)[a-zA-Z_](?:\\w)*_t(?!\\w)",
-			"name": "support.type.posix-reserved.cpp"
-		},
-		{
-			"include": "#block-c"
-		},
-		{
-			"include": "#parens-c"
-		},
-		{
-			"name": "meta.function.definition.parameters.cpp",
-			"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()(?=[a-zA-Z_]\\w*\\s*(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*\\()",
-			"end": "(?<=\\))",
-			"patterns": [
-				{
-					"include": "#function-innards-c"
-				}
-			]
-		},
-		{
-			"include": "#line_continuation_character"
-		},
-		{
-			"name": "meta.bracket.square.access.cpp",
-			"begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
-			"beginCaptures": {
-				"1": {
-					"name": "variable.other.object.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
-				}
-			},
-			"end": "\\]",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#function-call-innards-c"
-				}
-			]
-		},
-		{
-			"name": "storage.modifier.array.bracket.square.cpp",
-			"match": "(?-mix:(?-mix:(?<!delete))\\\\[\\\\s*\\\\])"
-		},
-		{
-			"match": ";",
-			"name": "punctuation.terminator.statement.cpp"
-		},
-		{
-			"match": ",",
-			"name": "comma.cpp punctuation.separator.delimiter.cpp"
+			"include": "#cpp_base"
 		}
 	],
 	"repository": {
@@ -732,7 +274,7 @@
 					]
 				},
 				{
-					"match": "(using)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
 					"captures": {
 						"1": {
 							"name": "keyword.other.using.directive.cpp"
@@ -751,17 +293,17 @@
 					"name": "punctuation.accessor.attribute.cpp"
 				},
 				{
-					"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)(?=::)",
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)(?=::)",
 					"name": "entity.name.namespace.cpp"
 				},
 				{
-					"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 					"name": "entity.other.attribute.$0.cpp"
 				}
 			]
 		},
 		"template_call_innards": {
-			"match": "<(?:[\\s<>,\\w])*>\\s*",
+			"match": "<(?:[\\s<>:,\\w])*>\\s*",
 			"captures": {
 				"0": {
 					"name": "meta.template.call.cpp",
@@ -776,7 +318,204 @@
 							"include": "#scope_resolution"
 						},
 						{
-							"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
+							"name": "storage.type.user-defined.cpp"
+						},
+						{
+							"include": "#operators"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#strings"
+						},
+						{
+							"match": ",",
+							"name": "comma.cpp punctuation.separator.template.argument.cpp"
+						}
+					]
+				}
+			}
+		},
+		"template_isolated_definition": {
+			"match": "(?<!\\w)(template)\\s*(<)((?:.)*)(>\\s*$)",
+			"captures": {
+				"1": {
+					"name": "storage.type.template.cpp"
+				},
+				"2": {
+					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+				},
+				"3": {
+					"name": "meta.template.definition.cpp",
+					"patterns": [
+						{
+							"include": "#scope_resolution"
+						},
+						{
+							"include": "#template_definition_argument"
+						},
+						{
+							"include": "#template_argument_defaulted"
+						},
+						{
+							"include": "#template_call_innards"
+						},
+						{
+							"include": "#cpp_base"
+						}
+					]
+				},
+				"4": {
+					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
+				}
+			}
+		},
+		"template_definition": {
+			"name": "meta.template.definition.cpp",
+			"begin": "(?<!\\w)(template)\\s*(<)",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.type.template.cpp"
+				},
+				"2": {
+					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+				}
+			},
+			"end": "(>)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "((?<=\\w)\\s*<)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+						}
+					},
+					"end": "(>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#constants"
+						},
+						{
+							"include": "#scope_resolution"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
+							"name": "storage.type.user-defined.cpp"
+						},
+						{
+							"include": "#operators"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#strings"
+						},
+						{
+							"match": ",",
+							"name": "comma.cpp punctuation.separator.template.argument.cpp"
+						}
+					]
+				},
+				{
+					"include": "#scope_resolution"
+				},
+				{
+					"include": "#template_definition_argument"
+				},
+				{
+					"include": "#template_argument_defaulted"
+				},
+				{
+					"include": "#template_call_innards"
+				},
+				{
+					"include": "#cpp_base"
+				}
+			]
+		},
+		"template_argument_defaulted": {
+			"match": "(?<=<|,)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s+)*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)\\s*([=])",
+			"captures": {
+				"1": {
+					"name": "storage.type.template.cpp"
+				},
+				"2": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"3": {
+					"name": "keyword.operator.assignment.cpp"
+				}
+			}
+		},
+		"template_definition_argument": {
+			"match": "(?:(?:\\s*((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)\\s*(\\.\\.\\.)\\s*((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*))\\s*(?:(,)|(?=>|$))",
+			"captures": {
+				"1": {
+					"name": "storage.type.template.argument.$1.cpp"
+				},
+				"2": {
+					"name": "storage.type.template.argument.$2.cpp"
+				},
+				"3": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"4": {
+					"name": "storage.type.template.cpp"
+				},
+				"5": {
+					"name": "ellipses.cpp punctuation.vararg-ellipses.template.definition.cpp"
+				},
+				"6": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"7": {
+					"name": "comma.cpp punctuation.separator.template.argument.cpp"
+				}
+			}
+		},
+		"scope_resolution": {
+			"match": "((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*\\s*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)\\s*(?:(<(?:[\\s<>:,\\w])*>\\s*))?(::)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#scope_resolution"
+						}
+					]
+				},
+				"2": {
+					"name": "entity.name.namespace.scope-resolution.cpp"
+				},
+				"3": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#constants"
+						},
+						{
+							"include": "#scope_resolution"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 							"name": "storage.type.user-defined.cpp"
 						},
 						{
@@ -793,672 +532,1004 @@
 							"name": "comma.cpp punctuation.separator.template.argument.cpp"
 						}
 					]
+				},
+				"4": {
+					"name": "punctuation.separator.namespace.access.cpp"
+				}
+			},
+			"name": "meta.scope-resolution.cpp"
+		},
+		"struct_declare": {
+			"match": "(struct)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))\\s+((?:\\*|&\\s*)*)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
+			"captures": {
+				"1": {
+					"name": "storage.type.struct.declare.cpp"
+				},
+				"2": {
+					"name": "entity.name.type.struct.cpp"
+				},
+				"3": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "keyword.operator.dereference.cpp"
+						},
+						{
+							"match": "&",
+							"name": "keyword.operator.reference.cpp"
+						}
+					]
+				},
+				"4": {
+					"name": "variable.other.object.declare.cpp"
 				}
 			}
 		},
-		"template_isolated_definition": {
-			"match": "(?<!\\w)(template)\\s*(<)((?:.)*)(>\\s*$)",
+		"parameter_struct": {
+			"match": "(struct)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))\\s+((?:\\*|&\\s*)*)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))?\\s*(?:\\[\\s*\\]\\s*)?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
-					"name": "storage.type.template.cpp"
+					"name": "storage.type.struct.parameter.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+					"name": "entity.name.type.struct.parameter.cpp"
 				},
 				"3": {
-					"name": "meta.template.definition.cpp",
 					"patterns": [
 						{
-							"include": "#scope_resolution"
-						},
-						{
-							"include": "#template_definition_argument"
-						},
-						{
-							"include": "#template_argument_defaulted"
-						},
-						{
-							"include": "#template_call_innards"
+							"match": "\\*",
+							"name": "keyword.operator.dereference.cpp"
 						},
 						{
-							"include": "$base"
+							"match": "&",
+							"name": "keyword.operator.reference.cpp"
 						}
 					]
 				},
 				"4": {
-					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
+					"name": "variable.other.object.declare.cpp"
 				}
 			}
 		},
-		"template_definition": {
-			"name": "meta.template.definition.cpp",
-			"begin": "(?<!\\w)(template)\\s*(<)",
+		"sizeof_operator": {
+			"contentName": "meta.arguments.operator.sizeof",
+			"begin": "((?<!\\w)sizeof(?!\\w))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "storage.type.template.cpp"
+					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				}
 			},
-			"end": "(>)",
+			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"begin": "((?<=\\w)\\s*<)",
+					"include": "#cpp_base"
+				}
+			]
+		},
+		"alignof_operator": {
+			"contentName": "meta.arguments.operator.alignof",
+			"begin": "((?<!\\w)alignof(?!\\w))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+				},
+				"2": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#cpp_base"
+				}
+			]
+		},
+		"alignas_operator": {
+			"contentName": "meta.arguments.operator.alignas",
+			"begin": "((?<!\\w)alignas(?!\\w))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
+				},
+				"2": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#cpp_base"
+				}
+			]
+		},
+		"typeid_operator": {
+			"contentName": "meta.arguments.operator.typeid",
+			"begin": "((?<!\\w)typeid(?!\\w))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
+				},
+				"2": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#cpp_base"
+				}
+			]
+		},
+		"decltype_specifier": {
+			"contentName": "meta.arguments.decltype",
+			"begin": "((?<!\\w)decltype(?!\\w))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
+				},
+				"2": {
+					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#cpp_base"
+				}
+			]
+		},
+		"operators": {
+			"patterns": [
+				{
+					"include": "#sizeof_operator"
+				},
+				{
+					"include": "#alignof_operator"
+				},
+				{
+					"include": "#alignas_operator"
+				},
+				{
+					"include": "#typeid_operator"
+				},
+				{
+					"include": "#decltype_specifier"
+				},
+				{
+					"match": "(?<!\\w)(?:static_cast|dynamic_cast|const_cast|reinterpret_cast)(?!\\w)",
+					"name": "keyword.operator.wordlike.cpp keyword.operator.cast.$0.cpp"
+				},
+				{
+					"include": "#method_access"
+				},
+				{
+					"include": "#member_access"
+				},
+				{
+					"match": "(?<!\\w)(?:not|compl|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|noexcept)(?!\\w)",
+					"name": "keyword.operator.wordlike.cpp alias.cpp keyword.operator.$0.cpp"
+				},
+				{
+					"include": "#vararg_ellipses"
+				},
+				{
+					"match": "--",
+					"name": "keyword.operator.decrement.cpp"
+				},
+				{
+					"match": "\\+\\+",
+					"name": "keyword.operator.increment.cpp"
+				},
+				{
+					"match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
+					"name": "keyword.operator.assignment.compound.cpp"
+				},
+				{
+					"match": "&=|\\^=|<<=|>>=|\\|=",
+					"name": "keyword.operator.assignment.compound.bitwise.cpp"
+				},
+				{
+					"match": "<<|>>",
+					"name": "keyword.operator.bitwise.shift.cpp"
+				},
+				{
+					"match": "!=|<=|>=|==|<|>",
+					"name": "keyword.operator.comparison.cpp"
+				},
+				{
+					"match": "&&|!|\\|\\|",
+					"name": "keyword.operator.logical.cpp"
+				},
+				{
+					"match": "&|\\||\\^|~",
+					"name": "keyword.operator.cpp"
+				},
+				{
+					"match": "=",
+					"name": "keyword.operator.assignment.cpp"
+				},
+				{
+					"match": "%|\\*|/|-|\\+",
+					"name": "keyword.operator.cpp"
+				},
+				{
+					"begin": "\\?",
 					"beginCaptures": {
-						"1": {
-							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+						"0": {
+							"name": "keyword.operator.ternary.cpp"
 						}
 					},
-					"end": "(>)",
+					"end": ":",
+					"applyEndPatternLast": true,
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+						"0": {
+							"name": "keyword.operator.ternary.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#constants"
-						},
-						{
-							"include": "#scope_resolution"
-						},
-						{
-							"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
-							"name": "storage.type.user-defined.cpp"
-						},
-						{
-							"include": "#operators"
+							"include": "#method_access"
 						},
 						{
-							"include": "#number_literal"
+							"include": "#member_access"
 						},
 						{
-							"include": "#strings"
+							"include": "#c_function_call"
 						},
 						{
-							"match": ",",
-							"name": "comma.cpp punctuation.separator.template.argument.cpp"
+							"include": "#cpp_base"
 						}
 					]
-				},
-				{
-					"include": "#scope_resolution"
-				},
-				{
-					"include": "#template_definition_argument"
-				},
-				{
-					"include": "#template_argument_defaulted"
-				},
-				{
-					"include": "#template_call_innards"
-				},
-				{
-					"include": "$base"
 				}
 			]
 		},
-		"template_argument_defaulted": {
-			"match": "(?<=<|,)\\s*((?:[a-zA-Z_]\\w*\\s+)*)([a-zA-Z_]\\w*)\\s*([=])",
+		"probably_a_parameter": {
+			"match": "(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?==))|((?<=\\w |\\*\\/|[&*>\\]\\)]|\\.\\.\\.)\\s*(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))))",
 			"captures": {
 				"1": {
-					"name": "storage.type.template.cpp"
+					"name": "variable.parameter.defaulted.cpp"
+				},
+				"2": {
+					"name": "variable.parameter.cpp"
+				}
+			}
+		},
+		"operator_overload": {
+			"name": "meta.function.definition.parameters.operator-overload.cpp",
+			"begin": "(operator)((?:\\s*(?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:new|new\\[\\]|delete|delete\\[\\])|(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:&)?)))\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.operator.overload.cpp"
 				},
 				"2": {
-					"name": "entity.name.type.template.cpp"
+					"name": "entity.name.operator.overloadee.cpp",
+					"patterns": [
+						{
+							"include": "#scope_resolution"
+						}
+					]
 				},
 				"3": {
-					"name": "keyword.operator.assignment.cpp"
+					"name": "punctuation.section.parameters.begin.bracket.round.operator-overload.cpp"
 				}
-			}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.parameters.end.bracket.round.operator-overload.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#probably_a_parameter"
+				},
+				{
+					"include": "#function-innards-c"
+				}
+			]
 		},
-		"template_definition_argument": {
-			"match": "(?:(?:\\s*([a-zA-Z_]\\w*)|((?:[a-zA-Z_]\\w*\\s+)+)([a-zA-Z_]\\w*))|([a-zA-Z_]\\w*)\\s*(\\.\\.\\.)\\s*([a-zA-Z_]\\w*))\\s*(?:(,)|(?=>|$))",
+		"member_access": {
+			"match": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!auto[^(?-mix:\\w)]|void[^(?-mix:\\w)]|char[^(?-mix:\\w)]|short[^(?-mix:\\w)]|int[^(?-mix:\\w)]|signed[^(?-mix:\\w)]|unsigned[^(?-mix:\\w)]|long[^(?-mix:\\w)]|float[^(?-mix:\\w)]|double[^(?-mix:\\w)]|bool[^(?-mix:\\w)]|wchar_t[^(?-mix:\\w)]|u_char[^(?-mix:\\w)]|u_short[^(?-mix:\\w)]|u_int[^(?-mix:\\w)]|u_long[^(?-mix:\\w)]|ushort[^(?-mix:\\w)]|uint[^(?-mix:\\w)]|u_quad_t[^(?-mix:\\w)]|quad_t[^(?-mix:\\w)]|qaddr_t[^(?-mix:\\w)]|caddr_t[^(?-mix:\\w)]|daddr_t[^(?-mix:\\w)]|div_t[^(?-mix:\\w)]|dev_t[^(?-mix:\\w)]|fixpt_t[^(?-mix:\\w)]|blkcnt_t[^(?-mix:\\w)]|blksize_t[^(?-mix:\\w)]|gid_t[^(?-mix:\\w)]|in_addr_t[^(?-mix:\\w)]|in_port_t[^(?-mix:\\w)]|ino_t[^(?-mix:\\w)]|key_t[^(?-mix:\\w)]|mode_t[^(?-mix:\\w)]|nlink_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|pid_t[^(?-mix:\\w)]|off_t[^(?-mix:\\w)]|segsz_t[^(?-mix:\\w)]|swblk_t[^(?-mix:\\w)]|uid_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|clock_t[^(?-mix:\\w)]|size_t[^(?-mix:\\w)]|ssize_t[^(?-mix:\\w)]|time_t[^(?-mix:\\w)]|useconds_t[^(?-mix:\\w)]|suseconds_t[^(?-mix:\\w)]|pthread_attr_t[^(?-mix:\\w)]|pthread_cond_t[^(?-mix:\\w)]|pthread_condattr_t[^(?-mix:\\w)]|pthread_mutex_t[^(?-mix:\\w)]|pthread_mutexattr_t[^(?-mix:\\w)]|pthread_once_t[^(?-mix:\\w)]|pthread_rwlock_t[^(?-mix:\\w)]|pthread_rwlockattr_t[^(?-mix:\\w)]|pthread_t[^(?-mix:\\w)]|pthread_key_t[^(?-mix:\\w)]|int8_t[^(?-mix:\\w)]|int16_t[^(?-mix:\\w)]|int32_t[^(?-mix:\\w)]|int64_t[^(?-mix:\\w)]|uint8_t[^(?-mix:\\w)]|uint16_t[^(?-mix:\\w)]|uint32_t[^(?-mix:\\w)]|uint64_t[^(?-mix:\\w)]|int_least8_t[^(?-mix:\\w)]|int_least16_t[^(?-mix:\\w)]|int_least32_t[^(?-mix:\\w)]|int_least64_t[^(?-mix:\\w)]|uint_least8_t[^(?-mix:\\w)]|uint_least16_t[^(?-mix:\\w)]|uint_least32_t[^(?-mix:\\w)]|uint_least64_t[^(?-mix:\\w)]|int_fast8_t[^(?-mix:\\w)]|int_fast16_t[^(?-mix:\\w)]|int_fast32_t[^(?-mix:\\w)]|int_fast64_t[^(?-mix:\\w)]|uint_fast8_t[^(?-mix:\\w)]|uint_fast16_t[^(?-mix:\\w)]|uint_fast32_t[^(?-mix:\\w)]|uint_fast64_t[^(?-mix:\\w)]|intptr_t[^(?-mix:\\w)]|uintptr_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\b(?!\\())",
 			"captures": {
 				"1": {
-					"name": "storage.type.template.argument.$1.cpp"
+					"name": "variable.language.this.cpp"
 				},
 				"2": {
-					"name": "storage.type.template.argument.$2.cpp"
+					"name": "variable.other.object.access.cpp"
 				},
 				"3": {
-					"name": "entity.name.type.template.cpp"
+					"name": "punctuation.separator.dot-access.cpp"
 				},
 				"4": {
-					"name": "storage.type.template.cpp"
+					"name": "punctuation.separator.pointer-access.cpp"
 				},
 				"5": {
-					"name": "ellipses.cpp punctuation.vararg-ellipses.template.definition.cpp"
+					"patterns": [
+						{
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?-mix:(?:(?:(?<!\\w)this(?!\\w))|(?:(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*|(?<=\\]|\\)))\\s*))(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->))))",
+							"name": "variable.other.object.property.cpp"
+						},
+						{
+							"match": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"captures": {
+								"1": {
+									"name": "variable.language.this.cpp"
+								},
+								"2": {
+									"name": "variable.other.object.access.cpp"
+								},
+								"3": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"4": {
+									"name": "punctuation.separator.pointer-access.cpp"
+								}
+							}
+						},
+						{
+							"include": "#member_access"
+						},
+						{
+							"include": "#method_access"
+						}
+					]
 				},
 				"6": {
-					"name": "entity.name.type.template.cpp"
-				},
-				"7": {
-					"name": "comma.cpp punctuation.separator.template.argument.cpp"
+					"name": "variable.other.property.cpp"
 				}
 			}
 		},
-		"scope_resolution": {
-			"match": "((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)([a-zA-Z_]\\w*)\\s*(?:(<(?:[\\s<>,\\w])*>\\s*))?(::)",
-			"captures": {
+		"method_access": {
+			"contentName": "meta.function-call.member",
+			"begin": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)(\\()",
+			"beginCaptures": {
 				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution"
-						}
-					]
+					"name": "variable.language.this.cpp"
 				},
 				"2": {
-					"name": "entity.name.namespace.scope-resolution.cpp"
+					"name": "variable.other.object.access.cpp"
 				},
 				"3": {
-					"name": "meta.template.call.cpp",
+					"name": "punctuation.separator.dot-access.cpp"
+				},
+				"4": {
+					"name": "punctuation.separator.pointer-access.cpp"
+				},
+				"5": {
 					"patterns": [
 						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#constants"
-						},
-						{
-							"include": "#scope_resolution"
-						},
-						{
-							"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
-							"name": "storage.type.user-defined.cpp"
-						},
-						{
-							"include": "#operators"
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?-mix:(?:(?:(?<!\\w)this(?!\\w))|(?:(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*|(?<=\\]|\\)))\\s*))(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->))))",
+							"name": "variable.other.object.property.cpp"
 						},
 						{
-							"include": "#number_literal"
+							"match": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"captures": {
+								"1": {
+									"name": "variable.language.this.cpp"
+								},
+								"2": {
+									"name": "variable.other.object.access.cpp"
+								},
+								"3": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"4": {
+									"name": "punctuation.separator.pointer-access.cpp"
+								}
+							}
 						},
 						{
-							"include": "#strings"
+							"include": "#member_access"
 						},
 						{
-							"match": ",",
-							"name": "comma.cpp punctuation.separator.template.argument.cpp"
+							"include": "#method_access"
 						}
 					]
 				},
-				"4": {
-					"name": "punctuation.separator.namespace.access.cpp"
-				}
-			},
-			"name": "meta.scope-resolution.cpp"
-		},
-		"sizeof_operator": {
-			"contentName": "meta.arguments.operator.sizeof",
-			"begin": "((?<!\\w)sizeof(?!\\w))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
+				"6": {
+					"name": "entity.name.function.member.cpp"
 				},
-				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
+				"7": {
+					"name": "punctuation.section.arguments.begin.bracket.round.function.member.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.function.member.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"include": "$base"
+					"include": "#function-call-innards-c"
 				}
 			]
 		},
-		"alignof_operator": {
-			"contentName": "meta.arguments.operator.alignof",
-			"begin": "((?<!\\w)alignof(?!\\w))(\\()",
+		"lambdas": {
+			"begin": "((?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[])|(?<=\\Wreturn|^return))\\s*(\\[(?!\\[))((?:.*\\[.*?\\].*?)*.*?)(\\]))",
 			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
-				},
 				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+					"name": "punctuation.definition.capture.begin.lambda.cpp"
+				},
+				"3": {
+					"name": "meta.lambda.capture.cpp",
+					"patterns": [
+						{
+							"include": "#probably_a_parameter"
+						},
+						{
+							"include": "#function-innards-c"
+						}
+					]
+				},
+				"4": {
+					"name": "punctuation.definition.capture.end.lambda.cpp"
 				}
 			},
+			"end": "(?<=})",
 			"patterns": [
 				{
-					"include": "$base"
-				}
-			]
-		},
-		"alignas_operator": {
-			"contentName": "meta.arguments.operator.alignas",
-			"begin": "((?<!\\w)alignas(?!\\w))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
+					"name": "meta.function.definition.parameters.lambda.cpp",
+					"begin": "(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.parameters.begin.lambda.cpp"
+						}
+					},
+					"end": "(\\))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.parameters.end.lambda.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#probably_a_parameter"
+						},
+						{
+							"include": "#function-innards-c"
+						}
+					]
 				},
-				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
-				}
-			},
-			"patterns": [
 				{
-					"include": "$base"
-				}
-			]
-		},
-		"typeid_operator": {
-			"contentName": "meta.arguments.operator.typeid",
-			"begin": "((?<!\\w)typeid(?!\\w))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
+					"match": "(?<!\\w)(?:mutable|constexpr|consteval)(?!\\w)",
+					"name": "storage.modifier.lambda.$0.cpp"
 				},
-				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
-				}
-			},
-			"patterns": [
 				{
-					"include": "$base"
-				}
-			]
-		},
-		"decltype_specifier": {
-			"contentName": "meta.arguments.decltype",
-			"begin": "((?<!\\w)decltype(?!\\w))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
+					"match": "(->)(.+?(?=\\{|$))?",
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.lambda.return-type.cpp"
+						},
+						"2": {
+							"name": "storage.type.return-type.lambda.cpp"
+						}
+					}
 				},
-				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp"
-				}
-			},
-			"patterns": [
 				{
-					"include": "$base"
+					"name": "meta.function.definition.body.lambda.cpp",
+					"begin": "(\\{)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.lambda.cpp"
+						}
+					},
+					"end": "(\\})",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.lambda.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#cpp_base"
+						}
+					]
 				}
 			]
 		},
-		"operators": {
+		"hacky_fix_for_stray_directive": {
+			"match": "(?<!\\w)#(?:endif|else|elif)(?!\\w)",
+			"name": "keyword.control.directive.$0.cpp"
+		},
+		"cpp_base": {
 			"patterns": [
 				{
-					"include": "#sizeof_operator"
-				},
-				{
-					"include": "#alignof_operator"
-				},
-				{
-					"include": "#alignas_operator"
+					"include": "#parameter_struct"
 				},
 				{
-					"include": "#typeid_operator"
+					"include": "#struct_declare"
 				},
 				{
-					"include": "#decltype_specifier"
+					"include": "#special_block"
 				},
 				{
-					"match": "(?<!\\w)(?:static_cast|dynamic_cast|const_cast|reinterpret_cast)(?!\\w)",
-					"name": "keyword.operator.wordlike.cpp keyword.operator.cast.$0.cpp"
+					"match": "##(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
+					"name": "variable.other.macro.argument.cpp"
 				},
 				{
-					"include": "#method_access"
+					"include": "#strings"
 				},
 				{
-					"include": "#member_access"
+					"match": "(?<!\\w)(?:inline|constexpr|mutable|friend|explicit|virtual)(?!\\w)",
+					"name": "storage.modifier.specificer.functional.pre-parameters.$0.cpp"
 				},
 				{
-					"match": "(?<!\\w)(?:not|compl|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|noexcept)(?!\\w)",
-					"name": "keyword.operator.wordlike.cpp alias.cpp keyword.operator.$0.cpp"
+					"match": "(?<!\\w)(?:final|override|volatile|const|noexcept)(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r]))",
+					"name": "storage.modifier.specifier.functional.post-parameters.$0.cpp"
 				},
 				{
-					"include": "#vararg_ellipses"
+					"match": "(?<!\\w)(?:const|static|volatile|register|restrict|extern)(?!\\w)",
+					"name": "storage.modifier.specifier.$0.cpp"
 				},
 				{
-					"match": "--",
-					"name": "keyword.operator.decrement.cpp"
+					"match": "(?<!\\w)(?:private|protected|public)\\s*:",
+					"name": "storage.type.modifier.access.control.$0.cpp"
 				},
 				{
-					"match": "\\+\\+",
-					"name": "keyword.operator.increment.cpp"
+					"match": "(?<!\\w)(?:throw|try|catch)(?!\\w)",
+					"name": "keyword.control.exception.$0.cpp"
 				},
 				{
-					"match": "%=|\\+=|-=|\\*=|(?<!\\()/=",
-					"name": "keyword.operator.assignment.compound.cpp"
+					"match": "(?<!\\w)(using|typedef)(?!\\w)",
+					"name": "keyword.other.$0.cpp"
 				},
 				{
-					"match": "&=|\\^=|<<=|>>=|\\|=",
-					"name": "keyword.operator.assignment.compound.bitwise.cpp"
+					"include": "#memory_operators"
 				},
 				{
-					"match": "<<|>>",
-					"name": "keyword.operator.bitwise.shift.cpp"
+					"match": "(?<!\\w)this(?!\\w)",
+					"name": "variable.language.this.cpp"
 				},
 				{
-					"match": "!=|<=|>=|==|<|>",
-					"name": "keyword.operator.comparison.cpp"
+					"include": "#constants"
 				},
 				{
-					"match": "&&|!|\\|\\|",
-					"name": "keyword.operator.logical.cpp"
+					"include": "#template_isolated_definition"
 				},
 				{
-					"match": "&|\\||\\^|~",
-					"name": "keyword.operator.cpp"
+					"include": "#template_definition"
 				},
 				{
-					"match": "=",
-					"name": "keyword.operator.assignment.cpp"
+					"include": "#scope_resolution"
 				},
 				{
-					"match": "%|\\*|/|-|\\+",
-					"name": "keyword.operator.cpp"
+					"match": "(?-mix:\\b(constexpr|export|mutable|typename|thread_local)\\b)",
+					"name": "storage.modifier.cpp"
 				},
 				{
-					"begin": "\\?",
+					"name": "meta.function.destructor.cpp",
+					"begin": "(?x)\n(?:\n  ^ |                  # beginning of line\n  (?:(?<!else|new|=))  # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\()              # opening bracket",
 					"beginCaptures": {
-						"0": {
-							"name": "keyword.operator.ternary.cpp"
+						"1": {
+							"name": "entity.name.function.destructor.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.parameters.begin.destructor.cpp"
 						}
 					},
-					"end": ":",
-					"applyEndPatternLast": true,
+					"end": "(?-mix:\\))",
 					"endCaptures": {
 						"0": {
-							"name": "keyword.operator.ternary.cpp"
+							"name": "punctuation.definition.parameters.end.destructor.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"include": "#method_access"
-						},
-						{
-							"include": "#member_access"
-						},
-						{
-							"include": "#c_function_call"
+							"include": "#cpp_base"
+						}
+					]
+				},
+				{
+					"name": "meta.function.destructor.prototype.cpp",
+					"begin": "(?x)\n(?:\n  ^ |                  # beginning of line\n  (?:(?<!else|new|=))  # or word + space before name\n)\n((?:[A-Za-z_][A-Za-z0-9_]*::)*+~[A-Za-z_][A-Za-z0-9_]*) # actual name\n\\s*(\\()              # opening bracket",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.cpp"
 						},
+						"2": {
+							"name": "punctuation.definition.parameters.begin.cpp"
+						}
+					},
+					"end": "(?-mix:\\))",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.end.cpp"
+						}
+					},
+					"patterns": [
 						{
-							"include": "$base"
+							"include": "#cpp_base"
 						}
 					]
-				}
-			]
-		},
-		"probably_a_parameter": {
-			"match": "(?:([a-zA-Z_]\\w*\\s*(?==))|((?<=\\w |\\*\\/|[&*>\\]\\)]|\\.\\.\\.)\\s*[a-zA-Z_]\\w*\\s*(?=(?:\\[\\]\\s*)?(?:,|\\)))))",
-			"captures": {
-				"1": {
-					"name": "variable.parameter.defaulted.cpp"
 				},
-				"2": {
-					"name": "variable.parameter.cpp"
-				}
-			}
-		},
-		"operator_overload": {
-			"name": "meta.function.definition.parameters.operator-overload.cpp",
-			"begin": "(operator)((?:\\s*(?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:new|new\\[\\]|delete|delete\\[\\])|(?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*[a-zA-Z_]\\w*\\s*(?:&)?)))\\s*(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.other.operator.overload.cpp"
+				{
+					"include": "#lambdas"
 				},
-				"2": {
-					"name": "entity.name.operator.overloadee.cpp",
+				{
+					"include": "#preprocessor-rule-enabled"
+				},
+				{
+					"include": "#preprocessor-rule-disabled"
+				},
+				{
+					"include": "#preprocessor-rule-conditional"
+				},
+				{
+					"include": "#hacky_fix_for_stray_directive"
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"name": "meta.conditional.case.cpp",
+					"begin": "((?<!\\w)case(?!\\w))",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.case.cpp"
+						}
+					},
+					"end": "(:)",
+					"endCaptures": {
+						"1": {
+							"name": "colon.cpp punctuation.separator.case.cpp"
+						}
+					},
 					"patterns": [
 						{
-							"include": "#scope_resolution"
+							"include": "#cpp_base"
 						}
 					]
 				},
-				"3": {
-					"name": "punctuation.section.parameters.begin.bracket.round.operator-overload.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.parameters.end.bracket.round.operator-overload.cpp"
-				}
-			},
-			"patterns": [
 				{
-					"include": "#probably_a_parameter"
+					"match": "(?<!\\w)(?:throw|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default)(?!\\w)",
+					"name": "keyword.control.$0.cpp"
 				},
 				{
-					"include": "#function-innards-c"
-				}
-			]
-		},
-		"member_access": {
-			"match": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!auto[^(?-mix:\\w)]|void[^(?-mix:\\w)]|char[^(?-mix:\\w)]|short[^(?-mix:\\w)]|int[^(?-mix:\\w)]|signed[^(?-mix:\\w)]|unsigned[^(?-mix:\\w)]|long[^(?-mix:\\w)]|float[^(?-mix:\\w)]|double[^(?-mix:\\w)]|bool[^(?-mix:\\w)]|wchar_t[^(?-mix:\\w)]|u_char[^(?-mix:\\w)]|u_short[^(?-mix:\\w)]|u_int[^(?-mix:\\w)]|u_long[^(?-mix:\\w)]|ushort[^(?-mix:\\w)]|uint[^(?-mix:\\w)]|u_quad_t[^(?-mix:\\w)]|quad_t[^(?-mix:\\w)]|qaddr_t[^(?-mix:\\w)]|caddr_t[^(?-mix:\\w)]|daddr_t[^(?-mix:\\w)]|div_t[^(?-mix:\\w)]|dev_t[^(?-mix:\\w)]|fixpt_t[^(?-mix:\\w)]|blkcnt_t[^(?-mix:\\w)]|blksize_t[^(?-mix:\\w)]|gid_t[^(?-mix:\\w)]|in_addr_t[^(?-mix:\\w)]|in_port_t[^(?-mix:\\w)]|ino_t[^(?-mix:\\w)]|key_t[^(?-mix:\\w)]|mode_t[^(?-mix:\\w)]|nlink_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|pid_t[^(?-mix:\\w)]|off_t[^(?-mix:\\w)]|segsz_t[^(?-mix:\\w)]|swblk_t[^(?-mix:\\w)]|uid_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|clock_t[^(?-mix:\\w)]|size_t[^(?-mix:\\w)]|ssize_t[^(?-mix:\\w)]|time_t[^(?-mix:\\w)]|useconds_t[^(?-mix:\\w)]|suseconds_t[^(?-mix:\\w)]|pthread_attr_t[^(?-mix:\\w)]|pthread_cond_t[^(?-mix:\\w)]|pthread_condattr_t[^(?-mix:\\w)]|pthread_mutex_t[^(?-mix:\\w)]|pthread_mutexattr_t[^(?-mix:\\w)]|pthread_once_t[^(?-mix:\\w)]|pthread_rwlock_t[^(?-mix:\\w)]|pthread_rwlockattr_t[^(?-mix:\\w)]|pthread_t[^(?-mix:\\w)]|pthread_key_t[^(?-mix:\\w)]|int8_t[^(?-mix:\\w)]|int16_t[^(?-mix:\\w)]|int32_t[^(?-mix:\\w)]|int64_t[^(?-mix:\\w)]|uint8_t[^(?-mix:\\w)]|uint16_t[^(?-mix:\\w)]|uint32_t[^(?-mix:\\w)]|uint64_t[^(?-mix:\\w)]|int_least8_t[^(?-mix:\\w)]|int_least16_t[^(?-mix:\\w)]|int_least32_t[^(?-mix:\\w)]|int_least64_t[^(?-mix:\\w)]|uint_least8_t[^(?-mix:\\w)]|uint_least16_t[^(?-mix:\\w)]|uint_least32_t[^(?-mix:\\w)]|uint_least64_t[^(?-mix:\\w)]|int_fast8_t[^(?-mix:\\w)]|int_fast16_t[^(?-mix:\\w)]|int_fast32_t[^(?-mix:\\w)]|int_fast64_t[^(?-mix:\\w)]|uint_fast8_t[^(?-mix:\\w)]|uint_fast16_t[^(?-mix:\\w)]|uint_fast32_t[^(?-mix:\\w)]|uint_fast64_t[^(?-mix:\\w)]|intptr_t[^(?-mix:\\w)]|uintptr_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)])[a-zA-Z_]\\w*\\b(?!\\())",
-			"captures": {
-				"1": {
-					"name": "variable.language.this.cpp"
+					"include": "#storage_types"
 				},
-				"2": {
-					"name": "variable.other.object.access.cpp"
+				{
+					"match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
+					"name": "storage.modifier.cpp"
 				},
-				"3": {
-					"name": "punctuation.separator.dot-access.cpp"
+				{
+					"include": "#operator_overload"
 				},
-				"4": {
-					"name": "punctuation.separator.pointer-access.cpp"
+				{
+					"include": "#number_literal"
+				},
+				{
+					"include": "#strings_c"
+				},
+				{
+					"name": "meta.preprocessor.macro.cpp",
+					"begin": "(?x)\n^\\s* ((\\#)\\s*define) \\s+\t# define\n((?<id>(?-mix:[a-zA-Z_$][\\w$]*)))\t  # macro name\n(?:\n  (\\()\n\t(\n\t  \\s* \\g<id> \\s*\t\t # first argument\n\t  ((,) \\s* \\g<id> \\s*)*  # additional arguments\n\t  (?:\\.\\.\\.)?\t\t\t# varargs ellipsis?\n\t)\n  (\\))\n)?",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.define.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						},
+						"3": {
+							"name": "entity.name.function.preprocessor.cpp"
+						},
+						"5": {
+							"name": "punctuation.definition.parameters.begin.cpp"
+						},
+						"6": {
+							"name": "variable.parameter.preprocessor.cpp"
+						},
+						"8": {
+							"name": "punctuation.separator.parameters.cpp"
+						},
+						"9": {
+							"name": "punctuation.definition.parameters.end.cpp"
+						}
+					},
+					"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+					"patterns": [
+						{
+							"include": "#preprocessor-rule-define-line-contents"
+						}
+					]
+				},
+				{
+					"name": "meta.preprocessor.diagnostic.cpp",
+					"begin": "^\\s*((#)\\s*(error|warning))\\b\\s*",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.diagnostic.$3.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?<!\\\\)(?=\\n)",
+					"patterns": [
+						{
+							"begin": "\"",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.cpp"
+								}
+							},
+							"end": "\"|(?<!\\\\)(?=\\s*\\n)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.cpp"
+								}
+							},
+							"name": "string.quoted.double.cpp",
+							"patterns": [
+								{
+									"include": "#line_continuation_character"
+								}
+							]
+						},
+						{
+							"begin": "'",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.cpp"
+								}
+							},
+							"end": "'|(?<!\\\\)(?=\\s*\\n)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.cpp"
+								}
+							},
+							"name": "string.quoted.single.cpp",
+							"patterns": [
+								{
+									"include": "#line_continuation_character"
+								}
+							]
+						},
+						{
+							"begin": "[^'\"]",
+							"end": "(?<!\\\\)(?=\\s*\\n)",
+							"name": "string.unquoted.single.cpp",
+							"patterns": [
+								{
+									"include": "#line_continuation_character"
+								},
+								{
+									"include": "#comments"
+								}
+							]
+						}
+					]
 				},
-				"5": {
+				{
+					"name": "meta.preprocessor.include.cpp",
+					"begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.$3.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?-mix:(?:(?:(?<!\\w)this(?!\\w))|(?:(?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->))))",
-							"name": "variable.other.object.property.cpp"
+							"include": "#line_continuation_character"
 						},
 						{
-							"match": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
-							"captures": {
-								"1": {
-									"name": "variable.language.this.cpp"
-								},
-								"2": {
-									"name": "variable.other.object.access.cpp"
-								},
-								"3": {
-									"name": "punctuation.separator.dot-access.cpp"
-								},
-								"4": {
-									"name": "punctuation.separator.pointer-access.cpp"
+							"begin": "\"",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.cpp"
 								}
-							}
-						},
-						{
-							"include": "#member_access"
+							},
+							"end": "\"",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.cpp"
+								}
+							},
+							"name": "string.quoted.double.include.cpp"
 						},
 						{
-							"include": "#method_access"
+							"begin": "<",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.begin.cpp"
+								}
+							},
+							"end": ">",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.cpp"
+								}
+							},
+							"name": "string.quoted.other.lt-gt.include.cpp"
 						}
 					]
 				},
-				"6": {
-					"name": "variable.other.property.cpp"
-				}
-			}
-		},
-		"method_access": {
-			"contentName": "meta.function-call.member",
-			"begin": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "variable.language.this.cpp"
-				},
-				"2": {
-					"name": "variable.other.object.access.cpp"
-				},
-				"3": {
-					"name": "punctuation.separator.dot-access.cpp"
-				},
-				"4": {
-					"name": "punctuation.separator.pointer-access.cpp"
+				{
+					"include": "#pragma-mark"
 				},
-				"5": {
-					"patterns": [
-						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?-mix:(?:(?:(?<!\\w)this(?!\\w))|(?:(?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->))))",
-							"name": "variable.other.object.property.cpp"
+				{
+					"name": "meta.preprocessor.cpp",
+					"begin": "^\\s*((#)\\s*line)\\b",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.line.cpp"
 						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
+					"patterns": [
 						{
-							"match": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
-							"captures": {
-								"1": {
-									"name": "variable.language.this.cpp"
-								},
-								"2": {
-									"name": "variable.other.object.access.cpp"
-								},
-								"3": {
-									"name": "punctuation.separator.dot-access.cpp"
-								},
-								"4": {
-									"name": "punctuation.separator.pointer-access.cpp"
-								}
-							}
+							"include": "#strings_c"
 						},
 						{
-							"include": "#member_access"
+							"include": "#number_literal"
 						},
 						{
-							"include": "#method_access"
+							"include": "#line_continuation_character"
 						}
 					]
 				},
-				"6": {
-					"name": "entity.name.function.member.cpp"
-				},
-				"7": {
-					"name": "punctuation.section.arguments.begin.bracket.round.function.member.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.function.member.cpp"
-				}
-			},
-			"patterns": [
 				{
-					"include": "#function-call-innards-c"
-				}
-			]
-		},
-		"lambdas": {
-			"begin": "((?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[])|(?<=\\Wreturn|^return))\\s*(\\[(?!\\[))((?:.*\\[.*?\\].*?)*.*?)(\\]))",
-			"beginCaptures": {
-				"2": {
-					"name": "punctuation.definition.capture.begin.lambda.cpp"
-				},
-				"3": {
-					"name": "meta.lambda.capture.cpp",
+					"name": "meta.preprocessor.cpp",
+					"begin": "^\\s*(?:((#)\\s*undef))\\b",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.undef.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
 					"patterns": [
 						{
-							"include": "#probably_a_parameter"
+							"match": "(?-mix:[a-zA-Z_$][\\w$]*)",
+							"name": "entity.name.function.preprocessor.cpp"
 						},
 						{
-							"include": "#function-innards-c"
+							"include": "#line_continuation_character"
 						}
 					]
 				},
-				"4": {
-					"name": "punctuation.definition.capture.end.lambda.cpp"
-				}
-			},
-			"end": "(?<=})",
-			"patterns": [
 				{
-					"name": "meta.function.definition.parameters.lambda.cpp",
-					"begin": "(\\()",
+					"name": "meta.preprocessor.pragma.cpp",
+					"begin": "^\\s*(?:((#)\\s*pragma))\\b",
 					"beginCaptures": {
 						"1": {
-							"name": "punctuation.definition.parameters.begin.lambda.cpp"
-						}
-					},
-					"end": "(\\))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.parameters.end.lambda.cpp"
+							"name": "keyword.control.directive.pragma.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
 						}
 					},
+					"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
 					"patterns": [
 						{
-							"include": "#probably_a_parameter"
+							"include": "#strings_c"
 						},
 						{
-							"include": "#function-innards-c"
+							"match": "[a-zA-Z_$][\\w\\-$]*",
+							"name": "entity.other.attribute-name.pragma.preprocessor.cpp"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#line_continuation_character"
 						}
 					]
 				},
 				{
-					"match": "(?<!\\w)(?:mutable|constexpr|consteval)(?!\\w)",
-					"name": "storage.modifier.lambda.$0.cpp"
+					"include": "#operators"
 				},
 				{
-					"match": "(->)(.+?(?=\\{|$))?",
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.lambda.return-type.cpp"
+					"match": "\\b(u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t)\\b",
+					"name": "support.type.sys-types.cpp"
+				},
+				{
+					"match": "\\b(pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t)\\b",
+					"name": "support.type.pthread.cpp"
+				},
+				{
+					"match": "(?x) \\b\n(int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t\n|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t\n|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t\n|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t\n|uintmax_t|uintmax_t)\n\\b",
+					"name": "support.type.stdint.cpp"
+				},
+				{
+					"match": "(?<!\\w)[a-zA-Z_](?:\\w)*_t(?!\\w)",
+					"name": "support.type.posix-reserved.cpp"
+				},
+				{
+					"include": "#block-c"
+				},
+				{
+					"include": "#parens-c"
+				},
+				{
+					"name": "meta.function.definition.parameters.cpp",
+					"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()(?=(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*\\()",
+					"end": "(?<=\\))",
+					"patterns": [
+						{
+							"include": "#parameter_struct"
 						},
-						"2": {
-							"name": "storage.type.return-type.lambda.cpp"
+						{
+							"include": "#function-innards-c"
 						}
-					}
+					]
 				},
 				{
-					"name": "meta.function.definition.body.lambda.cpp",
-					"begin": "(\\{)",
+					"include": "#line_continuation_character"
+				},
+				{
+					"name": "meta.bracket.square.access.cpp",
+					"begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
 					"beginCaptures": {
 						"1": {
-							"name": "punctuation.section.block.begin.bracket.curly.lambda.cpp"
+							"name": "variable.other.object.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.begin.bracket.square.cpp"
 						}
 					},
-					"end": "(\\})",
+					"end": "\\]",
 					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.end.bracket.curly.lambda.cpp"
+						"0": {
+							"name": "punctuation.definition.end.bracket.square.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"include": "$base"
+							"include": "#function-call-innards-c"
 						}
 					]
+				},
+				{
+					"name": "storage.modifier.array.bracket.square.cpp",
+					"match": "(?-mix:(?-mix:(?<!delete))\\\\[\\\\s*\\\\])"
+				},
+				{
+					"match": ";",
+					"name": "punctuation.terminator.statement.cpp"
+				},
+				{
+					"match": ",",
+					"name": "comma.cpp punctuation.separator.delimiter.cpp"
 				}
 			]
 		},
@@ -1490,7 +1561,7 @@
 					"name": "meta.function-call.cpp"
 				},
 				{
-					"include": "$base"
+					"include": "#cpp_base"
 				}
 			]
 		},
@@ -1533,7 +1604,7 @@
 					"name": "meta.function.constructor.initializer-list.cpp",
 					"patterns": [
 						{
-							"include": "$base"
+							"include": "#cpp_base"
 						}
 					]
 				}
@@ -1546,7 +1617,7 @@
 				},
 				{
 					"name": "meta.using-namespace.cpp",
-					"begin": "(?<!\\w)(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*))?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=;|\\n)",
+					"begin": "(?<!\\w)(using)\\s+(namespace)\\s+(?:((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*\\s*))?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))(?=;|\\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.other.using.directive.cpp"
@@ -1574,7 +1645,7 @@
 				},
 				{
 					"name": "meta.block.namespace.cpp",
-					"begin": "((?<!\\w)(namespace)\\s+(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)\\s*(?:((?<!\\w)[a-zA-Z_]\\w*(?!\\w))|(?=\\{)))",
+					"begin": "((?<!\\w)(namespace)\\s+(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*\\s*)\\s*(?:((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))|(?=\\{)))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.head.namespace.cpp"
@@ -1623,7 +1694,7 @@
 							},
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -1633,7 +1704,7 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						}
@@ -1641,7 +1712,7 @@
 				},
 				{
 					"name": "meta.block.class.cpp",
-					"begin": "((((?<!\\w)class(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?))",
+					"begin": "((((?<!\\w)class(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))?(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))+)*))?))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.head.class.cpp"
@@ -1667,20 +1738,23 @@
 							"name": "entity.name.type.$3.cpp"
 						},
 						"7": {
-							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"8": {
+							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+						},
+						"9": {
 							"patterns": [
 								{
 									"match": ",",
 									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
 								},
 								{
-									"match": "(?:private|protected|public)",
+									"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
 									"name": "storage.type.modifier.access.$0.cpp"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.inherited.cpp"
@@ -1710,16 +1784,28 @@
 								}
 							},
 							"patterns": [
+								{
+									"include": "#preprocessor-rule-enabled"
+								},
+								{
+									"include": "#preprocessor-rule-disabled"
+								},
+								{
+									"include": "#preprocessor-rule-conditional"
+								},
+								{
+									"include": "#hacky_fix_for_stray_directive"
+								},
 								{
 									"match": ",",
 									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
 								},
 								{
-									"match": "(?:private|protected|public)",
+									"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
 									"name": "storage.type.modifier.access.$0.cpp"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.inherited.cpp"
@@ -1751,7 +1837,7 @@
 											"include": "#scope_resolution"
 										},
 										{
-											"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+											"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 											"name": "storage.type.user-defined.cpp"
 										},
 										{
@@ -1784,14 +1870,11 @@
 								}
 							},
 							"patterns": [
-								{
-									"include": "#special_block"
-								},
 								{
 									"include": "#constructor"
 								},
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -1801,7 +1884,7 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						}
@@ -1809,7 +1892,7 @@
 				},
 				{
 					"name": "meta.block.struct.cpp",
-					"begin": "((((?<!\\w)struct(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?))",
+					"begin": "((((?<!\\w)struct(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))?(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))+)*))?))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.head.struct.cpp"
@@ -1835,20 +1918,23 @@
 							"name": "entity.name.type.$3.cpp"
 						},
 						"7": {
-							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"8": {
+							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+						},
+						"9": {
 							"patterns": [
 								{
 									"match": ",",
 									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
 								},
 								{
-									"match": "(?:private|protected|public)",
+									"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
 									"name": "storage.type.modifier.access.$0.cpp"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.inherited.cpp"
@@ -1878,16 +1964,28 @@
 								}
 							},
 							"patterns": [
+								{
+									"include": "#preprocessor-rule-enabled"
+								},
+								{
+									"include": "#preprocessor-rule-disabled"
+								},
+								{
+									"include": "#preprocessor-rule-conditional"
+								},
+								{
+									"include": "#hacky_fix_for_stray_directive"
+								},
 								{
 									"match": ",",
 									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
 								},
 								{
-									"match": "(?:private|protected|public)",
+									"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
 									"name": "storage.type.modifier.access.$0.cpp"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.inherited.cpp"
@@ -1919,7 +2017,7 @@
 											"include": "#scope_resolution"
 										},
 										{
-											"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+											"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 											"name": "storage.type.user-defined.cpp"
 										},
 										{
@@ -1952,14 +2050,11 @@
 								}
 							},
 							"patterns": [
-								{
-									"include": "#special_block"
-								},
 								{
 									"include": "#constructor"
 								},
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -1969,7 +2064,7 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						}
@@ -1977,7 +2072,7 @@
 				},
 				{
 					"name": "meta.block.union.cpp",
-					"begin": "((((?<!\\w)union(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?))",
+					"begin": "((((?<!\\w)union(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))?(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))+)*))?))",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.head.union.cpp"
@@ -2003,20 +2098,23 @@
 							"name": "entity.name.type.$3.cpp"
 						},
 						"7": {
-							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"8": {
+							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+						},
+						"9": {
 							"patterns": [
 								{
 									"match": ",",
 									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
 								},
 								{
-									"match": "(?:private|protected|public)",
+									"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
 									"name": "storage.type.modifier.access.$0.cpp"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.inherited.cpp"
@@ -2046,16 +2144,28 @@
 								}
 							},
 							"patterns": [
+								{
+									"include": "#preprocessor-rule-enabled"
+								},
+								{
+									"include": "#preprocessor-rule-disabled"
+								},
+								{
+									"include": "#preprocessor-rule-conditional"
+								},
+								{
+									"include": "#hacky_fix_for_stray_directive"
+								},
 								{
 									"match": ",",
 									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
 								},
 								{
-									"match": "(?:private|protected|public)",
+									"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
 									"name": "storage.type.modifier.access.$0.cpp"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))(\\w+)",
 									"captures": {
 										"1": {
 											"name": "entity.name.type.inherited.cpp"
@@ -2087,7 +2197,7 @@
 											"include": "#scope_resolution"
 										},
 										{
-											"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+											"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 											"name": "storage.type.user-defined.cpp"
 										},
 										{
@@ -2120,14 +2230,11 @@
 								}
 							},
 							"patterns": [
-								{
-									"include": "#special_block"
-								},
 								{
 									"include": "#constructor"
 								},
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -2137,7 +2244,7 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						}
@@ -2145,7 +2252,7 @@
 				},
 				{
 					"name": "meta.block.enum.cpp",
-					"begin": "((enum)\\s+(?:(class|struct)(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={)))?(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*(?:(((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)([a-zA-Z_]\\w*)\\s*(?:(<(?:[\\s<>,\\w])*>\\s*))?(::)))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w)))?)",
+					"begin": "((enum)\\s+(?:(class|struct)(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={)))?(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))?(?:\\s*(:)\\s*(?:(((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*\\s*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)\\s*(?:(<(?:[\\s<>:,\\w])*>\\s*))?(::)))?\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)))?)",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.head.enum.cpp"
@@ -2202,7 +2309,7 @@
 									"include": "#scope_resolution"
 								},
 								{
-									"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+									"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 									"name": "storage.type.user-defined.cpp"
 								},
 								{
@@ -2245,7 +2352,12 @@
 								"1": {
 									"name": "punctuation.section.block.begin.bracket.curly.enum.cpp"
 								}
-							}
+							},
+							"patterns": [
+								{
+									"include": "#cpp_base"
+								}
+							]
 						},
 						{
 							"name": "meta.body.enum.cpp",
@@ -2258,7 +2370,7 @@
 							},
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -2268,7 +2380,7 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						}
@@ -2306,7 +2418,7 @@
 							},
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -2321,7 +2433,7 @@
 							},
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -2331,12 +2443,12 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
 						{
-							"include": "$base"
+							"include": "#cpp_base"
 						}
 					]
 				}
@@ -2499,12 +2611,12 @@
 					"include": "#parens-block-c"
 				},
 				{
-					"include": "$base"
+					"include": "#cpp_base"
 				}
 			]
 		},
 		"c_function_call": {
-			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|constexpr|volatile|operator|(?:::)?new|(?:::)?delete)\\s*\\()\n(?=\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*(?-mix:(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?)\\(  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+			"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas|constexpr|volatile|operator|(?:::)?new|(?:::)?delete)\\s*\\()\n(?=\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*(?-mix:(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?)\\(  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
 			"end": "(?<=\\))(?!\\w)",
 			"name": "meta.function-call.cpp",
 			"patterns": [
@@ -2616,7 +2728,7 @@
 			},
 			"patterns": [
 				{
-					"include": "$base"
+					"include": "#cpp_base"
 				}
 			]
 		},
@@ -2805,7 +2917,7 @@
 							]
 						},
 						{
-							"include": "$base"
+							"include": "#cpp_base"
 						}
 					]
 				}
@@ -3031,7 +3143,7 @@
 									]
 								},
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						},
@@ -3289,7 +3401,7 @@
 							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
 							"patterns": [
 								{
-									"include": "$base"
+									"include": "#cpp_base"
 								}
 							]
 						}
@@ -3480,7 +3592,7 @@
 							]
 						},
 						{
-							"include": "$base"
+							"include": "#cpp_base"
 						}
 					]
 				}
@@ -3589,7 +3701,7 @@
 			"end": "(?=^\\s*((#)\\s*endif\\b))",
 			"patterns": [
 				{
-					"include": "$base"
+					"include": "#cpp_base"
 				}
 			]
 		},
@@ -3619,7 +3731,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "(?-mix:##?[a-zA-Z_]\\w*(?!\\w))",
+					"match": "(?-mix:##?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
 					"name": "variable.other.macro.argument.cpp"
 				},
 				{
@@ -3716,7 +3828,7 @@
 					"include": "#member_access"
 				},
 				{
-					"include": "$base"
+					"include": "#cpp_base"
 				}
 			]
 		},
@@ -3878,7 +3990,7 @@
 					]
 				},
 				{
-					"include": "$base"
+					"include": "#cpp_base"
 				}
 			]
 		},
@@ -3903,7 +4015,7 @@
 					"include": "#operators"
 				},
 				{
-					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()\n(\n(?:new)\\s*((?-mix:(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?)) # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()\n(\n(?:new)\\s*((?-mix:(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?)) # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.operator.wordlike.cpp memory.cpp keyword.operator.new.cpp"
@@ -3932,7 +4044,7 @@
 					]
 				},
 				{
-					"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)([a-zA-Z_]\\w*)\\s*(?:(<(?:[\\s<>,\\w])*>\\s*))?(\\()",
+					"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*\\s*(?:(?-mix:(?:<(?:[\\s<>:,\\w])*>\\s*)))?::)*\\s*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*)\\s*(?:(<(?:[\\s<>:,\\w])*>\\s*))?(\\()",
 					"beginCaptures": {
 						"1": {
 							"patterns": [
@@ -3957,7 +4069,7 @@
 									"include": "#scope_resolution"
 								},
 								{
-									"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+									"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w)",
 									"name": "storage.type.user-defined.cpp"
 								},
 								{
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index c66e666e2dc..e73cc3a09af 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -71,8 +71,9 @@
 			"scope": [
 				"keyword.control",
 				"keyword.operator.new.cpp",
-				"keyword.operator.delete.cpp",
-				"keyword.other.using"
+				"keyword.operator.delete",
+				"keyword.other.using",
+				"keyword.other.operator"
 			],
 			"settings": {
 				"foreground": "#C586C0"
diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json
index 74bf098818a..e9747412612 100644
--- a/extensions/theme-defaults/themes/hc_black.json
+++ b/extensions/theme-defaults/themes/hc_black.json
@@ -69,7 +69,8 @@
 				"keyword.control",
 				"keyword.operator.new.cpp",
 				"keyword.operator.delete.cpp",
-				"keyword.other.using"
+				"keyword.other.using",
+				"keyword.other.operator"
 			],
 			"settings": {
 				"foreground": "#C586C0"
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index c58e8c6f903..ce23ed901d6 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -72,7 +72,8 @@
 				"keyword.control",
 				"keyword.operator.new.cpp",
 				"keyword.operator.delete.cpp",
-				"keyword.other.using"
+				"keyword.other.using",
+				"keyword.other.operator"
 			],
 			"settings": {
 				"foreground": "#AF00DB"
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index 8b2110255f2..3d3267fca82 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -116,7 +116,8 @@
 				"keyword.control",
 				"keyword.operator.new.cpp",
 				"keyword.operator.delete.cpp",
-				"keyword.other.using"
+				"keyword.other.using",
+				"keyword.other.operator"
 			],
 			"settings": {
 				"foreground": "#98676a"
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
index e5088a0811e..5fd846e43ca 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -259,7 +259,8 @@
 				"keyword.control",
 				"keyword.operator.new.cpp",
 				"keyword.operator.delete.cpp",
-				"keyword.other.using"
+				"keyword.other.using",
+				"keyword.other.operator"
 			],
 			"settings": {
 				"fontStyle": "",
-- 
GitLab