diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json
index b6a12aa3af23e257e2e544ddf5577df519eaa97f..113cea950f6d004ba4bad78f340cb9dd0899fe0d 100644
--- a/extensions/cpp/cgmanifest.json
+++ b/extensions/cpp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jeff-hykin/cpp-textmate-grammar",
 					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "59f0673f04d6e5c8a4d1b3ccc5235ed8a4ccb6c0"
+					"commitHash": "cb9cb59b32d0cb9e2cbbca1a9cdb62769fc2ca8e"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json
index 679f53c04c09c71118c999f8f6e6f4e521524bd7..91be1a66bdf9b1588a8c989285ea8fb91e8a6756 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/9c4f4b3291538d9f5144f02d3b6af877b84f2cb2",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/1a24b4aa383169919f0d92cf2735ac35a3e7db3c",
 	"name": "C",
 	"scopeName": "source.c",
 	"patterns": [
@@ -374,16 +374,41 @@
 	"repository": {
 		"default_statement": {
 			"name": "meta.conditional.case.c",
-			"begin": "((?<!\\w)default(?!\\w))",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)default(?!\\w))",
 			"beginCaptures": {
 				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.c punctuation.definition.comment.begin.c"
+				},
+				"3": {
+					"name": "comment.block.c"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.c punctuation.definition.comment.end.c"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.c"
+						}
+					]
+				},
+				"5": {
 					"name": "keyword.control.default.c"
 				}
 			},
 			"end": "(:)",
 			"endCaptures": {
 				"1": {
-					"name": "colon.c punctuation.separator.case.default.c"
+					"name": "punctuation.separator.colon.case.default.c"
 				}
 			},
 			"patterns": [
@@ -397,16 +422,41 @@
 		},
 		"case_statement": {
 			"name": "meta.conditional.case.c",
-			"begin": "((?<!\\w)case(?!\\w))",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)case(?!\\w))",
 			"beginCaptures": {
 				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.c punctuation.definition.comment.begin.c"
+				},
+				"3": {
+					"name": "comment.block.c"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.c punctuation.definition.comment.end.c"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.c"
+						}
+					]
+				},
+				"5": {
 					"name": "keyword.control.case.c"
 				}
 			},
 			"end": "(:)",
 			"endCaptures": {
 				"1": {
-					"name": "colon.c punctuation.separator.case.c"
+					"name": "punctuation.separator.colon.case.c"
 				}
 			},
 			"patterns": [
@@ -420,12 +470,37 @@
 		},
 		"switch_statement": {
 			"name": "meta.block.switch.c",
-			"begin": "(((?<!\\w)switch(?!\\w)))",
+			"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)switch(?!\\w)))",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.head.switch.c"
 				},
 				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.c punctuation.definition.comment.begin.c"
+				},
+				"4": {
+					"name": "comment.block.c"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.c punctuation.definition.comment.end.c"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.c"
+						}
+					]
+				},
+				"6": {
 					"name": "keyword.control.switch.c"
 				}
 			},
@@ -487,9 +562,34 @@
 		},
 		"switch_conditional_parentheses": {
 			"name": "meta.conditional.switch.c",
-			"begin": "(\\()",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
 			"beginCaptures": {
 				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.c punctuation.definition.comment.begin.c"
+				},
+				"3": {
+					"name": "comment.block.c"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.c punctuation.definition.comment.end.c"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.c"
+						}
+					]
+				},
+				"5": {
 					"name": "punctuation.section.parens.begin.bracket.round.conditional.switch.c"
 				}
 			},
@@ -580,7 +680,7 @@
 					"begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
 					"beginCaptures": {
 						"1": {
-							"name": "comma.c punctuation.separator.delimiter.c"
+							"name": "punctuation.separator.delimiter.comma.c"
 						}
 					},
 					"end": "(?=\\))",
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json
index 9c0ca7e8464d55b2a1f98e445d218af68303ddec..e43d8d45b618ce82454dc342ec67fb02215380fe 100644
--- a/extensions/cpp/syntaxes/cpp.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.tmLanguage.json
@@ -4,19 +4,93 @@
 		"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/59f0673f04d6e5c8a4d1b3ccc5235ed8a4ccb6c0",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/cb9cb59b32d0cb9e2cbbca1a9cdb62769fc2ca8e",
 	"name": "C++",
 	"scopeName": "source.cpp",
 	"patterns": [
 		{
-			"name": "source.cpp",
-			"begin": "(?=^|\\A|\\G)",
-			"end": "not(?<=possible)",
-			"patterns": [
-				{
-					"include": "#initial_context"
-				}
-			]
+			"include": "#ever_present_context"
+		},
+		{
+			"include": "#constructor_root"
+		},
+		{
+			"include": "#destructor_root"
+		},
+		{
+			"include": "#function_definition"
+		},
+		{
+			"include": "#operator_overload"
+		},
+		{
+			"include": "#using_namespace"
+		},
+		{
+			"include": "#type_alias"
+		},
+		{
+			"include": "#using_name"
+		},
+		{
+			"include": "#namespace_alias"
+		},
+		{
+			"include": "#namespace_block"
+		},
+		{
+			"include": "#extern_block"
+		},
+		{
+			"include": "#typedef_class"
+		},
+		{
+			"include": "#typedef_struct"
+		},
+		{
+			"include": "#typedef_union"
+		},
+		{
+			"include": "#typedef_keyword"
+		},
+		{
+			"include": "#standard_declares"
+		},
+		{
+			"include": "#class_block"
+		},
+		{
+			"include": "#struct_block"
+		},
+		{
+			"include": "#union_block"
+		},
+		{
+			"include": "#enum_block"
+		},
+		{
+			"include": "#template_isolated_definition"
+		},
+		{
+			"include": "#template_definition"
+		},
+		{
+			"include": "#access_control_keywords"
+		},
+		{
+			"include": "#block"
+		},
+		{
+			"include": "#static_assert"
+		},
+		{
+			"include": "#assembly"
+		},
+		{
+			"include": "#function_pointer"
+		},
+		{
+			"include": "#evaluation_context"
 		}
 	],
 	"repository": {
@@ -49,7 +123,7 @@
 		},
 		"comma": {
 			"match": ",",
-			"name": "comma.cpp punctuation.separator.delimiter.cpp"
+			"name": "punctuation.separator.delimiter.comma.cpp"
 		},
 		"assignment_operator": {
 			"match": "\\=",
@@ -224,6 +298,9 @@
 				{
 					"include": "#language_constants"
 				},
+				{
+					"include": "#builtin_storage_type_initilizer"
+				},
 				{
 					"include": "#qualifiers_and_specifiers_post_parameters"
 				},
@@ -711,12 +788,70 @@
 			"name": "constant.language.$0.cpp"
 		},
 		"primitive_types": {
-			"match": "(?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w)",
-			"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
+				}
+			}
 		},
 		"non_primitive_types": {
-			"match": "(?<!\\w)(?: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|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)(?!\\w)",
-			"name": "storage.type.cpp storage.type.built-in.cpp"
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?: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|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)(?!\\w))",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "storage.type.cpp storage.type.built-in.cpp"
+				}
+			}
 		},
 		"decltype_specifier": {
 			"contentName": "meta.arguments.decltype.cpp",
@@ -815,12 +950,70 @@
 			]
 		},
 		"pthread_types": {
-			"match": "(?<!\\w)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(?!\\w)",
-			"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)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(?!\\w))",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+				}
+			}
 		},
 		"posix_reserved_types": {
-			"match": "(?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)",
-			"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w))",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+				}
+			}
 		},
 		"using_name": {
 			"match": "(using)\\s+(?!namespace\\b)",
@@ -835,80 +1028,55 @@
 			"name": "storage.modifier.specifier.functional.pre-parameters.$0.cpp"
 		},
 		"qualifiers_and_specifiers_post_parameters": {
-			"match": "(?<!\\w)(?:final|override|volatile|const|noexcept)(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r]))",
-			"name": "storage.modifier.specifier.functional.post-parameters.$0.cpp"
-		},
-		"storage_specifiers": {
-			"match": "(?<!\\w)(?:const|static|volatile|register|restrict|extern)(?!\\w)",
-			"name": "storage.modifier.specifier.$0.cpp"
-		},
-		"access_control_keywords": {
-			"match": "(?<!\\w)((?:private|protected|public))\\s*(:)",
-			"captures": {
-				"2": {
-					"name": "colon.cpp punctuation.separator.delimiter.colon.access.control.cpp"
-				}
-			},
-			"name": "storage.type.modifier.access.control.$1.cpp"
-		},
-		"exception_keywords": {
-			"match": "(?<!\\w)(?:throw|try|catch)(?!\\w)",
-			"name": "keyword.control.exception.$0.cpp"
-		},
-		"typedef_keyword": {
-			"match": "(?<!\\w)typedef(?!\\w)",
-			"name": "keyword.other.$0.cpp"
-		},
-		"the_this_keyword": {
-			"match": "(?<!\\w)this(?!\\w)",
-			"name": "variable.language.this.cpp"
-		},
-		"type_casting_operators": {
-			"match": "(?<!\\w)(?:static_cast|dynamic_cast|const_cast|reinterpret_cast)(?!\\w)",
-			"name": "keyword.operator.wordlike.cpp keyword.operator.cast.$0.cpp"
-		},
-		"memory_operators": {
-			"match": "(?<!\\w)(?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\w)",
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:final|override|volatile|const|noexcept)(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r])))",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.delete.array.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"2": {
-					"name": "keyword.operator.delete.array.bracket.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"3": {
-					"name": "keyword.operator.delete.cpp"
+					"name": "comment.block.cpp"
 				},
 				"4": {
-					"name": "keyword.operator.new.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "storage.modifier.specifier.functional.post-parameters.$5.cpp"
 				}
-			},
-			"name": "keyword.operator.wordlike.cpp"
-		},
-		"control_flow_keywords": {
-			"match": "(?<!\\w)(?:throw|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default)(?!\\w)",
-			"name": "keyword.control.$0.cpp"
+			}
 		},
-		"goto_statement": {
-			"match": "((?<!\\w)goto(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)",
+		"storage_specifiers": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:const|static|volatile|register|restrict|extern)(?!\\w))",
 			"captures": {
 				"1": {
-					"name": "keyword.control.goto.cpp"
-				},
-				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -920,13 +1088,13 @@
 						}
 					]
 				},
-				"6": {
-					"name": "entity.name.label.call.cpp"
+				"5": {
+					"name": "storage.modifier.specifier.$5.cpp"
 				}
 			}
 		},
-		"label": {
-			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\b(?<!case|default)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(:)",
+		"access_control_keywords": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(((?:private|protected|public))\\s*(:))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -954,22 +1122,30 @@
 					]
 				},
 				"5": {
-					"name": "entity.name.label.cpp"
+					"name": "storage.type.modifier.access.control.$6.cpp"
 				},
-				"6": {
+				"7": {
+					"name": "punctuation.separator.colon.access.control.cpp"
+				}
+			}
+		},
+		"exception_keywords": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:throw|try|catch)(?!\\w))",
+			"captures": {
+				"1": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"7": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"8": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"9": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -981,755 +1157,964 @@
 						}
 					]
 				},
-				"10": {
-					"name": "punctuation.separator.label.cpp"
+				"5": {
+					"name": "keyword.control.exception.$5.cpp"
 				}
 			}
 		},
-		"default_statement": {
-			"name": "meta.conditional.case.cpp",
-			"begin": "((?<!\\w)default(?!\\w))",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.default.cpp"
-				}
-			},
-			"end": "(:)",
-			"endCaptures": {
+		"typedef_keyword": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)typedef(?!\\w))",
+			"captures": {
 				"1": {
-					"name": "colon.cpp punctuation.separator.case.default.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"include": "#c_conditional_context"
-				}
-			]
-		},
-		"case_statement": {
-			"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": "#evaluation_context"
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"include": "#c_conditional_context"
-				}
-			]
-		},
-		"switch_conditional_parentheses": {
-			"name": "meta.conditional.switch.cpp",
-			"begin": "(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.section.parens.begin.bracket.round.conditional.switch.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.parens.end.bracket.round.conditional.switch.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
+				"3": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"include": "#c_conditional_context"
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "keyword.other.$5.cpp"
 				}
-			]
+			}
 		},
-		"switch_statement": {
-			"name": "meta.block.switch.cpp",
-			"begin": "(((?<!\\w)switch(?!\\w)))",
-			"beginCaptures": {
+		"the_this_keyword": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))",
+			"captures": {
 				"1": {
-					"name": "meta.head.switch.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"2": {
-					"name": "keyword.control.switch.cpp"
-				}
-			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
-			"patterns": [
-				{
-					"name": "meta.head.switch.cpp",
-					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.begin.bracket.curly.switch.cpp"
-						}
-					},
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
 					"patterns": [
 						{
-							"include": "#switch_conditional_parentheses"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#initial_context"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"name": "meta.body.switch.cpp",
-					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.end.bracket.curly.switch.cpp"
-						}
-					},
+				"5": {
+					"name": "variable.language.this.cpp"
+				}
+			}
+		},
+		"type_casting_operators": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:static_cast|dynamic_cast|const_cast|reinterpret_cast)(?!\\w))",
+			"captures": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#default_statement"
-						},
-						{
-							"include": "#case_statement"
-						},
-						{
-							"include": "#initial_context"
-						},
-						{
-							"include": "#block_innards"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				{
-					"name": "meta.tail.switch.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
+				},
+				"5": {
+					"name": "keyword.operator.wordlike.cpp keyword.operator.cast.$5.cpp"
 				}
-			]
+			}
 		},
-		"cpp_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(\\[\\[)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.section.attribute.begin.cpp"
-				}
-			},
-			"end": "(\\]\\])",
-			"endCaptures": {
+		"memory_operators": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\w))",
+			"captures": {
 				"1": {
-					"name": "punctuation.section.attribute.end.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#attributes_context"
-				},
-				{
-					"begin": "\\(",
-					"end": "\\)",
 					"patterns": [
 						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#string_context_c"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				{
-					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
-					"captures": {
-						"1": {
-							"name": "keyword.other.using.directive.cpp"
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
-						"2": {
-							"name": "entity.name.namespace.cpp"
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
-					}
+					]
 				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.attribute.cpp"
+				"5": {
+					"name": "keyword.operator.wordlike.cpp"
 				},
-				{
-					"match": ":",
-					"name": "punctuation.accessor.attribute.cpp"
+				"6": {
+					"name": "keyword.operator.delete.array.cpp"
 				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
-					"name": "entity.name.namespace.cpp"
+				"7": {
+					"name": "keyword.operator.delete.array.bracket.cpp"
 				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-					"name": "entity.other.attribute.$0.cpp"
+				"8": {
+					"name": "keyword.operator.delete.cpp"
 				},
-				{
-					"include": "#number_literal"
+				"9": {
+					"name": "keyword.operator.new.cpp"
 				}
-			]
+			}
 		},
-		"gcc_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(__attribute(?:__)?\\(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.section.attribute.begin.cpp"
-				}
-			},
-			"end": "(\\)\\))",
-			"endCaptures": {
+		"control_flow_keywords": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:throw|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default)(?!\\w))",
+			"captures": {
 				"1": {
-					"name": "punctuation.section.attribute.end.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#attributes_context"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"begin": "\\(",
-					"end": "\\)",
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
 					"patterns": [
 						{
-							"include": "#attributes_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#string_context_c"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
-					"captures": {
-						"1": {
-							"name": "keyword.other.using.directive.cpp"
-						},
-						"2": {
-							"name": "entity.name.namespace.cpp"
-						}
-					}
+				"5": {
+					"name": "keyword.control.$5.cpp"
+				}
+			}
+		},
+		"goto_statement": {
+			"match": "((?<!\\w)goto(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)",
+			"captures": {
+				"1": {
+					"name": "keyword.control.goto.cpp"
 				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.attribute.cpp"
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": ":",
-					"name": "punctuation.accessor.attribute.cpp"
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
-					"name": "entity.name.namespace.cpp"
+				"4": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-					"name": "entity.other.attribute.$0.cpp"
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"include": "#number_literal"
+				"6": {
+					"name": "entity.name.label.call.cpp"
 				}
-			]
+			}
 		},
-		"ms_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(__declspec\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.section.attribute.begin.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
+		"label": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\b(?<!case|default)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(:)",
+			"captures": {
 				"1": {
-					"name": "punctuation.section.attribute.end.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#attributes_context"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"begin": "\\(",
-					"end": "\\)",
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
 					"patterns": [
 						{
-							"include": "#attributes_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#string_context_c"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
-					"captures": {
-						"1": {
-							"name": "keyword.other.using.directive.cpp"
-						},
-						"2": {
-							"name": "entity.name.namespace.cpp"
-						}
-					}
+				"5": {
+					"name": "entity.name.label.cpp"
 				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.attribute.cpp"
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": ":",
-					"name": "punctuation.accessor.attribute.cpp"
+				"7": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
-					"name": "entity.name.namespace.cpp"
+				"8": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-					"name": "entity.other.attribute.$0.cpp"
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"include": "#number_literal"
+				"10": {
+					"name": "punctuation.separator.label.cpp"
 				}
-			]
+			}
 		},
-		"alignas_attribute": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(alignas\\()",
+		"default_statement": {
+			"name": "meta.conditional.case.cpp",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)default(?!\\w))",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.section.attribute.begin.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "keyword.control.default.cpp"
 				}
 			},
-			"end": "(\\))",
+			"end": "(:)",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.attribute.end.cpp"
+					"name": "punctuation.separator.colon.case.default.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"include": "#attributes_context"
+					"include": "#evaluation_context"
 				},
 				{
-					"begin": "\\(",
-					"end": "\\)",
+					"include": "#c_conditional_context"
+				}
+			]
+		},
+		"case_statement": {
+			"name": "meta.conditional.case.cpp",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)case(?!\\w))",
+			"beginCaptures": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#string_context_c"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				{
-					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
-					"captures": {
-						"1": {
-							"name": "keyword.other.using.directive.cpp"
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
-						"2": {
-							"name": "entity.name.namespace.cpp"
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
-					}
-				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.attribute.cpp"
+					]
 				},
-				{
-					"match": ":",
-					"name": "punctuation.accessor.attribute.cpp"
-				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
-					"name": "entity.name.namespace.cpp"
-				},
-				{
-					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-					"name": "entity.other.attribute.$0.cpp"
-				},
-				{
-					"include": "#number_literal"
-				}
-			]
-		},
-		"comma_in_template_argument": {
-			"match": ",",
-			"name": "comma.cpp punctuation.separator.template.argument.cpp"
-		},
-		"template_call_innards": {
-			"match": "(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*",
-			"captures": {
-				"0": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"template_call_range": {
-			"name": "meta.template.call.cpp",
-			"begin": "(<)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+				"5": {
+					"name": "keyword.control.case.cpp"
 				}
 			},
-			"end": "(>)",
+			"end": "(:)",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+					"name": "punctuation.separator.colon.case.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"include": "#template_call_context"
+					"include": "#evaluation_context"
+				},
+				{
+					"include": "#c_conditional_context"
 				}
 			]
 		},
-		"template_isolated_definition": {
-			"match": "(?<!\\w)(template)\\s*(<)(.*)(>\\s*$)",
-			"captures": {
+		"switch_conditional_parentheses": {
+			"name": "meta.conditional.switch.cpp",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
 				"1": {
-					"name": "storage.type.template.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"2": {
-					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"3": {
-					"name": "meta.template.definition.cpp",
+					"name": "comment.block.cpp"
+				},
+				"4": {
 					"patterns": [
 						{
-							"include": "#template_definition_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"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"
+				"5": {
+					"name": "punctuation.section.parens.begin.bracket.round.conditional.switch.cpp"
 				}
 			},
-			"end": "(>)",
+			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
+					"name": "punctuation.section.parens.end.bracket.round.conditional.switch.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": "#template_call_context"
-						}
-					]
+					"include": "#evaluation_context"
 				},
 				{
-					"include": "#template_definition_context"
+					"include": "#c_conditional_context"
 				}
 			]
 		},
-		"template_argument_defaulted": {
-			"match": "(?<=<|,)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s+)*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\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}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*(\\.\\.\\.)\\s*((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))\\s*(?:(,)|(?=>|$))",
-			"captures": {
+		"switch_statement": {
+			"name": "meta.block.switch.cpp",
+			"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)switch(?!\\w)))",
+			"beginCaptures": {
 				"1": {
-					"name": "storage.type.template.argument.$1.cpp"
+					"name": "meta.head.switch.cpp"
 				},
 				"2": {
 					"patterns": [
 						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "storage.type.template.argument.$0.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"3": {
-					"name": "entity.name.type.template.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"4": {
-					"name": "storage.type.template.cpp"
+					"name": "comment.block.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}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
+				},
+				"6": {
+					"name": "keyword.control.switch.cpp"
 				}
-			}
-		},
-		"scope_resolution_inner_generated": {
-			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
-			"captures": {
-				"1": {
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"patterns": [
+				{
+					"name": "meta.head.switch.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.switch.cpp"
+						}
+					},
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "#switch_conditional_parentheses"
+						},
+						{
+							"include": "$base"
 						}
 					]
 				},
-				"2": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				{
+					"name": "meta.body.switch.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.switch.cpp"
+						}
+					},
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#default_statement"
+						},
+						{
+							"include": "#case_statement"
+						},
+						{
+							"include": "$base"
+						},
+						{
+							"include": "#block_innards"
 						}
 					]
 				},
-				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				}
-			}
-		},
-		"scope_resolution_template_call": {
-			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
+				{
+					"name": "meta.tail.switch.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#scope_resolution_template_call_inner_generated"
+							"include": "$base"
 						}
 					]
 				}
-			}
+			]
 		},
-		"scope_resolution_template_call_inner_generated": {
-			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
-			"captures": {
+		"cpp_attributes": {
+			"name": "support.other.attribute.cpp",
+			"begin": "(\\[\\[)",
+			"beginCaptures": {
 				"1": {
+					"name": "punctuation.section.attribute.begin.cpp"
+				}
+			},
+			"end": "(\\]\\])",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.end.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#attributes_context"
+				},
+				{
+					"begin": "\\(",
+					"end": "\\)",
 					"patterns": [
 						{
-							"include": "#scope_resolution_template_call_inner_generated"
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#string_context_c"
 						}
 					]
 				},
-				"2": {
-					"name": "entity.name.scope-resolution.template.call.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
+				{
+					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "keyword.other.using.directive.cpp"
+						},
+						"2": {
+							"name": "entity.name.namespace.cpp"
 						}
-					]
+					}
 				},
-				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
+				{
+					"match": ",",
+					"name": "punctuation.separator.attribute.cpp"
+				},
+				{
+					"match": ":",
+					"name": "punctuation.accessor.attribute.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+					"name": "entity.name.namespace.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+					"name": "entity.other.attribute.$0.cpp"
+				},
+				{
+					"include": "#number_literal"
 				}
-			}
+			]
 		},
-		"scope_resolution_template_definition": {
-			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_template_definition_inner_generated"
-						}
-					]
+		"gcc_attributes": {
+			"name": "support.other.attribute.cpp",
+			"begin": "(__attribute(?:__)?\\(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.begin.cpp"
 				}
-			}
-		},
-		"scope_resolution_template_definition_inner_generated": {
-			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
-			"captures": {
+			},
+			"end": "(\\)\\))",
+			"endCaptures": {
 				"1": {
+					"name": "punctuation.section.attribute.end.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#attributes_context"
+				},
+				{
+					"begin": "\\(",
+					"end": "\\)",
 					"patterns": [
 						{
-							"include": "#scope_resolution_template_definition_inner_generated"
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#string_context_c"
 						}
 					]
 				},
-				"2": {
-					"name": "entity.name.scope-resolution.template.definition.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
+				{
+					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "keyword.other.using.directive.cpp"
+						},
+						"2": {
+							"name": "entity.name.namespace.cpp"
 						}
-					]
+					}
 				},
-				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
+				{
+					"match": ",",
+					"name": "punctuation.separator.attribute.cpp"
+				},
+				{
+					"match": ":",
+					"name": "punctuation.accessor.attribute.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+					"name": "entity.name.namespace.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+					"name": "entity.other.attribute.$0.cpp"
+				},
+				{
+					"include": "#number_literal"
 				}
-			}
+			]
 		},
-		"scope_resolution_function_call": {
-			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
+		"ms_attributes": {
+			"name": "support.other.attribute.cpp",
+			"begin": "(__declspec\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.begin.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.end.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#attributes_context"
+				},
+				{
+					"begin": "\\(",
+					"end": "\\)",
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_call_inner_generated"
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#string_context_c"
 						}
 					]
+				},
+				{
+					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "keyword.other.using.directive.cpp"
+						},
+						"2": {
+							"name": "entity.name.namespace.cpp"
+						}
+					}
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.attribute.cpp"
+				},
+				{
+					"match": ":",
+					"name": "punctuation.accessor.attribute.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+					"name": "entity.name.namespace.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+					"name": "entity.other.attribute.$0.cpp"
+				},
+				{
+					"include": "#number_literal"
 				}
-			}
+			]
 		},
-		"scope_resolution_function_call_inner_generated": {
-			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
-			"captures": {
+		"alignas_attribute": {
+			"name": "support.other.attribute.cpp",
+			"begin": "(alignas\\()",
+			"beginCaptures": {
 				"1": {
+					"name": "punctuation.section.attribute.begin.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.end.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#attributes_context"
+				},
+				{
+					"begin": "\\(",
+					"end": "\\)",
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_call_inner_generated"
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#string_context_c"
 						}
 					]
 				},
-				"2": {
-					"name": "entity.name.scope-resolution.function.call.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
+				{
+					"match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+					"captures": {
+						"1": {
+							"name": "keyword.other.using.directive.cpp"
+						},
+						"2": {
+							"name": "entity.name.namespace.cpp"
 						}
-					]
+					}
 				},
-				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
+				{
+					"match": ",",
+					"name": "punctuation.separator.attribute.cpp"
+				},
+				{
+					"match": ":",
+					"name": "punctuation.accessor.attribute.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=::)",
+					"name": "entity.name.namespace.cpp"
+				},
+				{
+					"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+					"name": "entity.other.attribute.$0.cpp"
+				},
+				{
+					"include": "#number_literal"
 				}
-			}
+			]
 		},
-		"scope_resolution_function_definition": {
-			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
+		"comma_in_template_argument": {
+			"match": ",",
+			"name": "punctuation.separator.delimiter.comma.template.argument.cpp"
+		},
+		"template_call_innards": {
+			"match": "(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*",
 			"captures": {
 				"0": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_definition_inner_generated"
+							"include": "#template_call_range"
 						}
 					]
 				}
 			}
 		},
-		"scope_resolution_function_definition_inner_generated": {
-			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
+		"template_call_range": {
+			"name": "meta.template.call.cpp",
+			"begin": "(<)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+				}
+			},
+			"end": "(>)",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#template_call_context"
+				}
+			]
+		},
+		"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_function_definition_inner_generated"
+							"include": "#template_definition_context"
 						}
 					]
 				},
+				"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": "entity.name.scope-resolution.function.definition.cpp"
+					"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": "#template_call_context"
+						}
+					]
+				},
+				{
+					"include": "#template_definition_context"
+				}
+			]
+		},
+		"template_argument_defaulted": {
+			"match": "(?<=<|,)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s+)*)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*([=])",
+			"captures": {
+				"1": {
+					"name": "storage.type.template.cpp"
+				},
+				"2": {
+					"name": "entity.name.type.template.cpp"
 				},
 				"3": {
-					"name": "meta.template.call.cpp",
+					"name": "keyword.operator.assignment.cpp"
+				}
+			}
+		},
+		"template_definition_argument": {
+			"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s+)+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))|((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*(\\.\\.\\.)\\s*((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))\\s*(?:(,)|(?=>|$))",
+			"captures": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
 				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "storage.type.template.argument.$5.cpp"
+				},
+				"6": {
+					"patterns": [
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "storage.type.template.argument.$0.cpp"
+						}
+					]
+				},
+				"7": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"8": {
+					"name": "storage.type.template.cpp"
+				},
+				"9": {
+					"name": "ellipses.cpp punctuation.vararg-ellipses.template.definition.cpp"
+				},
+				"10": {
+					"name": "entity.name.type.template.cpp"
+				},
+				"11": {
+					"name": "punctuation.separator.delimiter.comma.template.argument.cpp"
 				}
 			}
 		},
-		"scope_resolution_namespace_alias": {
+		"scope_resolution": {
 			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_alias_inner_generated"
+							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				}
 			}
 		},
-		"scope_resolution_namespace_alias_inner_generated": {
+		"scope_resolution_inner_generated": {
 			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_alias_inner_generated"
+							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
 				"2": {
-					"name": "entity.name.scope-resolution.namespace.alias.cpp"
+					"name": "entity.name.scope-resolution.cpp"
 				},
 				"3": {
 					"name": "meta.template.call.cpp",
@@ -1740,34 +2125,34 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				}
 			}
 		},
-		"scope_resolution_namespace_using": {
+		"scope_resolution_template_call": {
 			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_using_inner_generated"
+							"include": "#scope_resolution_template_call_inner_generated"
 						}
 					]
 				}
 			}
 		},
-		"scope_resolution_namespace_using_inner_generated": {
+		"scope_resolution_template_call_inner_generated": {
 			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_using_inner_generated"
+							"include": "#scope_resolution_template_call_inner_generated"
 						}
 					]
 				},
 				"2": {
-					"name": "entity.name.scope-resolution.namespace.using.cpp"
+					"name": "entity.name.scope-resolution.template.call.cpp"
 				},
 				"3": {
 					"name": "meta.template.call.cpp",
@@ -1778,34 +2163,34 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
 				}
 			}
 		},
-		"scope_resolution_namespace_block": {
+		"scope_resolution_template_definition": {
 			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_block_inner_generated"
+							"include": "#scope_resolution_template_definition_inner_generated"
 						}
 					]
 				}
 			}
 		},
-		"scope_resolution_namespace_block_inner_generated": {
+		"scope_resolution_template_definition_inner_generated": {
 			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_block_inner_generated"
+							"include": "#scope_resolution_template_definition_inner_generated"
 						}
 					]
 				},
 				"2": {
-					"name": "entity.name.scope-resolution.namespace.block.cpp"
+					"name": "entity.name.scope-resolution.template.definition.cpp"
 				},
 				"3": {
 					"name": "meta.template.call.cpp",
@@ -1816,34 +2201,34 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
 				}
 			}
 		},
-		"scope_resolution_parameter": {
+		"scope_resolution_function_call": {
 			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_parameter_inner_generated"
+							"include": "#scope_resolution_function_call_inner_generated"
 						}
 					]
 				}
 			}
 		},
-		"scope_resolution_parameter_inner_generated": {
+		"scope_resolution_function_call_inner_generated": {
 			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_parameter_inner_generated"
+							"include": "#scope_resolution_function_call_inner_generated"
 						}
 					]
 				},
 				"2": {
-					"name": "entity.name.scope-resolution.parameter.cpp"
+					"name": "entity.name.scope-resolution.function.call.cpp"
 				},
 				"3": {
 					"name": "meta.template.call.cpp",
@@ -1854,34 +2239,34 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
 				}
 			}
 		},
-		"scope_resolution_function_definition_operator_overload": {
+		"scope_resolution_function_definition": {
 			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_definition_operator_overload_inner_generated"
+							"include": "#scope_resolution_function_definition_inner_generated"
 						}
 					]
 				}
 			}
 		},
-		"scope_resolution_function_definition_operator_overload_inner_generated": {
+		"scope_resolution_function_definition_inner_generated": {
 			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_definition_operator_overload_inner_generated"
+							"include": "#scope_resolution_function_definition_inner_generated"
 						}
 					]
 				},
 				"2": {
-					"name": "entity.name.scope-resolution.function.definition.operator-overload.cpp"
+					"name": "entity.name.scope-resolution.function.definition.cpp"
 				},
 				"3": {
 					"name": "meta.template.call.cpp",
@@ -1892,121 +2277,112 @@
 					]
 				},
 				"4": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				}
 			}
 		},
-		"qualified_type": {
-			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])",
+		"scope_resolution_namespace_alias": {
+			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
 			"captures": {
 				"0": {
-					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?:class|struct|union|enum)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context_c"
-						},
-						{
-							"include": "#comma"
-						},
-						{
-							"include": "#scope_resolution_inner_generated"
-						},
-						{
-							"include": "#template_call_range"
-						},
-						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.type.cpp"
+							"include": "#scope_resolution_namespace_alias_inner_generated"
 						}
 					]
-				},
+				}
+			}
+		},
+		"scope_resolution_namespace_alias_inner_generated": {
+			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
+			"captures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
+							"include": "#scope_resolution_namespace_alias_inner_generated"
 						}
 					]
 				},
 				"2": {
+					"name": "entity.name.scope-resolution.namespace.alias.cpp"
+				},
+				"3": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#template_call_range"
 						}
 					]
 				},
-				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"4": {
-					"name": "comment.block.cpp"
-				},
-				"5": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
+				}
+			}
+		},
+		"scope_resolution_namespace_using": {
+			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
+			"captures": {
+				"0": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#scope_resolution_namespace_using_inner_generated"
 						}
 					]
-				},
-				"6": {
+				}
+			}
+		},
+		"scope_resolution_namespace_using_inner_generated": {
+			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
+			"captures": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#scope_resolution_namespace_using_inner_generated"
 						}
 					]
 				},
-				"7": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"8": {
-					"name": "comment.block.cpp"
+				"2": {
+					"name": "entity.name.scope-resolution.namespace.using.cpp"
 				},
-				"9": {
+				"3": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#template_call_range"
 						}
 					]
 				},
-				"11": {
+				"4": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
+				}
+			}
+		},
+		"scope_resolution_namespace_block": {
+			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
+			"captures": {
+				"0": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "#scope_resolution_namespace_block_inner_generated"
+						}
+					]
+				}
+			}
+		},
+		"scope_resolution_namespace_block_inner_generated": {
+			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_namespace_block_inner_generated"
 						}
 					]
 				},
-				"12": {
-					"name": "entity.name.scope-resolution.cpp"
+				"2": {
+					"name": "entity.name.scope-resolution.namespace.block.cpp"
 				},
-				"13": {
+				"3": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2014,46 +2390,91 @@
 						}
 					]
 				},
-				"14": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"15": {
+				"4": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
+				}
+			}
+		},
+		"scope_resolution_parameter": {
+			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
+			"captures": {
+				"0": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#scope_resolution_parameter_inner_generated"
+						}
+					]
+				}
+			}
+		},
+		"scope_resolution_parameter_inner_generated": {
+			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_parameter_inner_generated"
 						}
 					]
 				},
-				"16": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"17": {
-					"name": "comment.block.cpp"
+				"2": {
+					"name": "entity.name.scope-resolution.parameter.cpp"
 				},
-				"18": {
+				"3": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#template_call_range"
 						}
 					]
 				},
-				"19": {
-					"name": "entity.name.type.cpp"
+				"4": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
 				}
 			}
 		},
-		"type_alias": {
-			"match": "(using)\\s*(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))\\s*(\\=)\\s*((?:typename)?)\\s*((?:(?:(?<!\\w)(?:const|static|volatile|register|restrict|extern)(?!\\w))\\s+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))|(.*(?<!;)))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)(?:(\\[)(\\w*)(\\])\\s*)?\\s*(?:(;)|\\n)",
+		"scope_resolution_function_definition_operator_overload": {
+			"match": "(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_function_definition_operator_overload_inner_generated"
+						}
+					]
+				}
+			}
+		},
+		"scope_resolution_function_definition_operator_overload_inner_generated": {
+			"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::)",
 			"captures": {
 				"1": {
-					"name": "keyword.other.using.directive.cpp"
+					"patterns": [
+						{
+							"include": "#scope_resolution_function_definition_operator_overload_inner_generated"
+						}
+					]
 				},
 				"2": {
+					"name": "entity.name.scope-resolution.function.definition.operator-overload.cpp"
+				},
+				"3": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"4": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
+				}
+			}
+		},
+		"qualified_type": {
+			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])",
+			"captures": {
+				"0": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
@@ -2090,7 +2511,7 @@
 						}
 					]
 				},
-				"3": {
+				"1": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -2100,20 +2521,20 @@
 						}
 					]
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2125,20 +2546,20 @@
 						}
 					]
 				},
-				"8": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"9": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"10": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"11": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2150,17 +2571,17 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"14": {
+				"12": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"15": {
+				"13": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2168,23 +2589,23 @@
 						}
 					]
 				},
-				"16": {
+				"14": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"19": {
+				"17": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"18": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2196,23 +2617,15 @@
 						}
 					]
 				},
-				"21": {
+				"19": {
 					"name": "entity.name.type.cpp"
-				},
-				"22": {
-					"name": "keyword.operator.assignment.cpp"
-				},
-				"23": {
-					"name": "keyword.other.typename.cpp"
-				},
-				"24": {
-					"patterns": [
-						{
-							"include": "#storage_specifiers"
-						}
-					]
-				},
-				"25": {
+				}
+			}
+		},
+		"simple_type": {
+			"match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?",
+			"captures": {
+				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
@@ -2249,7 +2662,7 @@
 						}
 					]
 				},
-				"26": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -2259,20 +2672,20 @@
 						}
 					]
 				},
-				"27": {
+				"3": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"28": {
+				"4": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"29": {
+				"5": {
 					"name": "comment.block.cpp"
 				},
-				"30": {
+				"6": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2284,20 +2697,20 @@
 						}
 					]
 				},
-				"31": {
+				"7": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"8": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"10": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2309,17 +2722,17 @@
 						}
 					]
 				},
-				"36": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"37": {
+				"13": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"38": {
+				"14": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2327,23 +2740,23 @@
 						}
 					]
 				},
-				"39": {
+				"15": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"40": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"41": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"42": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"43": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2355,31 +2768,66 @@
 						}
 					]
 				},
-				"44": {
+				"20": {
 					"name": "entity.name.type.cpp"
 				},
-				"45": {
-					"name": "meta.declaration.type.alias.value.unknown.cpp",
+				"21": {
 					"patterns": [
 						{
-							"include": "#evaluation_context"
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				"47": {
+				"22": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"48": {
+				"23": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"49": {
+				"24": {
 					"name": "comment.block.cpp"
 				},
-				"50": {
+				"25": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2391,23 +2839,20 @@
 						}
 					]
 				},
-				"51": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"52": {
+				"26": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"53": {
+				"27": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"54": {
+				"28": {
 					"name": "comment.block.cpp"
 				},
-				"55": {
+				"29": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2418,24 +2863,76 @@
 							"name": "comment.block.cpp"
 						}
 					]
+				}
+			}
+		},
+		"type_alias": {
+			"match": "(using)\\s*(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))\\s*(\\=)\\s*((?:typename)?)\\s*((?:(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?<!\\w)(?:const|static|volatile|register|restrict|extern)(?!\\w))\\s+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(\\[)(\\w*)(\\])\\s*)?\\s*(?:(;)|\\n)",
+			"captures": {
+				"1": {
+					"name": "keyword.other.using.directive.cpp"
 				},
-				"56": {
-					"name": "storage.modifier.reference.cpp"
+				"2": {
+					"name": "meta.qualified_type.cpp",
+					"patterns": [
+						{
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
+						}
+					]
 				},
-				"57": {
+				"3": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
+				"4": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"58": {
+				"5": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"59": {
+				"6": {
 					"name": "comment.block.cpp"
 				},
-				"60": {
+				"7": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2447,20 +2944,20 @@
 						}
 					]
 				},
-				"61": {
+				"8": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"62": {
+				"9": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"63": {
+				"10": {
 					"name": "comment.block.cpp"
 				},
-				"64": {
+				"11": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2472,45 +2969,41 @@
 						}
 					]
 				},
-				"65": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
-				},
-				"66": {
+				"13": {
 					"patterns": [
 						{
-							"include": "#evaluation_context"
+							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"67": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
+				"14": {
+					"name": "entity.name.scope-resolution.cpp"
 				},
-				"68": {
-					"name": "punctuation.terminator.statement.cpp"
-				}
-			},
-			"name": "meta.declaration.type.alias.cpp"
-		},
-		"typename": {
-			"match": "((?<!\\w)typename(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))",
-			"captures": {
-				"1": {
-					"name": "storage.modifier.cpp"
+				"15": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
 				},
-				"2": {
+				"16": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"19": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"20": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2522,7 +3015,23 @@
 						}
 					]
 				},
-				"6": {
+				"21": {
+					"name": "entity.name.type.cpp"
+				},
+				"22": {
+					"name": "keyword.operator.assignment.cpp"
+				},
+				"23": {
+					"name": "keyword.other.typename.cpp"
+				},
+				"24": {
+					"patterns": [
+						{
+							"include": "#storage_specifiers"
+						}
+					]
+				},
+				"25": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
@@ -2559,7 +3068,7 @@
 						}
 					]
 				},
-				"7": {
+				"26": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -2569,20 +3078,20 @@
 						}
 					]
 				},
-				"8": {
+				"27": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"9": {
+				"28": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"10": {
+				"29": {
 					"name": "comment.block.cpp"
 				},
-				"11": {
+				"30": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2594,20 +3103,20 @@
 						}
 					]
 				},
-				"12": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"13": {
+				"32": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"14": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"15": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2619,17 +3128,17 @@
 						}
 					]
 				},
-				"17": {
+				"36": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"18": {
+				"37": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"19": {
+				"38": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2637,23 +3146,23 @@
 						}
 					]
 				},
-				"20": {
+				"39": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"21": {
+				"40": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"22": {
+				"41": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"23": {
+				"42": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"43": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2665,299 +3174,646 @@
 						}
 					]
 				},
-				"25": {
+				"44": {
 					"name": "entity.name.type.cpp"
-				}
-			}
-		},
-		"predefined_macros": {
-			"patterns": [
-				{
-					"match": "\\b__cplusplus\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__cplusplus.cpp"
-				},
-				{
-					"match": "\\b__DATE__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__DATE__.cpp"
-				},
-				{
-					"match": "\\b__FILE__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__FILE__.cpp"
-				},
-				{
-					"match": "\\b__LINE__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__LINE__.cpp"
-				},
-				{
-					"match": "\\b__STDC__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__STDC__.cpp"
-				},
-				{
-					"match": "\\b__STDC_HOSTED__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__STDC_HOSTED__.cpp"
 				},
-				{
-					"match": "\\b__STDC_NO_COMPLEX__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__STDC_NO_COMPLEX__.cpp"
+				"45": {
+					"name": "meta.declaration.type.alias.value.unknown.cpp",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
-				{
-					"match": "\\b__STDC_VERSION__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__STDC_VERSION__.cpp"
-				},
-				{
-					"match": "\\b__STDCPP_THREADS__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__STDCPP_THREADS__.cpp"
-				},
-				{
-					"match": "\\b__TIME__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__TIME__.cpp"
-				},
-				{
-					"match": "\\bNDEBUG\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.NDEBUG.cpp"
-				},
-				{
-					"match": "\\b__OBJC__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__OBJC__.cpp"
+				"46": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b__ASSEMBLER__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__ASSEMBLER__.cpp"
+				"47": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b__ATOM__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__ATOM__.cpp"
+				"48": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b__AVX__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__AVX__.cpp"
+				"49": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b__AVX2__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__AVX2__.cpp"
+				"50": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_CHAR_UNSIGNED\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._CHAR_UNSIGNED.cpp"
+				"51": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b__CLR_VER\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__CLR_VER.cpp"
+				"52": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b_CONTROL_FLOW_GUARD\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._CONTROL_FLOW_GUARD.cpp"
+				"53": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b__COUNTER__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__COUNTER__.cpp"
+				"54": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b__cplusplus_cli\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__cplusplus_cli.cpp"
+				"55": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b__cplusplus_winrt\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__cplusplus_winrt.cpp"
+				"56": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b_CPPRTTI\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._CPPRTTI.cpp"
+				"57": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b_CPPUNWIND\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._CPPUNWIND.cpp"
+				"58": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_DEBUG\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._DEBUG.cpp"
+				"59": {
+					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				{
-					"match": "\\b_DLL\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._DLL.cpp"
+				"60": {
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
-				{
-					"match": "\\b__FUNCDNAME__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__FUNCDNAME__.cpp"
+				"61": {
+					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				{
-					"match": "\\b__FUNCSIG__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__FUNCSIG__.cpp"
+				"62": {
+					"name": "punctuation.terminator.statement.cpp"
+				}
+			},
+			"name": "meta.declaration.type.alias.cpp"
+		},
+		"typename": {
+			"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?<!\\w)typename(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))",
+			"captures": {
+				"1": {
+					"name": "storage.modifier.cpp"
 				},
-				{
-					"match": "\\b__FUNCTION__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__FUNCTION__.cpp"
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b_INTEGRAL_MAX_BITS\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._INTEGRAL_MAX_BITS.cpp"
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b__INTELLISENSE__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__INTELLISENSE__.cpp"
+				"4": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b_ISO_VOLATILE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._ISO_VOLATILE.cpp"
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_KERNEL_MODE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._KERNEL_MODE.cpp"
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_AMD64\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_AMD64.cpp"
+				"7": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b_M_ARM\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM.cpp"
+				"8": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b_M_ARM_ARMV7VE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM_ARMV7VE.cpp"
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_ARM_FP\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM_FP.cpp"
+				"10": {
+					"name": "meta.qualified_type.cpp",
+					"patterns": [
+						{
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_ARM64\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM64.cpp"
+				"11": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_CEE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_CEE.cpp"
+				"12": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_CEE_PURE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_CEE_PURE.cpp"
+				"13": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b_M_CEE_SAFE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_CEE_SAFE.cpp"
+				"14": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b_M_FP_EXCEPT\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_EXCEPT.cpp"
+				"15": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_FP_FAST\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_FAST.cpp"
+				"16": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_FP_PRECISE\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_PRECISE.cpp"
+				"17": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b_M_FP_STRICT\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_STRICT.cpp"
+				"18": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"match": "\\b_M_IX86\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_IX86.cpp"
+				"19": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_IX86_FP\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_IX86_FP.cpp"
+				"21": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
 				},
-				{
-					"match": "\\b_M_X64\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._M_X64.cpp"
+				"22": {
+					"name": "entity.name.scope-resolution.cpp"
 				},
-				{
-					"match": "\\b_MANAGED\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MANAGED.cpp"
+				"23": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
 				},
-				{
-					"match": "\\b_MSC_BUILD\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MSC_BUILD.cpp"
+				"24": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				{
-					"match": "\\b_MSC_EXTENSIONS\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MSC_EXTENSIONS.cpp"
+				"25": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"match": "\\b_MSC_FULL_VER\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MSC_FULL_VER.cpp"
+				"26": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "\\b_MSC_VER\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MSC_VER.cpp"
+				"27": {
+					"name": "comment.block.cpp"
+				},
+				"28": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
+				"29": {
+					"name": "entity.name.type.cpp"
+				}
+			}
+		},
+		"predefined_macros": {
+			"patterns": [
 				{
-					"match": "\\b_MSVC_LANG\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MSVC_LANG.cpp"
+					"match": "\\b__cplusplus\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__cplusplus.cpp"
 				},
 				{
-					"match": "\\b__MSVC_RUNTIME_CHECKS\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__MSVC_RUNTIME_CHECKS.cpp"
+					"match": "\\b__DATE__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__DATE__.cpp"
 				},
 				{
-					"match": "\\b_MT\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MT.cpp"
+					"match": "\\b__FILE__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__FILE__.cpp"
 				},
 				{
-					"match": "\\b_NATIVE_WCHAR_T_DEFINED\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._NATIVE_WCHAR_T_DEFINED.cpp"
+					"match": "\\b__LINE__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__LINE__.cpp"
 				},
 				{
-					"match": "\\b_OPENMP\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._OPENMP.cpp"
+					"match": "\\b__STDC__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__STDC__.cpp"
 				},
 				{
-					"match": "\\b_PREFAST\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._PREFAST.cpp"
+					"match": "\\b__STDC_HOSTED__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__STDC_HOSTED__.cpp"
 				},
 				{
-					"match": "\\b__TIMESTAMP__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__TIMESTAMP__.cpp"
+					"match": "\\b__STDC_NO_COMPLEX__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__STDC_NO_COMPLEX__.cpp"
 				},
 				{
-					"match": "\\b_VC_NO_DEFAULTLIB\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._VC_NO_DEFAULTLIB.cpp"
+					"match": "\\b__STDC_VERSION__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__STDC_VERSION__.cpp"
 				},
 				{
-					"match": "\\b_WCHAR_T_DEFINED\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._WCHAR_T_DEFINED.cpp"
+					"match": "\\b__STDCPP_THREADS__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__STDCPP_THREADS__.cpp"
 				},
 				{
-					"match": "\\b_WIN32\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._WIN32.cpp"
+					"match": "\\b__TIME__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__TIME__.cpp"
 				},
 				{
-					"match": "\\b_WIN64\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._WIN64.cpp"
+					"match": "\\bNDEBUG\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.NDEBUG.cpp"
 				},
 				{
-					"match": "\\b_WINRT_DLL\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._WINRT_DLL.cpp"
+					"match": "\\b__OBJC__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__OBJC__.cpp"
 				},
 				{
-					"match": "\\b_ATL_VER\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._ATL_VER.cpp"
+					"match": "\\b__ASSEMBLER__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__ASSEMBLER__.cpp"
 				},
 				{
-					"match": "\\b_MFC_VER\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined._MFC_VER.cpp"
+					"match": "\\b__ATOM__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__ATOM__.cpp"
 				},
 				{
-					"match": "\\b__GFORTRAN__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__GFORTRAN__.cpp"
+					"match": "\\b__AVX__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__AVX__.cpp"
 				},
 				{
-					"match": "\\b__GNUC__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__GNUC__.cpp"
+					"match": "\\b__AVX2__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__AVX2__.cpp"
 				},
 				{
-					"match": "\\b__GNUC_MINOR__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__GNUC_MINOR__.cpp"
+					"match": "\\b_CHAR_UNSIGNED\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._CHAR_UNSIGNED.cpp"
 				},
 				{
-					"match": "\\b__GNUC_PATCHLEVEL__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.__GNUC_PATCHLEVEL__.cpp"
+					"match": "\\b__CLR_VER\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__CLR_VER.cpp"
 				},
 				{
-					"match": "\\b__GNUG__\\b",
+					"match": "\\b_CONTROL_FLOW_GUARD\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._CONTROL_FLOW_GUARD.cpp"
+				},
+				{
+					"match": "\\b__COUNTER__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__COUNTER__.cpp"
+				},
+				{
+					"match": "\\b__cplusplus_cli\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__cplusplus_cli.cpp"
+				},
+				{
+					"match": "\\b__cplusplus_winrt\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__cplusplus_winrt.cpp"
+				},
+				{
+					"match": "\\b_CPPRTTI\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._CPPRTTI.cpp"
+				},
+				{
+					"match": "\\b_CPPUNWIND\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._CPPUNWIND.cpp"
+				},
+				{
+					"match": "\\b_DEBUG\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._DEBUG.cpp"
+				},
+				{
+					"match": "\\b_DLL\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._DLL.cpp"
+				},
+				{
+					"match": "\\b__FUNCDNAME__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__FUNCDNAME__.cpp"
+				},
+				{
+					"match": "\\b__FUNCSIG__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__FUNCSIG__.cpp"
+				},
+				{
+					"match": "\\b__FUNCTION__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__FUNCTION__.cpp"
+				},
+				{
+					"match": "\\b_INTEGRAL_MAX_BITS\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._INTEGRAL_MAX_BITS.cpp"
+				},
+				{
+					"match": "\\b__INTELLISENSE__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__INTELLISENSE__.cpp"
+				},
+				{
+					"match": "\\b_ISO_VOLATILE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._ISO_VOLATILE.cpp"
+				},
+				{
+					"match": "\\b_KERNEL_MODE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._KERNEL_MODE.cpp"
+				},
+				{
+					"match": "\\b_M_AMD64\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_AMD64.cpp"
+				},
+				{
+					"match": "\\b_M_ARM\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM.cpp"
+				},
+				{
+					"match": "\\b_M_ARM_ARMV7VE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM_ARMV7VE.cpp"
+				},
+				{
+					"match": "\\b_M_ARM_FP\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM_FP.cpp"
+				},
+				{
+					"match": "\\b_M_ARM64\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_ARM64.cpp"
+				},
+				{
+					"match": "\\b_M_CEE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_CEE.cpp"
+				},
+				{
+					"match": "\\b_M_CEE_PURE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_CEE_PURE.cpp"
+				},
+				{
+					"match": "\\b_M_CEE_SAFE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_CEE_SAFE.cpp"
+				},
+				{
+					"match": "\\b_M_FP_EXCEPT\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_EXCEPT.cpp"
+				},
+				{
+					"match": "\\b_M_FP_FAST\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_FAST.cpp"
+				},
+				{
+					"match": "\\b_M_FP_PRECISE\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_PRECISE.cpp"
+				},
+				{
+					"match": "\\b_M_FP_STRICT\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_FP_STRICT.cpp"
+				},
+				{
+					"match": "\\b_M_IX86\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_IX86.cpp"
+				},
+				{
+					"match": "\\b_M_IX86_FP\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_IX86_FP.cpp"
+				},
+				{
+					"match": "\\b_M_X64\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._M_X64.cpp"
+				},
+				{
+					"match": "\\b_MANAGED\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MANAGED.cpp"
+				},
+				{
+					"match": "\\b_MSC_BUILD\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MSC_BUILD.cpp"
+				},
+				{
+					"match": "\\b_MSC_EXTENSIONS\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MSC_EXTENSIONS.cpp"
+				},
+				{
+					"match": "\\b_MSC_FULL_VER\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MSC_FULL_VER.cpp"
+				},
+				{
+					"match": "\\b_MSC_VER\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MSC_VER.cpp"
+				},
+				{
+					"match": "\\b_MSVC_LANG\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MSVC_LANG.cpp"
+				},
+				{
+					"match": "\\b__MSVC_RUNTIME_CHECKS\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__MSVC_RUNTIME_CHECKS.cpp"
+				},
+				{
+					"match": "\\b_MT\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MT.cpp"
+				},
+				{
+					"match": "\\b_NATIVE_WCHAR_T_DEFINED\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._NATIVE_WCHAR_T_DEFINED.cpp"
+				},
+				{
+					"match": "\\b_OPENMP\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._OPENMP.cpp"
+				},
+				{
+					"match": "\\b_PREFAST\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._PREFAST.cpp"
+				},
+				{
+					"match": "\\b__TIMESTAMP__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__TIMESTAMP__.cpp"
+				},
+				{
+					"match": "\\b_VC_NO_DEFAULTLIB\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._VC_NO_DEFAULTLIB.cpp"
+				},
+				{
+					"match": "\\b_WCHAR_T_DEFINED\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._WCHAR_T_DEFINED.cpp"
+				},
+				{
+					"match": "\\b_WIN32\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._WIN32.cpp"
+				},
+				{
+					"match": "\\b_WIN64\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._WIN64.cpp"
+				},
+				{
+					"match": "\\b_WINRT_DLL\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._WINRT_DLL.cpp"
+				},
+				{
+					"match": "\\b_ATL_VER\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._ATL_VER.cpp"
+				},
+				{
+					"match": "\\b_MFC_VER\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined._MFC_VER.cpp"
+				},
+				{
+					"match": "\\b__GFORTRAN__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__GFORTRAN__.cpp"
+				},
+				{
+					"match": "\\b__GNUC__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__GNUC__.cpp"
+				},
+				{
+					"match": "\\b__GNUC_MINOR__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__GNUC_MINOR__.cpp"
+				},
+				{
+					"match": "\\b__GNUC_PATCHLEVEL__\\b",
+					"name": "entity.name.other.preprocessor.macro.predefined.__GNUC_PATCHLEVEL__.cpp"
+				},
+				{
+					"match": "\\b__GNUG__\\b",
 					"name": "entity.name.other.preprocessor.macro.predefined.__GNUG__.cpp"
 				},
 				{
@@ -3692,72 +4548,53 @@
 		},
 		"function_definition": {
 			"name": "meta.function.definition.cpp",
-			"begin": "(\\s*+(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wnot|^not|\\Wcompl|^compl|\\Wsizeof|^sizeof|\\Wnew|^new|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wxor|^xor|\\Wbitor|^bitor|\\Wand|^and|\\Wor|^or|\\Wthrow|^throw|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wor_eq|^or_eq|\\Walignof|^alignof|\\Walignas|^alignas|\\Wtypeid|^typeid|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wstatic_cast|^static_cast|\\Wdynamic_cast|^dynamic_cast|\\Wconst_cast|^const_cast|\\Wreinterpret_cast|^reinterpret_cast|\\Wwhile|^while|\\Wfor|^for|\\Wdo|^do|\\Wif|^if|\\Welse|^else|\\Wgoto|^goto|\\Wswitch|^switch|\\Wtry|^try|\\Wcatch|^catch|\\Wreturn|^return|\\Wbreak|^break|\\Wcase|^case|\\Wcontinue|^continue|\\Wdefault|^default|\\Wauto|^auto|\\Wvoid|^void|\\Wchar|^char|\\Wshort|^short|\\Wint|^int|\\Wsigned|^signed|\\Wunsigned|^unsigned|\\Wlong|^long|\\Wfloat|^float|\\Wdouble|^double|\\Wbool|^bool|\\Wwchar_t|^wchar_t|\\Wu_char|^u_char|\\Wu_short|^u_short|\\Wu_int|^u_int|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wuint|^uint|\\Wu_quad_t|^u_quad_t|\\Wquad_t|^quad_t|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wfixpt_t|^fixpt_t|\\Wblkcnt_t|^blkcnt_t|\\Wblksize_t|^blksize_t|\\Wgid_t|^gid_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wmode_t|^mode_t|\\Wnlink_t|^nlink_t|\\Wid_t|^id_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wuid_t|^uid_t|\\Wid_t|^id_t|\\Wclock_t|^clock_t|\\Wsize_t|^size_t|\\Wssize_t|^ssize_t|\\Wtime_t|^time_t|\\Wuseconds_t|^useconds_t|\\Wsuseconds_t|^suseconds_t|\\Wint8_t|^int8_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wint_least8_t|^int_least8_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_least8_t|^uint_least8_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wint_fast8_t|^int_fast8_t|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wintptr_t|^intptr_t|\\Wuintptr_t|^uintptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wfalse|^false|\\Wnullptr|^nullptr|\\Wclass|^class|\\Wstruct|^struct|\\Wunion|^union|\\Wenum|^enum|\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern|\\Winline|^inline|\\Wconstexpr|^constexpr|\\Wmutable|^mutable|\\Wfriend|^friend|\\Wexplicit|^explicit|\\Wvirtual|^virtual|\\Wvolatile|^volatile|\\Wconst|^const|\\Wnoexcept|^noexcept|\\Wconstexpr|^constexpr|\\Wmutable|^mutable|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprivate|^private|\\Wprotected|^protected|\\Wpublic|^public|\\Wthis|^this|\\Wtemplate|^template|\\Wnamespace|^namespace|\\Wusing|^using|\\Woperator|^operator|\\Wtypedef|^typedef|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wasm|^asm|\\W__asm__|^__asm__|\\Wconcept|^concept|\\Wrequires|^requires|\\Wexport|^export|\\Wthread_local|^thread_local|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Watomic_noexcept|^atomic_noexcept|\\Wco_await|^co_await|\\Wco_return|^co_return|\\Wco_yield|^co_yield|\\Wimport|^import|\\Wmodule|^module|\\Wreflexpr|^reflexpr|\\Wsynchronized|^synchronized)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\())",
+			"begin": "((?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?<!\\w)template(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:((?<!\\w)(?:(?:inline|constexpr|mutable|friend|explicit|virtual)|(?:const|static|volatile|register|restrict|extern))(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wnot|^not|\\Wcompl|^compl|\\Wsizeof|^sizeof|\\Wnew|^new|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wxor|^xor|\\Wbitor|^bitor|\\Wand|^and|\\Wor|^or|\\Wthrow|^throw|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wor_eq|^or_eq|\\Walignof|^alignof|\\Walignas|^alignas|\\Wtypeid|^typeid|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wstatic_cast|^static_cast|\\Wdynamic_cast|^dynamic_cast|\\Wconst_cast|^const_cast|\\Wreinterpret_cast|^reinterpret_cast|\\Wwhile|^while|\\Wfor|^for|\\Wdo|^do|\\Wif|^if|\\Welse|^else|\\Wgoto|^goto|\\Wswitch|^switch|\\Wtry|^try|\\Wcatch|^catch|\\Wreturn|^return|\\Wbreak|^break|\\Wcase|^case|\\Wcontinue|^continue|\\Wdefault|^default|\\Wauto|^auto|\\Wvoid|^void|\\Wchar|^char|\\Wshort|^short|\\Wint|^int|\\Wsigned|^signed|\\Wunsigned|^unsigned|\\Wlong|^long|\\Wfloat|^float|\\Wdouble|^double|\\Wbool|^bool|\\Wwchar_t|^wchar_t|\\Wu_char|^u_char|\\Wu_short|^u_short|\\Wu_int|^u_int|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wuint|^uint|\\Wu_quad_t|^u_quad_t|\\Wquad_t|^quad_t|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wfixpt_t|^fixpt_t|\\Wblkcnt_t|^blkcnt_t|\\Wblksize_t|^blksize_t|\\Wgid_t|^gid_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wmode_t|^mode_t|\\Wnlink_t|^nlink_t|\\Wid_t|^id_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wuid_t|^uid_t|\\Wid_t|^id_t|\\Wclock_t|^clock_t|\\Wsize_t|^size_t|\\Wssize_t|^ssize_t|\\Wtime_t|^time_t|\\Wuseconds_t|^useconds_t|\\Wsuseconds_t|^suseconds_t|\\Wint8_t|^int8_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wint_least8_t|^int_least8_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_least8_t|^uint_least8_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wint_fast8_t|^int_fast8_t|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wintptr_t|^intptr_t|\\Wuintptr_t|^uintptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wfalse|^false|\\Wnullptr|^nullptr|\\Wclass|^class|\\Wstruct|^struct|\\Wunion|^union|\\Wenum|^enum|\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern|\\Winline|^inline|\\Wconstexpr|^constexpr|\\Wmutable|^mutable|\\Wfriend|^friend|\\Wexplicit|^explicit|\\Wvirtual|^virtual|\\Wvolatile|^volatile|\\Wconst|^const|\\Wnoexcept|^noexcept|\\Wconstexpr|^constexpr|\\Wmutable|^mutable|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprivate|^private|\\Wprotected|^protected|\\Wpublic|^public|\\Wthis|^this|\\Wtemplate|^template|\\Wnamespace|^namespace|\\Wusing|^using|\\Woperator|^operator|\\Wtypedef|^typedef|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wasm|^asm|\\W__asm__|^__asm__|\\Wconcept|^concept|\\Wrequires|^requires|\\Wexport|^export|\\Wthread_local|^thread_local|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Watomic_noexcept|^atomic_noexcept|\\Wco_await|^co_await|\\Wco_return|^co_return|\\Wco_yield|^co_yield|\\Wimport|^import|\\Wmodule|^module|\\Wreflexpr|^reflexpr|\\Wsynchronized|^synchronized)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\())",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.head.function.definition.cpp"
 				},
 				"2": {
-					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?:class|struct|union|enum)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context_c"
-						},
-						{
-							"include": "#comma"
-						},
-						{
-							"include": "#scope_resolution_inner_generated"
-						},
-						{
-							"include": "#template_call_range"
-						},
-						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.type.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
 					"patterns": [
 						{
-							"include": "#attributes_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#number_literal"
-						}
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
 					]
 				},
-				"4": {
+				"6": {
+					"name": "storage.type.template.cpp"
+				},
+				"7": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"8": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
-				"7": {
+				"10": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3769,20 +4606,23 @@
 						}
 					]
 				},
-				"8": {
+				"11": {
+					"name": "storage.modifier.$11.cpp"
+				},
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"9": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"10": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"11": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3794,17 +4634,114 @@
 						}
 					]
 				},
-				"13": {
+				"16": {
+					"name": "meta.qualified_type.cpp",
 					"patterns": [
+						{
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
 						{
 							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
 						}
 					]
 				},
-				"14": {
+				"17": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"19": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"20": {
+					"name": "comment.block.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"27": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
+				},
+				"28": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"15": {
+				"29": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -3812,23 +4749,23 @@
 						}
 					]
 				},
-				"16": {
+				"30": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"17": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"18": {
+				"32": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"19": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3840,23 +4777,66 @@
 						}
 					]
 				},
-				"21": {
+				"35": {
 					"name": "entity.name.type.cpp"
 				},
-				"23": {
+				"36": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
+				"37": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"24": {
+				"38": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"25": {
+				"39": {
 					"name": "comment.block.cpp"
 				},
-				"26": {
+				"40": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3868,23 +4848,20 @@
 						}
 					]
 				},
-				"27": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"28": {
+				"41": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"29": {
+				"42": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"30": {
+				"43": {
 					"name": "comment.block.cpp"
 				},
-				"31": {
+				"44": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3896,23 +4873,20 @@
 						}
 					]
 				},
-				"32": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"33": {
+				"45": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"34": {
+				"46": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"47": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"48": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3924,20 +4898,20 @@
 						}
 					]
 				},
-				"37": {
+				"49": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"38": {
+				"50": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"39": {
+				"51": {
 					"name": "comment.block.cpp"
 				},
-				"40": {
+				"52": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3949,23 +4923,23 @@
 						}
 					]
 				},
-				"41": {
+				"53": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"42": {
+				"54": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"43": {
+				"55": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"44": {
+				"56": {
 					"name": "comment.block.cpp"
 				},
-				"45": {
+				"57": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3977,30 +4951,30 @@
 						}
 					]
 				},
-				"46": {
+				"58": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_function_definition_inner_generated"
 						}
 					]
 				},
-				"47": {
+				"59": {
 					"name": "entity.name.function.definition.cpp"
 				},
-				"48": {
+				"60": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"49": {
+				"61": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"50": {
+				"62": {
 					"name": "comment.block.cpp"
 				},
-				"51": {
+				"63": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4047,94 +5021,7 @@
 									"include": "#ever_present_context"
 								},
 								{
-									"include": "#memory_operators"
-								},
-								{
-									"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))|((?<!\\w)(?: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|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)(?!\\w)))|((?<!\\w)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(?!\\w)))|((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
-									"beginCaptures": {
-										"1": {
-											"patterns": [
-												{
-													"include": "#inline_comment"
-												}
-											]
-										},
-										"2": {
-											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-										},
-										"3": {
-											"name": "comment.block.cpp"
-										},
-										"4": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
-										},
-										"5": {
-											"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
-										},
-										"6": {
-											"name": "storage.type.cpp storage.type.built-in.cpp"
-										},
-										"7": {
-											"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
-										},
-										"8": {
-											"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
-										},
-										"9": {
-											"patterns": [
-												{
-													"include": "#inline_comment"
-												}
-											]
-										},
-										"10": {
-											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-										},
-										"11": {
-											"name": "comment.block.cpp"
-										},
-										"12": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
-										},
-										"13": {
-											"name": "punctuation.section.arguments.begin.bracket.round.initializer.cpp"
-										}
-									},
-									"end": "(\\))",
-									"endCaptures": {
-										"1": {
-											"name": "punctuation.section.arguments.end.bracket.round.initializer.cpp"
-										}
-									},
-									"patterns": [
-										{
-											"include": "#evaluation_context"
-										}
-									]
-								},
-								{
-									"include": "#curly_initializer"
-								},
-								{
-									"include": "#parameter_or_maybe_value"
+									"include": "#parameter_or_maybe_value"
 								},
 								{
 									"include": "#comma"
@@ -4145,7 +5032,7 @@
 							]
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -4170,17 +5057,20 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"curly_initializer": {
-			"name": "meta.initialization.cpp",
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\{)",
+		"operator_overload": {
+			"name": "meta.function.definition.special.operator-overload.cpp",
+			"begin": "((?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(operator)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(?:(?:((?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|new|new\\[\\]|delete|delete\\[\\]|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\<|\\())",
 			"beginCaptures": {
 				"1": {
+					"name": "meta.head.function.definition.special.operator-overload.cpp"
+				},
+				"2": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
@@ -4217,7 +5107,7 @@
 						}
 					]
 				},
-				"2": {
+				"3": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -4227,20 +5117,20 @@
 						}
 					]
 				},
-				"3": {
+				"4": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"4": {
+				"5": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"5": {
+				"6": {
 					"name": "comment.block.cpp"
 				},
-				"6": {
+				"7": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4252,20 +5142,20 @@
 						}
 					]
 				},
-				"7": {
+				"8": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"9": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"10": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"11": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4277,17 +5167,17 @@
 						}
 					]
 				},
-				"12": {
+				"13": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"13": {
+				"14": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"14": {
+				"15": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4295,23 +5185,23 @@
 						}
 					]
 				},
-				"15": {
+				"16": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"16": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"17": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"18": {
+				"19": {
 					"name": "comment.block.cpp"
 				},
-				"19": {
+				"20": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4323,23 +5213,66 @@
 						}
 					]
 				},
-				"20": {
+				"21": {
 					"name": "entity.name.type.cpp"
 				},
-				"21": {
+				"22": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
+				"23": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"22": {
+				"24": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"23": {
+				"25": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4351,93 +5284,45 @@
 						}
 					]
 				},
-				"25": {
-					"name": "punctuation.section.arguments.begin.bracket.curly.initializer.cpp"
-				}
-			},
-			"end": "(\\})",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.curly.initializer.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
-				},
-				{
-					"include": "#comma"
-				}
-			]
-		},
-		"operator_overload": {
-			"name": "meta.function.definition.special.operator-overload.cpp",
-			"begin": "((?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?))?\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(operator)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(?:(?:((?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|new|new\\[\\]|delete|delete\\[\\]|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\<|\\())",
-			"beginCaptures": {
-				"1": {
-					"name": "meta.head.function.definition.special.operator-overload.cpp"
-				},
-				"2": {
-					"name": "meta.qualified_type.cpp",
+				"27": {
 					"patterns": [
 						{
-							"match": "(?:class|struct|union|enum)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context_c"
-						},
-						{
-							"include": "#comma"
-						},
-						{
-							"include": "#scope_resolution_inner_generated"
-						},
-						{
-							"include": "#template_call_range"
-						},
-						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.type.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"28": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"29": {
+					"name": "comment.block.cpp"
+				},
+				"30": {
 					"patterns": [
 						{
-							"include": "#attributes_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#number_literal"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"4": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"32": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"7": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4449,20 +5334,20 @@
 						}
 					]
 				},
-				"8": {
+				"35": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"9": {
+				"36": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"10": {
+				"37": {
 					"name": "comment.block.cpp"
 				},
-				"11": {
+				"38": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4474,41 +5359,23 @@
 						}
 					]
 				},
-				"13": {
+				"39": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"40": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				"14": {
-					"name": "entity.name.scope-resolution.cpp"
+				"41": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"15": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"16": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"17": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"18": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"19": {
+				"42": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"43": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4520,23 +5387,20 @@
 						}
 					]
 				},
-				"21": {
-					"name": "entity.name.type.cpp"
-				},
-				"23": {
+				"44": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"24": {
+				"45": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"25": {
+				"46": {
 					"name": "comment.block.cpp"
 				},
-				"26": {
+				"47": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4548,51 +5412,38 @@
 						}
 					]
 				},
-				"27": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"28": {
+				"48": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"29": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"30": {
-					"name": "comment.block.cpp"
-				},
-				"31": {
-					"patterns": [
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator.cpp"
+						},
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.operator.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#template_call_range"
 						}
 					]
 				},
-				"32": {
-					"name": "storage.modifier.reference.cpp"
+				"49": {
+					"name": "keyword.other.operator.overload.cpp"
 				},
-				"33": {
+				"50": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"34": {
+				"51": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"52": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"53": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4604,48 +5455,84 @@
 						}
 					]
 				},
-				"37": {
+				"54": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator-overload.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.operator-overload.cpp"
+						},
+						{
+							"include": "#template_call_range"
 						}
 					]
 				},
-				"38": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				"55": {
+					"name": "entity.name.operator.cpp"
 				},
-				"39": {
-					"name": "comment.block.cpp"
+				"56": {
+					"name": "entity.name.operator.type.cpp"
 				},
-				"40": {
+				"57": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "\\*",
+							"name": "entity.name.operator.type.pointer.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "entity.name.operator.type.reference.cpp"
 						}
 					]
 				},
-				"41": {
-					"name": "storage.type.modifier.calling-convention.cpp"
-				},
-				"42": {
+				"58": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"43": {
+				"59": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"44": {
+				"60": {
 					"name": "comment.block.cpp"
 				},
-				"45": {
+				"61": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4657,20 +5544,20 @@
 						}
 					]
 				},
-				"46": {
+				"62": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"47": {
+				"63": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"48": {
+				"64": {
 					"name": "comment.block.cpp"
 				},
-				"49": {
+				"65": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4682,38 +5569,20 @@
 						}
 					]
 				},
-				"50": {
-					"patterns": [
-						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator.cpp"
-						},
-						{
-							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-							"name": "entity.name.scope-resolution.operator.cpp"
-						},
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"51": {
-					"name": "keyword.other.operator.overload.cpp"
-				},
-				"52": {
+				"66": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"53": {
+				"67": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"54": {
+				"68": {
 					"name": "comment.block.cpp"
 				},
-				"55": {
+				"69": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4725,41 +5594,26 @@
 						}
 					]
 				},
-				"56": {
-					"patterns": [
-						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator-overload.cpp"
-						},
-						{
-							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-							"name": "entity.name.scope-resolution.operator-overload.cpp"
-						},
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"57": {
-					"name": "entity.name.operator.cpp"
+				"70": {
+					"name": "entity.name.operator.type.array.cpp"
 				},
-				"58": {
-					"name": "entity.name.operator.type.cpp"
+				"71": {
+					"name": "entity.name.operator.custom-literal.cpp"
 				},
-				"60": {
+				"72": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"61": {
+				"73": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"62": {
+				"74": {
 					"name": "comment.block.cpp"
 				},
-				"63": {
+				"75": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4771,23 +5625,23 @@
 						}
 					]
 				},
-				"64": {
-					"name": "entity.name.operator.type.pointer.cpp"
+				"76": {
+					"name": "entity.name.operator.custom-literal.cpp"
 				},
-				"65": {
+				"77": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"66": {
+				"78": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"67": {
+				"79": {
 					"name": "comment.block.cpp"
 				},
-				"68": {
+				"80": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4798,163 +5652,26 @@
 							"name": "comment.block.cpp"
 						}
 					]
-				},
-				"69": {
-					"name": "entity.name.operator.type.reference.cpp"
-				},
-				"70": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"patterns": [
+				{
+					"name": "meta.head.function.definition.special.operator-overload.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.operator-overload.cpp"
 						}
-					]
-				},
-				"71": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"72": {
-					"name": "comment.block.cpp"
-				},
-				"73": {
+					},
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"include": "#ever_present_context"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"74": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"75": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"76": {
-					"name": "comment.block.cpp"
-				},
-				"77": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"78": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"79": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"80": {
-					"name": "comment.block.cpp"
-				},
-				"81": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"82": {
-					"name": "entity.name.operator.type.array.cpp"
-				},
-				"83": {
-					"name": "entity.name.operator.custom-literal.cpp"
-				},
-				"84": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"85": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"86": {
-					"name": "comment.block.cpp"
-				},
-				"87": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"88": {
-					"name": "entity.name.operator.custom-literal.cpp"
-				},
-				"89": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"90": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"91": {
-					"name": "comment.block.cpp"
-				},
-				"92": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
-			"patterns": [
-				{
-					"name": "meta.head.function.definition.special.operator-overload.cpp",
-					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.operator-overload.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#ever_present_context"
-						},
-						{
-							"include": "#template_call_range"
-						},
+							"include": "#template_call_range"
+						},
 						{
 							"contentName": "meta.function.definition.parameters.special.operator-overload.cpp",
 							"begin": "(\\()",
@@ -4979,7 +5696,7 @@
 							]
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -5004,7 +5721,7 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
@@ -5082,7 +5799,7 @@
 					"begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
 					"beginCaptures": {
 						"1": {
-							"name": "comma.cpp punctuation.separator.delimiter.cpp"
+							"name": "punctuation.separator.delimiter.comma.cpp"
 						}
 					},
 					"end": "(?=\\))",
@@ -5162,27 +5879,71 @@
 				}
 			]
 		},
-		"constructor_inline": {
-			"name": "meta.function.definition.special.constructor.cpp",
-			"begin": "(^((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?:inline|constexpr|mutable|friend|explicit|virtual))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\()))",
+		"curly_initializer": {
+			"name": "meta.initialization.cpp",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\{)",
 			"beginCaptures": {
 				"1": {
-					"name": "meta.head.function.definition.special.constructor.cpp"
+					"name": "meta.qualified_type.cpp",
+					"patterns": [
+						{
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
+						}
+					]
 				},
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
 						}
 					]
 				},
 				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"4": {
-					"name": "comment.block.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"5": {
+					"name": "comment.block.cpp"
+				},
+				"6": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5194,9 +5955,6 @@
 						}
 					]
 				},
-				"6": {
-					"name": "storage.type.modifier.specifier.cpp"
-				},
 				"7": {
 					"patterns": [
 						{
@@ -5222,23 +5980,41 @@
 						}
 					]
 				},
-				"11": {
-					"name": "storage.type.modifier.calling-convention.cpp"
-				},
 				"12": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
 				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "entity.name.scope-resolution.cpp"
 				},
 				"14": {
-					"name": "comment.block.cpp"
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
 				},
 				"15": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"16": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"17": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"18": {
+					"name": "comment.block.cpp"
+				},
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5250,207 +6026,95 @@
 						}
 					]
 				},
-				"16": {
-					"name": "entity.name.function.constructor.cpp entity.name.function.definition.special.constructor.cpp"
+				"20": {
+					"name": "entity.name.type.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"22": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"23": {
+					"name": "comment.block.cpp"
+				},
+				"24": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"25": {
+					"name": "punctuation.section.arguments.begin.bracket.curly.initializer.cpp"
+				}
+			},
+			"end": "(\\})",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.curly.initializer.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.constructor.cpp",
-					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
-						}
-					},
+					"include": "#evaluation_context"
+				},
+				{
+					"include": "#comma"
+				}
+			]
+		},
+		"builtin_storage_type_initilizer": {
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?: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|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)(?!\\w)))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)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(?!\\w)))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#ever_present_context"
-						},
-						{
-							"patterns": [
-								{
-									"match": "(\\=)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(default)|(delete))",
-									"captures": {
-										"1": {
-											"name": "keyword.operator.assignment.cpp"
-										},
-										"2": {
-											"patterns": [
-												{
-													"include": "#inline_comment"
-												}
-											]
-										},
-										"3": {
-											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-										},
-										"4": {
-											"name": "comment.block.cpp"
-										},
-										"5": {
-											"patterns": [
-												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-												},
-												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "keyword.other.default.constructor.cpp"
-										},
-										"7": {
-											"name": "keyword.other.delete.constructor.cpp"
-										}
-									}
-								}
-							]
-						},
-						{
-							"begin": "(:)",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.separator.initializers.cpp"
-								}
-							},
-							"end": "(?=\\{)",
-							"patterns": [
-								{
-									"contentName": "meta.parameter.initialization.cpp",
-									"begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\()",
-									"beginCaptures": {
-										"1": {
-											"name": "entity.name.function.call.initializer.cpp"
-										},
-										"2": {
-											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
-										}
-									},
-									"end": "(\\))",
-									"endCaptures": {
-										"1": {
-											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
-										}
-									},
-									"patterns": [
-										{
-											"include": "#evaluation_context"
-										}
-									]
-								},
-								{
-									"contentName": "meta.parameter.initialization.cpp",
-									"begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
-									"beginCaptures": {
-										"1": {
-											"name": "entity.name.function.call.initializer.cpp"
-										},
-										"2": {
-											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
-										}
-									},
-									"end": "(\\})",
-									"endCaptures": {
-										"1": {
-											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
-										}
-									},
-									"patterns": [
-										{
-											"include": "#evaluation_context"
-										}
-									]
-								},
-								{
-									"include": "#comma"
-								}
-							]
-						},
-						{
-							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
-							"begin": "(\\()",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
-								}
-							},
-							"end": "(\\))",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
-								}
-							},
-							"patterns": [
-								{
-									"include": "#function_parameter_context"
-								},
-								{
-									"include": "#evaluation_context"
-								}
-							]
-						},
-						{
-							"include": "#initial_context"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				{
-					"name": "meta.body.function.definition.special.constructor.cpp",
-					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#function_body_context"
-						}
-					]
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"name": "meta.tail.function.definition.special.constructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
-				}
-			]
-		},
-		"constructor_root": {
-			"name": "meta.function.definition.special.constructor.cpp",
-			"begin": "(\\s*+\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))::((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\9((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\()))",
-			"beginCaptures": {
-				"1": {
-					"name": "meta.head.function.definition.special.constructor.cpp"
 				},
-				"2": {
-					"name": "storage.type.modifier.calling-convention.cpp"
-				},
-				"3": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"4": {
+				"6": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"5": {
+				"7": {
 					"name": "comment.block.cpp"
 				},
-				"6": {
+				"8": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5462,51 +6126,51 @@
 						}
 					]
 				},
-				"7": {
+				"9": {
+					"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
+				},
+				"10": {
 					"patterns": [
 						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
-						},
-						{
-							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-							"name": "entity.name.scope-resolution.constructor.cpp"
-						},
-						{
-							"include": "#template_call_range"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"11": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"12": {
+					"name": "comment.block.cpp"
+				},
+				"13": {
 					"patterns": [
 						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
-							"name": "entity.name.type.constructor.cpp"
-						},
-						{
-							"match": "(?<=:)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.function.definition.special.constructor.cpp"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"10": {
+				"14": {
+					"name": "storage.type.cpp storage.type.built-in.cpp"
+				},
+				"15": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"11": {
+				"16": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"12": {
+				"17": {
 					"name": "comment.block.cpp"
 				},
-				"13": {
+				"18": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5518,20 +6182,23 @@
 						}
 					]
 				},
-				"14": {
+				"19": {
+					"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+				},
+				"20": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"15": {
+				"21": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"22": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"23": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5543,20 +6210,23 @@
 						}
 					]
 				},
-				"18": {
+				"24": {
+					"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"19": {
+				"26": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"20": {
+				"27": {
 					"name": "comment.block.cpp"
 				},
-				"21": {
+				"28": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5567,16 +6237,152 @@
 							"name": "comment.block.cpp"
 						}
 					]
+				},
+				"29": {
+					"name": "punctuation.section.arguments.begin.bracket.round.initializer.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.initializer.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.constructor.cpp",
-					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
-					"endCaptures": {
-						"1": {
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"constructor_inline": {
+			"name": "meta.function.definition.special.constructor.cpp",
+			"begin": "(^((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:inline|constexpr|mutable|friend|explicit|virtual)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\()))",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.function.definition.special.constructor.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#functional_specifiers_pre_parameters"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"8": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"9": {
+					"name": "comment.block.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"12": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"13": {
+					"name": "comment.block.cpp"
+				},
+				"14": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"15": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"16": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"17": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"18": {
+					"name": "comment.block.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"20": {
+					"name": "entity.name.function.constructor.cpp entity.name.function.definition.special.constructor.cpp"
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"patterns": [
+				{
+					"name": "meta.head.function.definition.special.constructor.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
@@ -5627,6 +6433,9 @@
 								}
 							]
 						},
+						{
+							"include": "#functional_specifiers_pre_parameters"
+						},
 						{
 							"begin": "(:)",
 							"beginCaptures": {
@@ -5711,7 +6520,7 @@
 							]
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -5736,18 +6545,18 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"destructor_inline": {
-			"name": "meta.function.definition.special.member.destructor.cpp",
-			"begin": "(^((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?:inline|constexpr|mutable|friend|explicit|virtual))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(~(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\()))",
+		"constructor_root": {
+			"name": "meta.function.definition.special.constructor.cpp",
+			"begin": "(\\s*+((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))::((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\13((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\()))",
 			"beginCaptures": {
 				"1": {
-					"name": "meta.head.function.definition.special.member.destructor.cpp"
+					"name": "meta.head.function.definition.special.constructor.cpp"
 				},
 				"2": {
 					"patterns": [
@@ -5803,22 +6612,50 @@
 					]
 				},
 				"11": {
-					"name": "storage.type.modifier.specifier.cpp"
+					"patterns": [
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.constructor.cpp"
+						},
+						{
+							"include": "#template_call_range"
+						}
+					]
 				},
 				"12": {
+					"patterns": [
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+							"name": "entity.name.type.constructor.cpp"
+						},
+						{
+							"match": "(?<=:)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.function.definition.special.constructor.cpp"
+						},
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
+						}
+					]
+				},
+				"14": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"13": {
+				"15": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"14": {
+				"16": {
 					"name": "comment.block.cpp"
 				},
-				"15": {
+				"17": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5830,19 +6667,66 @@
 						}
 					]
 				},
-				"16": {
-					"name": "entity.name.function.destructor.cpp entity.name.function.definition.special.member.destructor.cpp"
+				"18": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"19": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"20": {
+					"name": "comment.block.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				}
 			},
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.member.destructor.cpp",
+					"name": "meta.head.function.definition.special.constructor.cpp",
 					"begin": "\\G ?",
 					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
 					"endCaptures": {
 						"1": {
-							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
 					"patterns": [
@@ -5893,34 +6777,105 @@
 							]
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.member.destructor.cpp",
-							"begin": "(\\()",
+							"include": "#functional_specifiers_pre_parameters"
+						},
+						{
+							"begin": "(:)",
 							"beginCaptures": {
 								"1": {
-									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
+									"name": "punctuation.separator.initializers.cpp"
 								}
 							},
-							"end": "(\\))",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
-								}
-							}
-						},
-						{
-							"include": "#initial_context"
-						}
-					]
-				},
-				{
-					"name": "meta.body.function.definition.special.member.destructor.cpp",
-					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
-						}
-					},
+							"end": "(?=\\{)",
+							"patterns": [
+								{
+									"contentName": "meta.parameter.initialization.cpp",
+									"begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\()",
+									"beginCaptures": {
+										"1": {
+											"name": "entity.name.function.call.initializer.cpp"
+										},
+										"2": {
+											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"end": "(\\))",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#evaluation_context"
+										}
+									]
+								},
+								{
+									"contentName": "meta.parameter.initialization.cpp",
+									"begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
+									"beginCaptures": {
+										"1": {
+											"name": "entity.name.function.call.initializer.cpp"
+										},
+										"2": {
+											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"end": "(\\})",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#evaluation_context"
+										}
+									]
+								},
+								{
+									"include": "#comma"
+								}
+							]
+						},
+						{
+							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
+							"begin": "(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#function_parameter_context"
+								},
+								{
+									"include": "#evaluation_context"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.body.function.definition.special.constructor.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
+						}
+					},
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -5928,41 +6883,38 @@
 					]
 				},
 				{
-					"name": "meta.tail.function.definition.special.member.destructor.cpp",
+					"name": "meta.tail.function.definition.special.constructor.cpp",
 					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"destructor_root": {
+		"destructor_inline": {
 			"name": "meta.function.definition.special.member.destructor.cpp",
-			"begin": "(\\s*+((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))::((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))~\\9((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\()))",
+			"begin": "(^((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:inline|constexpr|mutable|friend|explicit|virtual)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*)(~(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(?=\\()))",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.head.function.definition.special.member.destructor.cpp"
 				},
 				"2": {
-					"name": "storage.type.modifier.calling-convention.cpp"
-				},
-				"3": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"5": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"6": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5974,51 +6926,20 @@
 						}
 					]
 				},
-				"7": {
-					"patterns": [
-						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
-						},
-						{
-							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
-							"name": "entity.name.scope-resolution.destructor.cpp"
-						},
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"8": {
-					"patterns": [
-						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
-							"name": "entity.name.type.destructor.cpp"
-						},
-						{
-							"match": "(?<=:)~(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.function.definition.special.member.destructor.cpp"
-						},
-						{
-							"match": "::",
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
-						}
-					]
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"12": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"13": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6030,20 +6951,23 @@
 						}
 					]
 				},
-				"14": {
+				"10": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"11": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"15": {
+				"12": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"13": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"14": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6055,20 +6979,27 @@
 						}
 					]
 				},
-				"18": {
+				"15": {
+					"patterns": [
+						{
+							"include": "#functional_specifiers_pre_parameters"
+						}
+					]
+				},
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"21": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6079,6 +7010,9 @@
 							"name": "comment.block.cpp"
 						}
 					]
+				},
+				"20": {
+					"name": "entity.name.function.destructor.cpp entity.name.function.definition.special.member.destructor.cpp"
 				}
 			},
 			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
@@ -6155,7 +7089,7 @@
 							}
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -6180,83 +7114,18 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"operators": {
-			"patterns": [
-				{
-					"include": "#sizeof_operator"
-				},
-				{
-					"include": "#alignof_operator"
-				},
-				{
-					"include": "#alignas_operator"
-				},
-				{
-					"include": "#typeid_operator"
-				},
-				{
-					"include": "#noexcept_operator"
-				},
-				{
-					"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"
-				},
-				{
-					"include": "#assignment_operator"
-				},
-				{
-					"match": "%|\\*|/|-|\\+",
-					"name": "keyword.operator.cpp"
-				},
-				{
-					"include": "#ternary_operator"
-				}
-			]
-		},
-		"wordlike_operators": {
-			"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 keyword.operator.$0.cpp"
-		},
-		"sizeof_operator": {
-			"contentName": "meta.arguments.operator.sizeof.cpp",
-			"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+		"destructor_root": {
+			"name": "meta.function.definition.special.member.destructor.cpp",
+			"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))::((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))~\\13((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\()))",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
+					"name": "meta.head.function.definition.special.member.destructor.cpp"
 				},
 				"2": {
 					"patterns": [
@@ -6284,42 +7153,22 @@
 					]
 				},
 				"6": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
-				}
-			]
-		},
-		"alignof_operator": {
-			"contentName": "meta.arguments.operator.alignof.cpp",
-			"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"2": {
+				"7": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"8": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"10": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6331,43 +7180,51 @@
 						}
 					]
 				},
-				"6": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
-				}
-			]
-		},
-		"alignas_operator": {
-			"contentName": "meta.arguments.operator.alignas.cpp",
-			"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
+				"11": {
+					"patterns": [
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.destructor.cpp"
+						},
+						{
+							"include": "#template_call_range"
+						}
+					]
 				},
-				"2": {
+				"12": {
+					"patterns": [
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+							"name": "entity.name.type.destructor.cpp"
+						},
+						{
+							"match": "(?<=:)~(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.function.definition.special.member.destructor.cpp"
+						},
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
+						}
+					]
+				},
+				"14": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"15": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"16": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"17": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6379,43 +7236,20 @@
 						}
 					]
 				},
-				"6": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
-				}
-			]
-		},
-		"typeid_operator": {
-			"contentName": "meta.arguments.operator.typeid.cpp",
-			"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
-				},
-				"2": {
+				"18": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"19": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"20": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"21": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6427,43 +7261,20 @@
 						}
 					]
 				},
-				"6": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
-				}
-			]
-		},
-		"noexcept_operator": {
-			"contentName": "meta.arguments.operator.noexcept.cpp",
-			"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
-				},
-				"2": {
+				"22": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"23": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"24": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"25": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6474,188 +7285,199 @@
 							"name": "comment.block.cpp"
 						}
 					]
-				},
-				"6": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#evaluation_context"
-				}
-			]
-		},
-		"ternary_operator": {
-			"applyEndPatternLast": true,
-			"begin": "(\\?)",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.operator.ternary.cpp"
-				}
-			},
-			"end": "(:)",
-			"endCaptures": {
-				"1": {
-					"name": "keyword.operator.ternary.cpp"
 				}
 			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"patterns": [
 				{
-					"include": "#ever_present_context"
-				},
-				{
-					"include": "#string_context"
+					"name": "meta.head.function.definition.special.member.destructor.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#ever_present_context"
+						},
+						{
+							"patterns": [
+								{
+									"match": "(\\=)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(default)|(delete))",
+									"captures": {
+										"1": {
+											"name": "keyword.operator.assignment.cpp"
+										},
+										"2": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"4": {
+											"name": "comment.block.cpp"
+										},
+										"5": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"6": {
+											"name": "keyword.other.default.constructor.cpp"
+										},
+										"7": {
+											"name": "keyword.other.delete.constructor.cpp"
+										}
+									}
+								}
+							]
+						},
+						{
+							"contentName": "meta.function.definition.parameters.special.member.destructor.cpp",
+							"begin": "(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
+								}
+							}
+						},
+						{
+							"include": "$base"
+						}
+					]
 				},
 				{
-					"include": "#number_literal"
+					"name": "meta.body.function.definition.special.member.destructor.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function_body_context"
+						}
+					]
 				},
 				{
-					"include": "#string_context_c"
-				},
-				{
-					"include": "#method_access"
-				},
-				{
-					"include": "#member_access"
-				},
-				{
-					"include": "#predefined_macros"
-				},
-				{
-					"include": "#operators"
-				},
-				{
-					"include": "#memory_operators"
-				},
-				{
-					"include": "#wordlike_operators"
-				},
-				{
-					"include": "#type_casting_operators"
-				},
-				{
-					"include": "#control_flow_keywords"
-				},
+					"name": "meta.tail.function.definition.special.member.destructor.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"operators": {
+			"patterns": [
 				{
-					"include": "#exception_keywords"
+					"include": "#sizeof_operator"
 				},
 				{
-					"include": "#the_this_keyword"
+					"include": "#alignof_operator"
 				},
 				{
-					"include": "#language_constants"
+					"include": "#alignas_operator"
 				},
 				{
-					"include": "#qualifiers_and_specifiers_post_parameters"
+					"include": "#typeid_operator"
 				},
 				{
-					"include": "#functional_specifiers_pre_parameters"
+					"include": "#noexcept_operator"
 				},
 				{
-					"include": "#storage_types"
+					"match": "--",
+					"name": "keyword.operator.decrement.cpp"
 				},
 				{
-					"include": "#misc_storage_modifiers"
+					"match": "\\+\\+",
+					"name": "keyword.operator.increment.cpp"
 				},
 				{
-					"include": "#lambdas"
+					"match": "%=|\\+=|-=|\\*=|(?<!\\()\\/=",
+					"name": "keyword.operator.assignment.compound.cpp"
 				},
 				{
-					"include": "#attributes_context"
+					"match": "&=|\\^=|<<=|>>=|\\|=",
+					"name": "keyword.operator.assignment.compound.bitwise.cpp"
 				},
 				{
-					"include": "#parentheses"
+					"match": "<<|>>",
+					"name": "keyword.operator.bitwise.shift.cpp"
 				},
 				{
-					"include": "#function_call"
+					"match": "!=|<=|>=|==|<|>",
+					"name": "keyword.operator.comparison.cpp"
 				},
 				{
-					"include": "#scope_resolution_inner_generated"
+					"match": "&&|!|\\|\\|",
+					"name": "keyword.operator.logical.cpp"
 				},
 				{
-					"include": "#square_brackets"
+					"match": "&|\\||\\^|~",
+					"name": "keyword.operator.cpp"
 				},
 				{
-					"include": "#empty_square_brackets"
+					"include": "#assignment_operator"
 				},
 				{
-					"include": "#semicolon"
+					"match": "%|\\*|\\/|-|\\+",
+					"name": "keyword.operator.cpp"
 				},
 				{
-					"include": "#comma"
+					"include": "#ternary_operator"
 				}
 			]
 		},
-		"function_pointer": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)(\\()(\\*)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)\\s*(?:(\\[)(\\w*)(\\])\\s*)*(\\))\\s*(\\()",
+		"wordlike_operators": {
+			"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 keyword.operator.$0.cpp"
+		},
+		"sizeof_operator": {
+			"contentName": "meta.arguments.operator.sizeof.cpp",
+			"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "(?:class|struct|union|enum)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context_c"
-						},
-						{
-							"include": "#comma"
-						},
-						{
-							"include": "#scope_resolution_inner_generated"
-						},
-						{
-							"include": "#template_call_range"
-						},
-						{
-							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
-							"name": "entity.name.type.cpp"
-						}
-					]
+					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				},
 				"2": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"3": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"5": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"6": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6667,20 +7489,43 @@
 						}
 					]
 				},
-				"7": {
+				"6": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"alignof_operator": {
+			"contentName": "meta.arguments.operator.alignof.cpp",
+			"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+				},
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6692,41 +7537,43 @@
 						}
 					]
 				},
-				"12": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"13": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"14": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"15": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				"6": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"alignas_operator": {
+			"contentName": "meta.arguments.operator.alignas.cpp",
+			"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
 				},
-				"16": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"17": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"18": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"19": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6738,23 +7585,43 @@
 						}
 					]
 				},
-				"20": {
-					"name": "entity.name.type.cpp"
+				"6": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"typeid_operator": {
+			"contentName": "meta.arguments.operator.typeid.cpp",
+			"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
 				},
-				"22": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6766,23 +7633,43 @@
 						}
 					]
 				},
-				"26": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"27": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
+				"6": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"noexcept_operator": {
+			"contentName": "meta.arguments.operator.noexcept.cpp",
+			"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
 					]
 				},
-				"28": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"29": {
+				"4": {
 					"name": "comment.block.cpp"
 				},
-				"30": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -6794,127 +7681,128 @@
 						}
 					]
 				},
-				"31": {
-					"name": "storage.modifier.reference.cpp"
+				"6": {
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"ternary_operator": {
+			"applyEndPatternLast": true,
+			"begin": "(\\?)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.operator.ternary.cpp"
+				}
+			},
+			"end": "(:)",
+			"endCaptures": {
+				"1": {
+					"name": "keyword.operator.ternary.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#ever_present_context"
 				},
-				"32": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+				{
+					"include": "#string_context"
 				},
-				"33": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				{
+					"include": "#number_literal"
 				},
-				"34": {
-					"name": "comment.block.cpp"
+				{
+					"include": "#string_context_c"
 				},
-				"35": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				{
+					"include": "#method_access"
 				},
-				"36": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+				{
+					"include": "#member_access"
 				},
-				"37": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				{
+					"include": "#predefined_macros"
 				},
-				"38": {
-					"name": "comment.block.cpp"
+				{
+					"include": "#operators"
 				},
-				"39": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				{
+					"include": "#memory_operators"
 				},
-				"40": {
-					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
+				{
+					"include": "#wordlike_operators"
 				},
-				"41": {
-					"name": "punctuation.definition.function.pointer.dereference.cpp"
+				{
+					"include": "#type_casting_operators"
 				},
-				"42": {
-					"name": "variable.other.definition.pointer.function.cpp"
+				{
+					"include": "#control_flow_keywords"
 				},
-				"43": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
+				{
+					"include": "#exception_keywords"
 				},
-				"44": {
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
+				{
+					"include": "#the_this_keyword"
 				},
-				"45": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
+				{
+					"include": "#language_constants"
 				},
-				"46": {
-					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
+				{
+					"include": "#builtin_storage_type_initilizer"
 				},
-				"47": {
-					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
-				}
-			},
-			"end": "(\\))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=[{=,);]|\\n)(?!\\()",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
+				{
+					"include": "#qualifiers_and_specifiers_post_parameters"
 				},
-				"2": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+				{
+					"include": "#functional_specifiers_pre_parameters"
 				},
-				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				{
+					"include": "#storage_types"
 				},
-				"4": {
-					"name": "comment.block.cpp"
+				{
+					"include": "#misc_storage_modifiers"
 				},
-				"5": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			},
-			"patterns": [
 				{
-					"include": "#function_parameter_context"
+					"include": "#lambdas"
+				},
+				{
+					"include": "#attributes_context"
+				},
+				{
+					"include": "#parentheses"
+				},
+				{
+					"include": "#function_call"
+				},
+				{
+					"include": "#scope_resolution_inner_generated"
+				},
+				{
+					"include": "#square_brackets"
+				},
+				{
+					"include": "#empty_square_brackets"
+				},
+				{
+					"include": "#semicolon"
+				},
+				{
+					"include": "#comma"
 				}
 			]
 		},
-		"function_pointer_parameter": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)(\\()(\\*)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)\\s*(?:(\\[)(\\w*)(\\])\\s*)*(\\))\\s*(\\()",
+		"function_pointer": {
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()(\\*)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)\\s*(?:(\\[)(\\w*)(\\])\\s*)*(\\))\\s*(\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
@@ -7062,48 +7950,63 @@
 				"20": {
 					"name": "entity.name.type.cpp"
 				},
-				"22": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"23": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"24": {
-					"name": "comment.block.cpp"
-				},
-				"25": {
+				"21": {
 					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
 						{
 							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"26": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"27": {
-					"patterns": [
+							"name": "storage.modifier.pointer.cpp"
+						},
 						{
-							"include": "#inline_comment"
-						}
-					]
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
 				},
-				"28": {
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"29": {
+				"24": {
 					"name": "comment.block.cpp"
 				},
-				"30": {
+				"25": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7115,23 +8018,20 @@
 						}
 					]
 				},
-				"31": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"32": {
+				"26": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"33": {
+				"27": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"34": {
+				"28": {
 					"name": "comment.block.cpp"
 				},
-				"35": {
+				"29": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7143,20 +8043,20 @@
 						}
 					]
 				},
-				"36": {
+				"30": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"37": {
+				"31": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"38": {
+				"32": {
 					"name": "comment.block.cpp"
 				},
-				"39": {
+				"33": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7168,32 +8068,32 @@
 						}
 					]
 				},
-				"40": {
+				"34": {
 					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
 				},
-				"41": {
+				"35": {
 					"name": "punctuation.definition.function.pointer.dereference.cpp"
 				},
-				"42": {
-					"name": "variable.parameter.pointer.function.cpp"
+				"36": {
+					"name": "variable.other.definition.pointer.function.cpp"
 				},
-				"43": {
+				"37": {
 					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				"44": {
+				"38": {
 					"patterns": [
 						{
 							"include": "#evaluation_context"
 						}
 					]
 				},
-				"45": {
+				"39": {
 					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				"46": {
+				"40": {
 					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
 				},
-				"47": {
+				"41": {
 					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
 				}
 			},
@@ -7234,24 +8134,70 @@
 				}
 			]
 		},
-		"parameter_or_maybe_value": {
-			"name": "meta.parameter.cpp",
-			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\w)",
+		"function_pointer_parameter": {
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()(\\*)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)\\s*(?:(\\[)(\\w*)(\\])\\s*)*(\\))\\s*(\\()",
 			"beginCaptures": {
 				"1": {
+					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
 						}
 					]
 				},
 				"2": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
 				},
 				"3": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"4": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"5": {
+					"name": "comment.block.cpp"
+				},
+				"6": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7262,79 +8208,350 @@
 							"name": "comment.block.cpp"
 						}
 					]
-				}
-			},
-			"end": "(?:(?=\\))|(,))",
-			"endCaptures": {
-				"1": {
-					"name": "comma.cpp punctuation.separator.delimiter.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#function_pointer_parameter"
 				},
-				{
-					"include": "#decltype"
+				"7": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"include": "#vararg_ellipses"
+				"8": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"match": "((?:((?:const|static|volatile|register|restrict|extern))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))|((?:short|signed|unsigned|long))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\w))+)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))|((?<!\\w)(?: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|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)(?!\\w)))|((?<!\\w)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(?!\\w)))|((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=,|\\)|=)",
-					"captures": {
-						"1": {
-							"patterns": [
-								{
-									"include": "#storage_types"
-								}
-							]
-						},
-						"2": {
-							"name": "storage.modifier.specifier.parameter.cpp"
-						},
-						"3": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+				"9": {
+					"name": "comment.block.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
-						"4": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"12": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
+				},
+				"13": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"14": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"15": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"16": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"17": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"18": {
+					"name": "comment.block.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
-						"5": {
+						{
+							"match": "\\*",
 							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"20": {
+					"name": "entity.name.type.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
 						},
-						"6": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"26": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"27": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"28": {
+					"name": "comment.block.cpp"
+				},
+				"29": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"30": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"31": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"32": {
+					"name": "comment.block.cpp"
+				},
+				"33": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"34": {
+					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
+				},
+				"35": {
+					"name": "punctuation.definition.function.pointer.dereference.cpp"
+				},
+				"36": {
+					"name": "variable.parameter.pointer.function.cpp"
+				},
+				"37": {
+					"name": "punctuation.definition.begin.bracket.square.cpp"
+				},
+				"38": {
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
+				},
+				"39": {
+					"name": "punctuation.definition.end.bracket.square.cpp"
+				},
+				"40": {
+					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
+				},
+				"41": {
+					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
+				}
+			},
+			"end": "(\\))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=[{=,);]|\\n)(?!\\()",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			},
+			"patterns": [
+				{
+					"include": "#function_parameter_context"
+				}
+			]
+		},
+		"parameter_or_maybe_value": {
+			"name": "meta.parameter.cpp",
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\w)",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			},
+			"end": "(?:(?=\\))|(,))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.separator.delimiter.comma.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#ever_present_context"
+				},
+				{
+					"include": "#memory_operators"
+				},
+				{
+					"include": "#builtin_storage_type_initilizer"
+				},
+				{
+					"include": "#curly_initializer"
+				},
+				{
+					"include": "#function_pointer_parameter"
+				},
+				{
+					"include": "#decltype"
+				},
+				{
+					"include": "#vararg_ellipses"
+				},
+				{
+					"match": "((?:((?:const|static|volatile|register|restrict|extern))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))+)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?: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|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)(?!\\w)))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)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(?!\\w)))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=,|\\)|=)",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"include": "#storage_types"
 								}
 							]
 						},
-						"7": {
+						"2": {
 							"name": "storage.modifier.specifier.parameter.cpp"
 						},
-						"8": {
+						"3": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"9": {
+						"4": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"10": {
+						"5": {
 							"name": "comment.block.cpp"
 						},
-						"11": {
+						"6": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7346,20 +8563,20 @@
 								}
 							]
 						},
-						"12": {
+						"7": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"13": {
+						"8": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"14": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
-						"15": {
+						"10": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7371,20 +8588,20 @@
 								}
 							]
 						},
-						"16": {
+						"11": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"17": {
+						"12": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"18": {
+						"13": {
 							"name": "comment.block.cpp"
 						},
-						"19": {
+						"14": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7396,20 +8613,61 @@
 								}
 							]
 						},
-						"20": {
+						"15": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"17": {
+							"name": "comment.block.cpp"
+						},
+						"18": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"19": {
 							"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
 						},
+						"20": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
 						"21": {
-							"name": "storage.type.cpp storage.type.built-in.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"22": {
-							"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+							"name": "comment.block.cpp"
 						},
 						"23": {
-							"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"24": {
-							"name": "entity.name.type.parameter.cpp"
+							"name": "storage.type.cpp storage.type.built-in.cpp"
 						},
 						"25": {
 							"patterns": [
@@ -7435,6 +8693,65 @@
 									"name": "comment.block.cpp"
 								}
 							]
+						},
+						"29": {
+							"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+						},
+						"30": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"31": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"32": {
+							"name": "comment.block.cpp"
+						},
+						"33": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"34": {
+							"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+						},
+						"35": {
+							"name": "entity.name.type.parameter.cpp"
+						},
+						"36": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"37": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"38": {
+							"name": "comment.block.cpp"
+						},
+						"39": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						}
 					}
 				},
@@ -7456,7 +8773,7 @@
 					"end": "(?:(?=\\))|(,))",
 					"endCaptures": {
 						"1": {
-							"name": "comma.cpp punctuation.separator.delimiter.cpp"
+							"name": "punctuation.separator.delimiter.comma.cpp"
 						}
 					},
 					"patterns": [
@@ -7466,10 +8783,7 @@
 					]
 				},
 				{
-					"include": "#assignment_operator"
-				},
-				{
-					"match": "(?<!\\s|\\(|,|:)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\)|,|\\[|=)",
+					"match": "(?<!\\s|\\(|,|:)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\)|,|\\[|=|\\n)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -7557,50 +8871,65 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})",
+					"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*)",
 					"captures": {
-						"1": {
+						"0": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"2": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"3": {
-							"name": "comment.block.cpp"
-						},
-						"4": {
-							"patterns": [
+									"match": "\\*",
+									"name": "storage.modifier.pointer.cpp"
+								},
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+									"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+									"captures": {
+										"1": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"2": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"3": {
+											"name": "comment.block.cpp"
+										},
+										"4": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									},
+									"name": "invalid.illegal.reference-type.cpp"
 								},
 								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"match": "\\&",
+									"name": "storage.modifier.reference.cpp"
 								}
 							]
 						},
-						"5": {
-							"name": "storage.modifier.pointer.cpp"
-						},
-						"6": {
+						"1": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"7": {
+						"2": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"8": {
+						"3": {
 							"name": "comment.block.cpp"
 						},
-						"9": {
+						"4": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7612,23 +8941,20 @@
 								}
 							]
 						},
-						"10": {
-							"name": "storage.modifier.reference.cpp"
-						},
-						"11": {
+						"5": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"12": {
+						"6": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"13": {
+						"7": {
 							"name": "comment.block.cpp"
 						},
-						"14": {
+						"8": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7641,6 +8967,9 @@
 							]
 						}
 					}
+				},
+				{
+					"include": "#evaluation_context"
 				}
 			]
 		},
@@ -7677,10 +9006,13 @@
 			"end": "(?:(?=\\))|(,))",
 			"endCaptures": {
 				"1": {
-					"name": "comma.cpp punctuation.separator.delimiter.cpp"
+					"name": "punctuation.separator.delimiter.comma.cpp"
 				}
 			},
 			"patterns": [
+				{
+					"include": "#ever_present_context"
+				},
 				{
 					"include": "#function_pointer_parameter"
 				},
@@ -7691,7 +9023,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:const|static|volatile|register|restrict|extern))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))|((?:short|signed|unsigned|long))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\w))+)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))|((?<!\\w)(?: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|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)(?!\\w)))|((?<!\\w)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(?!\\w)))|((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=,|\\)|=)",
+					"match": "((?:((?:const|static|volatile|register|restrict|extern))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))+)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?!\\w))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?: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|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)(?!\\w)))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)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(?!\\w)))|((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)\\b\\b(?<!\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -7729,22 +9061,19 @@
 							]
 						},
 						"7": {
-							"name": "storage.modifier.specifier.parameter.cpp"
-						},
-						"8": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"9": {
+						"8": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"10": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
-						"11": {
+						"10": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7756,20 +9085,20 @@
 								}
 							]
 						},
-						"12": {
+						"11": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"13": {
+						"12": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"14": {
+						"13": {
 							"name": "comment.block.cpp"
 						},
-						"15": {
+						"14": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7781,20 +9110,20 @@
 								}
 							]
 						},
-						"16": {
+						"15": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"17": {
+						"16": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"18": {
+						"17": {
 							"name": "comment.block.cpp"
 						},
-						"19": {
+						"18": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -7806,20 +9135,36 @@
 								}
 							]
 						},
-						"20": {
+						"19": {
 							"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
 						},
+						"20": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
 						"21": {
-							"name": "storage.type.cpp storage.type.built-in.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"22": {
-							"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+							"name": "comment.block.cpp"
 						},
 						"23": {
-							"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"24": {
-							"name": "entity.name.type.parameter.cpp"
+							"name": "storage.type.cpp storage.type.built-in.cpp"
 						},
 						"25": {
 							"patterns": [
@@ -7845,28 +9190,87 @@
 									"name": "comment.block.cpp"
 								}
 							]
-						}
-					}
-				},
-				{
-					"include": "#storage_types"
-				},
-				{
-					"include": "#scope_resolution_parameter_inner_generated"
-				},
-				{
-					"match": "(?:class|struct|union|enum)",
-					"name": "storage.type.$0.cpp"
-				},
-				{
-					"begin": "(?<==)",
-					"end": "(?:(?=\\))|(,))",
-					"endCaptures": {
-						"1": {
-							"name": "comma.cpp punctuation.separator.delimiter.cpp"
-						}
-					},
-					"patterns": [
+						},
+						"29": {
+							"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
+						},
+						"30": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"31": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"32": {
+							"name": "comment.block.cpp"
+						},
+						"33": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"34": {
+							"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
+						},
+						"35": {
+							"name": "entity.name.type.parameter.cpp"
+						},
+						"36": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"37": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"38": {
+							"name": "comment.block.cpp"
+						},
+						"39": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						}
+					}
+				},
+				{
+					"include": "#storage_types"
+				},
+				{
+					"include": "#scope_resolution_parameter_inner_generated"
+				},
+				{
+					"match": "(?:class|struct|union|enum)",
+					"name": "storage.type.$0.cpp"
+				},
+				{
+					"begin": "(?<==)",
+					"end": "(?:(?=\\))|(,))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.separator.delimiter.comma.cpp"
+						}
+					},
+					"patterns": [
 						{
 							"include": "#evaluation_context"
 						}
@@ -7964,50 +9368,65 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})",
+					"match": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*)",
 					"captures": {
-						"1": {
+						"0": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"2": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"3": {
-							"name": "comment.block.cpp"
-						},
-						"4": {
-							"patterns": [
+									"match": "\\*",
+									"name": "storage.modifier.pointer.cpp"
+								},
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+									"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+									"captures": {
+										"1": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"2": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"3": {
+											"name": "comment.block.cpp"
+										},
+										"4": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									},
+									"name": "invalid.illegal.reference-type.cpp"
 								},
 								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"match": "\\&",
+									"name": "storage.modifier.reference.cpp"
 								}
 							]
 						},
-						"5": {
-							"name": "storage.modifier.pointer.cpp"
-						},
-						"6": {
+						"1": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"7": {
+						"2": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"8": {
+						"3": {
 							"name": "comment.block.cpp"
 						},
-						"9": {
+						"4": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -8019,23 +9438,20 @@
 								}
 							]
 						},
-						"10": {
-							"name": "storage.modifier.reference.cpp"
-						},
-						"11": {
+						"5": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"12": {
+						"6": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"13": {
+						"7": {
 							"name": "comment.block.cpp"
 						},
-						"14": {
+						"8": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -8052,52 +9468,127 @@
 			]
 		},
 		"member_access": {
-			"match": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\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)]|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}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())",
+			"match": "(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\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)]|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}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\b(?!\\())",
 			"captures": {
 				"1": {
-					"name": "variable.language.this.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"2": {
-					"name": "variable.other.object.access.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"3": {
-					"name": "punctuation.separator.dot-access.cpp"
+					"name": "comment.block.cpp"
 				},
 				"4": {
-					"name": "punctuation.separator.pointer-access.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"5": {
+					"name": "variable.language.this.cpp"
+				},
+				"6": {
+					"name": "variable.other.object.access.cpp"
+				},
+				"7": {
+					"name": "punctuation.separator.dot-access.cpp"
+				},
+				"8": {
+					"name": "punctuation.separator.pointer-access.cpp"
+				},
+				"9": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
-									"name": "variable.language.this.cpp"
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
 								},
 								"2": {
-									"name": "variable.other.object.property.cpp"
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 								},
 								"3": {
-									"name": "punctuation.separator.dot-access.cpp"
+									"name": "comment.block.cpp"
 								},
 								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								},
+								"5": {
+									"name": "variable.language.this.cpp"
+								},
+								"6": {
+									"name": "variable.other.object.property.cpp"
+								},
+								"7": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"8": {
 									"name": "punctuation.separator.pointer-access.cpp"
 								}
 							}
 						},
 						{
-							"match": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
-									"name": "variable.language.this.cpp"
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
 								},
 								"2": {
-									"name": "variable.other.object.access.cpp"
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 								},
 								"3": {
-									"name": "punctuation.separator.dot-access.cpp"
+									"name": "comment.block.cpp"
 								},
 								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								},
+								"5": {
+									"name": "variable.language.this.cpp"
+								},
+								"6": {
+									"name": "variable.other.object.access.cpp"
+								},
+								"7": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"8": {
 									"name": "punctuation.separator.pointer-access.cpp"
 								}
 							}
@@ -8110,58 +9601,133 @@
 						}
 					]
 				},
-				"6": {
+				"10": {
 					"name": "variable.other.property.cpp"
 				}
 			}
 		},
 		"method_access": {
-			"begin": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*(\\()",
+			"begin": "(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(~?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "variable.language.this.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"2": {
-					"name": "variable.other.object.access.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"3": {
-					"name": "punctuation.separator.dot-access.cpp"
+					"name": "comment.block.cpp"
 				},
 				"4": {
-					"name": "punctuation.separator.pointer-access.cpp"
-				},
-				"5": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
-							"captures": {
-								"1": {
-									"name": "variable.language.this.cpp"
-								},
-								"2": {
-									"name": "variable.other.object.property.cpp"
-								},
-								"3": {
-									"name": "punctuation.separator.dot-access.cpp"
-								},
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"5": {
+					"name": "variable.language.this.cpp"
+				},
+				"6": {
+					"name": "variable.other.object.access.cpp"
+				},
+				"7": {
+					"name": "punctuation.separator.dot-access.cpp"
+				},
+				"8": {
+					"name": "punctuation.separator.pointer-access.cpp"
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
 								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								},
+								"5": {
+									"name": "variable.language.this.cpp"
+								},
+								"6": {
+									"name": "variable.other.object.property.cpp"
+								},
+								"7": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"8": {
 									"name": "punctuation.separator.pointer-access.cpp"
 								}
 							}
 						},
 						{
-							"match": "(?:((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)this(?!\\w))|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
-									"name": "variable.language.this.cpp"
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
 								},
 								"2": {
-									"name": "variable.other.object.access.cpp"
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 								},
 								"3": {
-									"name": "punctuation.separator.dot-access.cpp"
+									"name": "comment.block.cpp"
 								},
 								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								},
+								"5": {
+									"name": "variable.language.this.cpp"
+								},
+								"6": {
+									"name": "variable.other.object.access.cpp"
+								},
+								"7": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"8": {
 									"name": "punctuation.separator.pointer-access.cpp"
 								}
 							}
@@ -8174,10 +9740,10 @@
 						}
 					]
 				},
-				"6": {
+				"10": {
 					"name": "entity.name.function.member.cpp"
 				},
-				"7": {
+				"11": {
 					"name": "punctuation.section.arguments.begin.bracket.round.function.member.cpp"
 				}
 			},
@@ -8315,7 +9881,7 @@
 					},
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -8325,14 +9891,14 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
 		"macro_argument": {
-			"match": "##(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+			"match": "##?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
 			"name": "variable.other.macro.argument.cpp"
 		},
 		"lambdas": {
@@ -8379,7 +9945,7 @@
 									]
 								},
 								"6": {
-									"name": "comma.cpp punctuation.separator.delimiter.cpp"
+									"name": "punctuation.separator.delimiter.comma.cpp"
 								},
 								"7": {
 									"name": "keyword.operator.assignment.cpp"
@@ -8448,7 +10014,7 @@
 					},
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
@@ -8520,7 +10086,7 @@
 					"name": "entity.name.type.enum.cpp"
 				},
 				"6": {
-					"name": "colon.cpp punctuation.separator.type-specifier.cpp"
+					"name": "punctuation.separator.colon.type-specifier.cpp"
 				},
 				"8": {
 					"patterns": [
@@ -8568,7 +10134,7 @@
 					},
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -8602,7 +10168,7 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
@@ -8612,7 +10178,7 @@
 			"patterns": [
 				{
 					"match": ",",
-					"name": "comma.cpp punctuation.separator.delimiter.inheritance.cpp"
+					"name": "punctuation.separator.delimiter.comma.inheritance.cpp"
 				},
 				{
 					"match": "(?<!\\w)(?:private|protected|public)(?!\\w)",
@@ -8722,7 +10288,7 @@
 					"name": "storage.type.modifier.final.cpp"
 				},
 				"17": {
-					"name": "colon.cpp punctuation.separator.inheritance.cpp"
+					"name": "punctuation.separator.colon.inheritance.cpp"
 				},
 				"18": {
 					"patterns": [
@@ -8786,7 +10352,7 @@
 							"include": "#destructor_inline"
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -8796,7 +10362,7 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
@@ -8892,7 +10458,7 @@
 					"name": "storage.type.modifier.final.cpp"
 				},
 				"17": {
-					"name": "colon.cpp punctuation.separator.inheritance.cpp"
+					"name": "punctuation.separator.colon.inheritance.cpp"
 				},
 				"18": {
 					"patterns": [
@@ -8956,7 +10522,7 @@
 							"include": "#destructor_inline"
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -8966,7 +10532,7 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
@@ -9062,7 +10628,7 @@
 					"name": "storage.type.modifier.final.cpp"
 				},
 				"17": {
-					"name": "colon.cpp punctuation.separator.inheritance.cpp"
+					"name": "punctuation.separator.colon.inheritance.cpp"
 				},
 				"18": {
 					"patterns": [
@@ -9126,7 +10692,7 @@
 							"include": "#destructor_inline"
 						},
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -9136,7 +10702,7 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				}
@@ -9144,12 +10710,37 @@
 		},
 		"extern_block": {
 			"name": "meta.block.extern.cpp",
-			"begin": "((\\bextern)(?=\\s*\\\"))",
+			"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(extern)(?=\\s*\\\"))",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.head.extern.cpp"
 				},
 				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"6": {
 					"name": "storage.type.extern.cpp"
 				}
 			},
@@ -9174,7 +10765,7 @@
 					},
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -9189,7 +10780,7 @@
 					},
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
@@ -9199,12 +10790,12 @@
 					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "$base"
 						}
 					]
 				},
 				{
-					"include": "#initial_context"
+					"include": "$base"
 				}
 			]
 		},
@@ -9307,7 +10898,7 @@
 							"name": "storage.type.modifier.final.cpp"
 						},
 						"17": {
-							"name": "colon.cpp punctuation.separator.inheritance.cpp"
+							"name": "punctuation.separator.colon.inheritance.cpp"
 						},
 						"18": {
 							"patterns": [
@@ -9371,7 +10962,7 @@
 									"include": "#destructor_inline"
 								},
 								{
-									"include": "#initial_context"
+									"include": "$base"
 								}
 							]
 						},
@@ -9381,50 +10972,65 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"match": "((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 									"captures": {
-										"2": {
+										"1": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
-												}
-											]
-										},
-										"3": {
-											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-										},
-										"4": {
-											"name": "comment.block.cpp"
-										},
-										"5": {
-											"patterns": [
+													"match": "\\*",
+													"name": "storage.modifier.pointer.cpp"
+												},
 												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+													"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+													"captures": {
+														"1": {
+															"patterns": [
+																{
+																	"include": "#inline_comment"
+																}
+															]
+														},
+														"2": {
+															"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+														},
+														"3": {
+															"name": "comment.block.cpp"
+														},
+														"4": {
+															"patterns": [
+																{
+																	"match": "\\*\\/",
+																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+																},
+																{
+																	"match": "\\*",
+																	"name": "comment.block.cpp"
+																}
+															]
+														}
+													},
+													"name": "invalid.illegal.reference-type.cpp"
 												},
 												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
+													"match": "\\&",
+													"name": "storage.modifier.reference.cpp"
 												}
 											]
 										},
-										"6": {
-											"name": "storage.modifier.pointer.cpp"
-										},
-										"7": {
+										"2": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"8": {
+										"3": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"9": {
+										"4": {
 											"name": "comment.block.cpp"
 										},
-										"10": {
+										"5": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -9436,23 +11042,20 @@
 												}
 											]
 										},
-										"11": {
-											"name": "storage.modifier.reference.cpp"
-										},
-										"12": {
+										"6": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"13": {
+										"7": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"14": {
+										"8": {
 											"name": "comment.block.cpp"
 										},
-										"15": {
+										"9": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -9464,20 +11067,20 @@
 												}
 											]
 										},
-										"16": {
+										"10": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"17": {
+										"11": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"18": {
+										"12": {
 											"name": "comment.block.cpp"
 										},
-										"19": {
+										"13": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -9489,7 +11092,7 @@
 												}
 											]
 										},
-										"20": {
+										"14": {
 											"name": "entity.name.type.alias.cpp"
 										}
 									}
@@ -9602,7 +11205,7 @@
 							"name": "storage.type.modifier.final.cpp"
 						},
 						"17": {
-							"name": "colon.cpp punctuation.separator.inheritance.cpp"
+							"name": "punctuation.separator.colon.inheritance.cpp"
 						},
 						"18": {
 							"patterns": [
@@ -9666,7 +11269,7 @@
 									"include": "#destructor_inline"
 								},
 								{
-									"include": "#initial_context"
+									"include": "$base"
 								}
 							]
 						},
@@ -9676,50 +11279,65 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"match": "((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 									"captures": {
-										"2": {
+										"1": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
-												}
-											]
-										},
-										"3": {
-											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-										},
-										"4": {
-											"name": "comment.block.cpp"
-										},
-										"5": {
-											"patterns": [
+													"match": "\\*",
+													"name": "storage.modifier.pointer.cpp"
+												},
 												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+													"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+													"captures": {
+														"1": {
+															"patterns": [
+																{
+																	"include": "#inline_comment"
+																}
+															]
+														},
+														"2": {
+															"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+														},
+														"3": {
+															"name": "comment.block.cpp"
+														},
+														"4": {
+															"patterns": [
+																{
+																	"match": "\\*\\/",
+																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+																},
+																{
+																	"match": "\\*",
+																	"name": "comment.block.cpp"
+																}
+															]
+														}
+													},
+													"name": "invalid.illegal.reference-type.cpp"
 												},
 												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
+													"match": "\\&",
+													"name": "storage.modifier.reference.cpp"
 												}
 											]
 										},
-										"6": {
-											"name": "storage.modifier.pointer.cpp"
-										},
-										"7": {
+										"2": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"8": {
+										"3": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"9": {
+										"4": {
 											"name": "comment.block.cpp"
 										},
-										"10": {
+										"5": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -9731,23 +11349,20 @@
 												}
 											]
 										},
-										"11": {
-											"name": "storage.modifier.reference.cpp"
-										},
-										"12": {
+										"6": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"13": {
+										"7": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"14": {
+										"8": {
 											"name": "comment.block.cpp"
 										},
-										"15": {
+										"9": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -9759,20 +11374,20 @@
 												}
 											]
 										},
-										"16": {
+										"10": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"17": {
+										"11": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"18": {
+										"12": {
 											"name": "comment.block.cpp"
 										},
-										"19": {
+										"13": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -9784,7 +11399,7 @@
 												}
 											]
 										},
-										"20": {
+										"14": {
 											"name": "entity.name.type.alias.cpp"
 										}
 									}
@@ -9897,7 +11512,7 @@
 							"name": "storage.type.modifier.final.cpp"
 						},
 						"17": {
-							"name": "colon.cpp punctuation.separator.inheritance.cpp"
+							"name": "punctuation.separator.colon.inheritance.cpp"
 						},
 						"18": {
 							"patterns": [
@@ -9961,7 +11576,7 @@
 									"include": "#destructor_inline"
 								},
 								{
-									"include": "#initial_context"
+									"include": "$base"
 								}
 							]
 						},
@@ -9971,50 +11586,65 @@
 							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"match": "((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
 									"captures": {
-										"2": {
+										"1": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
-												}
-											]
-										},
-										"3": {
-											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-										},
-										"4": {
-											"name": "comment.block.cpp"
-										},
-										"5": {
-											"patterns": [
+													"match": "\\*",
+													"name": "storage.modifier.pointer.cpp"
+												},
 												{
-													"match": "\\*\\/",
-													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+													"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+													"captures": {
+														"1": {
+															"patterns": [
+																{
+																	"include": "#inline_comment"
+																}
+															]
+														},
+														"2": {
+															"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+														},
+														"3": {
+															"name": "comment.block.cpp"
+														},
+														"4": {
+															"patterns": [
+																{
+																	"match": "\\*\\/",
+																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+																},
+																{
+																	"match": "\\*",
+																	"name": "comment.block.cpp"
+																}
+															]
+														}
+													},
+													"name": "invalid.illegal.reference-type.cpp"
 												},
 												{
-													"match": "\\*",
-													"name": "comment.block.cpp"
+													"match": "\\&",
+													"name": "storage.modifier.reference.cpp"
 												}
 											]
 										},
-										"6": {
-											"name": "storage.modifier.pointer.cpp"
-										},
-										"7": {
+										"2": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"8": {
+										"3": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"9": {
+										"4": {
 											"name": "comment.block.cpp"
 										},
-										"10": {
+										"5": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -10026,23 +11656,20 @@
 												}
 											]
 										},
-										"11": {
-											"name": "storage.modifier.reference.cpp"
-										},
-										"12": {
+										"6": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"13": {
+										"7": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"14": {
+										"8": {
 											"name": "comment.block.cpp"
 										},
-										"15": {
+										"9": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -10054,20 +11681,20 @@
 												}
 											]
 										},
-										"16": {
+										"10": {
 											"patterns": [
 												{
 													"include": "#inline_comment"
 												}
 											]
 										},
-										"17": {
+										"11": {
 											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 										},
-										"18": {
+										"12": {
 											"name": "comment.block.cpp"
 										},
-										"19": {
+										"13": {
 											"patterns": [
 												{
 													"match": "\\*\\/",
@@ -10079,7 +11706,7 @@
 												}
 											]
 										},
-										"20": {
+										"14": {
 											"name": "entity.name.type.alias.cpp"
 										}
 									}
@@ -10094,7 +11721,7 @@
 			]
 		},
 		"struct_declare": {
-			"match": "(struct)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
+			"match": "(struct)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
 			"captures": {
 				"1": {
 					"name": "storage.type.struct.declare.cpp"
@@ -10127,76 +11754,63 @@
 				"6": {
 					"name": "entity.name.type.struct.cpp"
 				},
-				"8": {
+				"7": {
 					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"10": {
-					"name": "comment.block.cpp"
-				},
-				"11": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
 						{
 							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"12": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"13": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"14": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"15": {
-					"name": "comment.block.cpp"
-				},
-				"16": {
-					"patterns": [
+							"name": "storage.modifier.pointer.cpp"
+						},
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				"17": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"18": {
+				"8": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"19": {
+				"9": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"20": {
+				"10": {
 					"name": "comment.block.cpp"
 				},
-				"21": {
+				"11": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10208,20 +11822,20 @@
 						}
 					]
 				},
-				"22": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10233,20 +11847,20 @@
 						}
 					]
 				},
-				"26": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10258,23 +11872,23 @@
 						}
 					]
 				},
-				"30": {
+				"20": {
 					"name": "variable.other.object.declare.cpp"
 				},
-				"31": {
+				"21": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"23": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"24": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10289,7 +11903,7 @@
 			}
 		},
 		"union_declare": {
-			"match": "(union)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
+			"match": "(union)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
 			"captures": {
 				"1": {
 					"name": "storage.type.union.declare.cpp"
@@ -10322,76 +11936,63 @@
 				"6": {
 					"name": "entity.name.type.union.cpp"
 				},
-				"8": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"10": {
-					"name": "comment.block.cpp"
-				},
-				"11": {
+				"7": {
 					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
 						{
 							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"12": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"13": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"14": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"15": {
-					"name": "comment.block.cpp"
-				},
-				"16": {
-					"patterns": [
+							"name": "storage.modifier.pointer.cpp"
+						},
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				"17": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"18": {
+				"8": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"19": {
+				"9": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"20": {
+				"10": {
 					"name": "comment.block.cpp"
 				},
-				"21": {
+				"11": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10403,20 +12004,20 @@
 						}
 					]
 				},
-				"22": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10428,20 +12029,20 @@
 						}
 					]
 				},
-				"26": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10453,23 +12054,23 @@
 						}
 					]
 				},
-				"30": {
+				"20": {
 					"name": "variable.other.object.declare.cpp"
 				},
-				"31": {
+				"21": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"23": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"24": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10484,7 +12085,7 @@
 			}
 		},
 		"enum_declare": {
-			"match": "(enum)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
+			"match": "(enum)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
 			"captures": {
 				"1": {
 					"name": "storage.type.enum.declare.cpp"
@@ -10517,6 +12118,49 @@
 				"6": {
 					"name": "entity.name.type.enum.cpp"
 				},
+				"7": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
 				"8": {
 					"patterns": [
 						{
@@ -10543,75 +12187,19 @@
 					]
 				},
 				"12": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"13": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"14": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"15": {
-					"name": "comment.block.cpp"
-				},
-				"16": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"17": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"18": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"19": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"20": {
-					"name": "comment.block.cpp"
-				},
-				"21": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"22": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"23": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10623,20 +12211,20 @@
 						}
 					]
 				},
-				"26": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10648,23 +12236,23 @@
 						}
 					]
 				},
-				"30": {
+				"20": {
 					"name": "variable.other.object.declare.cpp"
 				},
-				"31": {
+				"21": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"23": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"24": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10679,7 +12267,7 @@
 			}
 		},
 		"class_declare": {
-			"match": "(class)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
+			"match": "(class)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\b(?!final\\W|final\\$|override\\W|override\\$)((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\S)(?!:)",
 			"captures": {
 				"1": {
 					"name": "storage.type.class.declare.cpp"
@@ -10712,76 +12300,63 @@
 				"6": {
 					"name": "entity.name.type.class.cpp"
 				},
-				"8": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"10": {
-					"name": "comment.block.cpp"
-				},
-				"11": {
+				"7": {
 					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
 						{
 							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"12": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"13": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"14": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"15": {
-					"name": "comment.block.cpp"
-				},
-				"16": {
-					"patterns": [
+							"name": "storage.modifier.pointer.cpp"
+						},
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				"17": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"18": {
+				"8": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"19": {
+				"9": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"20": {
+				"10": {
 					"name": "comment.block.cpp"
 				},
-				"21": {
+				"11": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10793,20 +12368,20 @@
 						}
 					]
 				},
-				"22": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10818,20 +12393,20 @@
 						}
 					]
 				},
-				"26": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10843,23 +12418,23 @@
 						}
 					]
 				},
-				"30": {
+				"20": {
 					"name": "variable.other.object.declare.cpp"
 				},
-				"31": {
+				"21": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"23": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"24": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10890,7 +12465,7 @@
 			]
 		},
 		"parameter_struct": {
-			"match": "(struct)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
+			"match": "(struct)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.struct.parameter.cpp"
@@ -10948,6 +12523,49 @@
 						}
 					]
 				},
+				"11": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
 				"12": {
 					"patterns": [
 						{
@@ -10974,22 +12592,19 @@
 					]
 				},
 				"16": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"18": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"19": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11001,23 +12616,20 @@
 						}
 					]
 				},
-				"21": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"22": {
+				"20": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"21": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"22": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"23": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11029,20 +12641,23 @@
 						}
 					]
 				},
-				"26": {
+				"24": {
+					"name": "variable.other.object.declare.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"26": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"27": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"28": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11054,48 +12669,20 @@
 						}
 					]
 				},
-				"30": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"31": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"32": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"33": {
-					"name": "comment.block.cpp"
-				},
-				"34": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"35": {
+				"29": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"36": {
+				"30": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"37": {
+				"31": {
 					"name": "comment.block.cpp"
 				},
-				"38": {
+				"32": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11107,20 +12694,20 @@
 						}
 					]
 				},
-				"39": {
+				"33": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"40": {
+				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"41": {
+				"35": {
 					"name": "comment.block.cpp"
 				},
-				"42": {
+				"36": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11135,7 +12722,7 @@
 			}
 		},
 		"parameter_enum": {
-			"match": "(enum)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
+			"match": "(enum)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.enum.parameter.cpp"
@@ -11193,48 +12780,63 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"14": {
-					"name": "comment.block.cpp"
-				},
-				"15": {
-					"patterns": [
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				"16": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"17": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"18": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"19": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11246,23 +12848,20 @@
 						}
 					]
 				},
-				"21": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"22": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11274,20 +12873,20 @@
 						}
 					]
 				},
-				"26": {
+				"20": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"21": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"22": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"23": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11299,23 +12898,23 @@
 						}
 					]
 				},
-				"30": {
+				"24": {
 					"name": "variable.other.object.declare.cpp"
 				},
-				"31": {
+				"25": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"26": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"27": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"28": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11327,20 +12926,20 @@
 						}
 					]
 				},
-				"35": {
+				"29": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"36": {
+				"30": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"37": {
+				"31": {
 					"name": "comment.block.cpp"
 				},
-				"38": {
+				"32": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11352,20 +12951,20 @@
 						}
 					]
 				},
-				"39": {
+				"33": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"40": {
+				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"41": {
+				"35": {
 					"name": "comment.block.cpp"
 				},
-				"42": {
+				"36": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11380,7 +12979,7 @@
 			}
 		},
 		"parameter_union": {
-			"match": "(union)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
+			"match": "(union)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.union.parameter.cpp"
@@ -11438,48 +13037,63 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"14": {
-					"name": "comment.block.cpp"
-				},
-				"15": {
-					"patterns": [
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				"16": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"17": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"18": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"19": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11491,23 +13105,20 @@
 						}
 					]
 				},
-				"21": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"22": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11519,20 +13130,20 @@
 						}
 					]
 				},
-				"26": {
+				"20": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"21": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"22": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"23": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11544,23 +13155,23 @@
 						}
 					]
 				},
-				"30": {
+				"24": {
 					"name": "variable.other.object.declare.cpp"
 				},
-				"31": {
+				"25": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"26": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"27": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"28": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11572,20 +13183,20 @@
 						}
 					]
 				},
-				"35": {
+				"29": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"36": {
+				"30": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"37": {
+				"31": {
 					"name": "comment.block.cpp"
 				},
-				"38": {
+				"32": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11597,20 +13208,20 @@
 						}
 					]
 				},
-				"39": {
+				"33": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"40": {
+				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"41": {
+				"35": {
 					"name": "comment.block.cpp"
 				},
-				"42": {
+				"36": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11625,7 +13236,7 @@
 			}
 		},
 		"parameter_class": {
-			"match": "(class)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\*(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\*|\\&))?)*)((?:&(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\&))?){0,2})((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?)((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
+			"match": "(class)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?=,|\\)|\\n)",
 			"captures": {
 				"1": {
 					"name": "storage.type.class.parameter.cpp"
@@ -11683,15 +13294,58 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
+				"12": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"13": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"14": {
 					"name": "comment.block.cpp"
@@ -11709,22 +13363,19 @@
 					]
 				},
 				"16": {
-					"name": "storage.modifier.pointer.cpp"
-				},
-				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"18": {
+				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"19": {
+				"18": {
 					"name": "comment.block.cpp"
 				},
-				"20": {
+				"19": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11736,23 +13387,20 @@
 						}
 					]
 				},
-				"21": {
-					"name": "storage.modifier.reference.cpp"
-				},
-				"22": {
+				"20": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"21": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"22": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"23": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11764,20 +13412,23 @@
 						}
 					]
 				},
-				"26": {
+				"24": {
+					"name": "variable.other.object.declare.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"27": {
+				"26": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"28": {
+				"27": {
 					"name": "comment.block.cpp"
 				},
-				"29": {
+				"28": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11789,23 +13440,45 @@
 						}
 					]
 				},
+				"29": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
 				"30": {
-					"name": "variable.other.object.declare.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"31": {
+					"name": "comment.block.cpp"
+				},
+				"32": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"33": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"32": {
+				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"33": {
+				"35": {
 					"name": "comment.block.cpp"
 				},
-				"34": {
+				"36": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11816,46 +13489,4671 @@
 							"name": "comment.block.cpp"
 						}
 					]
+				}
+			}
+		},
+		"over_qualified_types": {
+			"patterns": [
+				{
+					"include": "#parameter_struct"
 				},
-				"35": {
+				{
+					"include": "#parameter_enum"
+				},
+				{
+					"include": "#parameter_union"
+				},
+				{
+					"include": "#parameter_class"
+				}
+			]
+		},
+		"hacky_fix_for_stray_directive": {
+			"match": "(?<!\\w)#(?:endif|else|elif)(?!\\w)",
+			"name": "keyword.control.directive.$0.cpp"
+		},
+		"single_line_macro": {
+			"match": "^((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))#define.*(?<![\\\\])(?:\\n|$)",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"include": "#meta_preprocessor_macro"
+						},
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#string_context"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#operators"
+						},
+						{
+							"include": "#semicolon"
+						}
+					]
+				},
+				"1": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"36": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"37": {
-					"name": "comment.block.cpp"
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"3": {
+					"name": "comment.block.cpp"
+				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			}
+		},
+		"assembly": {
+			"name": "meta.asm.cpp",
+			"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.type.asm.cpp"
+				},
+				"2": {
+					"name": "storage.modifier.cpp"
+				},
+				"3": {
+					"name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"name": "string.quoted.double.cpp",
+					"contentName": "meta.embedded.assembly.cpp",
+					"begin": "(R?)(\")",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.encoding.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.string.begin.assembly.cpp"
+						}
+					},
+					"end": "(\")",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.assembly.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "source.asm"
+						},
+						{
+							"include": "source.x86"
+						},
+						{
+							"include": "source.x86_64"
+						},
+						{
+							"include": "source.arm"
+						},
+						{
+							"include": "#backslash_escapes"
+						},
+						{
+							"include": "#string_escaped_char"
+						},
+						{
+							"match": "(?=not)possible"
+						}
+					]
+				},
+				{
+					"begin": "(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
+						}
+					},
+					"end": "(\\))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.parens.end.bracket.round.assembly.inner.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
+				},
+				{
+					"match": ":",
+					"name": "punctuation.separator.delimiter.colon.assembly.cpp"
+				},
+				{
+					"include": "#comments_context"
+				},
+				{
+					"include": "#comments"
+				}
+			]
+		},
+		"backslash_escapes": {
+			"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?]   |\n[0-3]\\d{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
+			"name": "constant.character.escape.cpp"
+		},
+		"square_brackets": {
+			"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": "#evaluation_context"
+				}
+			]
+		},
+		"empty_square_brackets": {
+			"name": "storage.modifier.array.bracket.square.cpp",
+			"match": "(?-mix:(?-mix:(?<!delete))\\\\[\\\\s*\\\\])"
+		},
+		"misc_storage_modifiers": {
+			"match": "\\b(?:export|mutable|typename|thread_local|register|restrict|static|volatile|inline)\\b",
+			"name": "storage.modifier.$0.cpp"
+		},
+		"meta_preprocessor_macro": {
+			"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": "#macro_context"
+				}
+			]
+		},
+		"meta_preprocessor_diagnostic": {
+			"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"
+						}
+					]
+				}
+			]
+		},
+		"meta_preprocessor_include": {
+			"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"
+				}
+			]
+		},
+		"meta_preprocessor_line": {
+			"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": "#string_context_c"
+				},
+				{
+					"include": "#number_literal"
+				},
+				{
+					"include": "#line_continuation_character"
+				}
+			]
+		},
+		"meta_preprocessor_undef": {
+			"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"
+				}
+			]
+		},
+		"meta_preprocessor_pragma": {
+			"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": "#string_context_c"
+				},
+				{
+					"match": "[a-zA-Z_$][\\w\\-$]*",
+					"name": "entity.other.attribute-name.pragma.preprocessor.cpp"
+				},
+				{
+					"include": "#number_literal"
+				},
+				{
+					"include": "#line_continuation_character"
+				}
+			]
+		},
+		"string_context": {
+			"patterns": [
+				{
+					"name": "string.quoted.double.cpp",
+					"begin": "(((?:u|u8|U|L)?)\")",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"2": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"end": "(\")",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"match": "(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8})",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"match": "\\\\['\"?\\\\abfnrtv]",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"match": "\\\\[0-7]{1,3}",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"match": "\\\\x[0-9a-fA-F]{2,2}",
+							"name": "constant.character.escape.cpp"
+						},
+						{
+							"include": "#string_escapes_context_c"
+						}
+					]
+				},
+				{
+					"name": "string.quoted.single.cpp",
+					"begin": "((?<![0-9A-Fa-f])((?:u|u8|U|L)?)')",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"2": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"end": "(')",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#string_escapes_context_c"
+						},
+						{
+							"include": "#line_continuation_character"
+						}
+					]
+				},
+				{
+					"begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						},
+						"3": {
+							"name": "invalid.illegal.delimiter-too-long.cpp"
+						}
+					},
+					"end": "\\)\\2(\\3)\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						},
+						"1": {
+							"name": "invalid.illegal.delimiter-too-long.cpp"
+						}
+					},
+					"name": "string.quoted.double.raw.cpp"
+				}
+			]
+		},
+		"block": {
+			"name": "meta.block.cpp",
+			"begin": "({)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.block.begin.bracket.curly.cpp"
+				}
+			},
+			"end": "(}|(?=\\s*#\\s*(?:elif|else|endif)\\b))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.block.end.bracket.curly.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#function_body_context"
+				}
+			]
+		},
+		"disabled": {
+			"begin": "^\\s*#\\s*if(n?def)?\\b.*$",
+			"end": "^\\s*#\\s*endif\\b",
+			"patterns": [
+				{
+					"include": "#disabled"
+				},
+				{
+					"include": "#pragma_mark"
+				}
+			]
+		},
+		"line_continuation_character": {
+			"match": "(\\\\)\\n",
+			"captures": {
+				"1": {
+					"name": "constant.character.escape.line-continuation.cpp"
+				}
+			}
+		},
+		"parentheses": {
+			"name": "meta.parens.cpp",
+			"begin": "(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.parens.begin.bracket.round.cpp"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.parens.end.bracket.round.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#over_qualified_types"
+				},
+				{
+					"match": "(?<!:):(?!:)",
+					"name": "punctuation.separator.colon.range-based.cpp"
+				},
+				{
+					"include": "#evaluation_context"
+				}
+			]
+		},
+		"pragma_mark": {
+			"captures": {
+				"1": {
+					"name": "meta.preprocessor.pragma.cpp"
+				},
+				"2": {
+					"name": "keyword.control.directive.pragma.pragma-mark.cpp"
+				},
+				"3": {
+					"name": "punctuation.definition.directive.cpp"
+				},
+				"4": {
+					"name": "entity.name.tag.pragma-mark.cpp"
+				}
+			},
+			"match": "^\\s*(((#)\\s*pragma\\s+mark)\\s+(.*))",
+			"name": "meta.section.cpp"
+		},
+		"string_context_c": {
+			"patterns": [
+				{
+					"begin": "\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						}
+					},
+					"end": "\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.double.cpp",
+					"patterns": [
+						{
+							"include": "#string_escapes_context_c"
+						},
+						{
+							"include": "#line_continuation_character"
+						}
+					]
+				},
+				{
+					"begin": "(?-mix:(?<![\\da-fA-F])')",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						}
+					},
+					"end": "'",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.single.cpp",
+					"patterns": [
+						{
+							"include": "#string_escapes_context_c"
+						},
+						{
+							"include": "#line_continuation_character"
+						}
+					]
+				}
+			]
+		},
+		"string_escapes_context_c": {
+			"patterns": [
+				{
+					"include": "#backslash_escapes"
+				},
+				{
+					"match": "\\\\.",
+					"name": "invalid.illegal.unknown-escape.cpp"
+				},
+				{
+					"match": "(?x) %\n(\\d+\\$)?\t\t\t\t\t\t   # field (argument #)\n[#0\\- +']*\t\t\t\t\t\t  # flags\n[,;:_]?\t\t\t\t\t\t\t  # separator character (AltiVec)\n((-?\\d+)|\\*(-?\\d+\\$)?)?\t\t  # minimum field width\n(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?\t# precision\n(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n[diouxXDOUeEfFgGaACcSspn%]\t\t   # conversion type",
+					"name": "constant.other.placeholder.cpp"
+				}
+			]
+		},
+		"vararg_ellipses": {
+			"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
+			"name": "punctuation.vararg-ellipses.cpp"
+		},
+		"preprocessor_rule_conditional": {
+			"begin": "^\\s*((#)\\s*if(?:n?def)?\\b)",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "^\\s*((#)\\s*endif\\b)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor_rule_enabled_elif"
+				},
+				{
+					"include": "#preprocessor_rule_enabled_else"
+				},
+				{
+					"include": "#preprocessor_rule_disabled_elif"
+				},
+				{
+					"begin": "^\\s*((#)\\s*elif\\b)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"preprocessor_rule_conditional_block": {
+			"begin": "^\\s*((#)\\s*if(?:n?def)?\\b)",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "^\\s*((#)\\s*endif\\b)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor_rule_enabled_elif_block"
+				},
+				{
+					"include": "#preprocessor_rule_enabled_else_block"
+				},
+				{
+					"include": "#preprocessor_rule_disabled_elif"
+				},
+				{
+					"begin": "^\\s*((#)\\s*elif\\b)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"preprocessor_rule_conditional_line_context": {
+			"patterns": [
+				{
+					"match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				{
+					"match": "\\bdefined\\b",
+					"name": "invalid.illegal.macro-name.cpp"
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#string_context_c"
+				},
+				{
+					"include": "#number_literal"
+				},
+				{
+					"begin": "\\?",
+					"beginCaptures": {
+						"0": {
+							"name": "keyword.operator.ternary.cpp"
+						}
+					},
+					"end": ":",
+					"endCaptures": {
+						"0": {
+							"name": "keyword.operator.ternary.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#operators"
+				},
+				{
+					"include": "#language_constants"
+				},
+				{
+					"match": "(?-mix:[a-zA-Z_$][\\w$]*)",
+					"name": "entity.name.function.preprocessor.cpp"
+				},
+				{
+					"include": "#line_continuation_character"
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.cpp"
+						}
+					},
+					"end": "\\)|(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.end.bracket.round.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_disabled": {
+			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "^\\s*((#)\\s*endif\\b)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#preprocessor_rule_enabled_elif"
+				},
+				{
+					"include": "#preprocessor_rule_enabled_else"
+				},
+				{
+					"include": "#preprocessor_rule_disabled_elif"
+				},
+				{
+					"begin": "^\\s*((#)\\s*elif\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.cpp"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+					"patterns": [
+						{
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+							"name": "meta.preprocessor.cpp",
+							"patterns": [
+								{
+									"include": "#preprocessor_rule_conditional_line_context"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"contentName": "comment.block.preprocessor.if-branch.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_disabled_block": {
+			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "^\\s*((#)\\s*endif\\b)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#preprocessor_rule_enabled_elif_block"
+				},
+				{
+					"include": "#preprocessor_rule_enabled_else_block"
+				},
+				{
+					"include": "#preprocessor_rule_disabled_elif"
+				},
+				{
+					"begin": "^\\s*((#)\\s*elif\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.cpp"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+					"patterns": [
+						{
+							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+							"name": "meta.preprocessor.cpp",
+							"patterns": [
+								{
+									"include": "#preprocessor_rule_conditional_line_context"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"contentName": "comment.block.preprocessor.if-branch.in-block.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_disabled_elif": {
+			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"contentName": "comment.block.preprocessor.elif-branch.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_enabled": {
+			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				},
+				"3": {
+					"name": "constant.numeric.preprocessor.cpp"
+				}
+			},
+			"end": "^\\s*((#)\\s*endif\\b)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "^\\s*((#)\\s*else\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.cpp"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=^\\s*((#)\\s*endif\\b))",
+					"contentName": "comment.block.preprocessor.else-branch.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				},
+				{
+					"begin": "^\\s*((#)\\s*elif\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.cpp"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"contentName": "comment.block.preprocessor.if-branch.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_enabled_block": {
+			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "^\\s*((#)\\s*endif\\b)",
+			"endCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "^\\s*((#)\\s*else\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.cpp"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=^\\s*((#)\\s*endif\\b))",
+					"contentName": "comment.block.preprocessor.else-branch.in-block.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				},
+				{
+					"begin": "^\\s*((#)\\s*elif\\b)",
+					"beginCaptures": {
+						"0": {
+							"name": "meta.preprocessor.cpp"
+						},
+						"1": {
+							"name": "keyword.control.directive.conditional.cpp"
+						},
+						"2": {
+							"name": "punctuation.definition.directive.cpp"
+						}
+					},
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"contentName": "comment.block.preprocessor.if-branch.in-block.cpp",
+					"patterns": [
+						{
+							"include": "#disabled"
+						},
+						{
+							"include": "#pragma_mark"
+						}
+					]
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_enabled_elif": {
+			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+					"patterns": [
+						{
+							"begin": "^\\s*((#)\\s*(else)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.cpp"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.cpp"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.cpp"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*endif\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.cpp",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma_mark"
+								}
+							]
+						},
+						{
+							"begin": "^\\s*((#)\\s*(elif)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.cpp"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.cpp"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.cpp"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.cpp",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma_mark"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_enabled_elif_block": {
+			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
+			"patterns": [
+				{
+					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
+					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
+					"name": "meta.preprocessor.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_conditional_line_context"
+						}
+					]
+				},
+				{
+					"include": "#comments"
+				},
+				{
+					"begin": "\\n",
+					"end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+					"patterns": [
+						{
+							"begin": "^\\s*((#)\\s*(else)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.cpp"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.cpp"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.cpp"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*endif\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.in-block.cpp",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma_mark"
+								}
+							]
+						},
+						{
+							"begin": "^\\s*((#)\\s*(elif)\\b)",
+							"beginCaptures": {
+								"0": {
+									"name": "meta.preprocessor.cpp"
+								},
+								"1": {
+									"name": "keyword.control.directive.conditional.cpp"
+								},
+								"2": {
+									"name": "punctuation.definition.directive.cpp"
+								}
+							},
+							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+							"contentName": "comment.block.preprocessor.elif-branch.cpp",
+							"patterns": [
+								{
+									"include": "#disabled"
+								},
+								{
+									"include": "#pragma_mark"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"preprocessor_rule_enabled_else": {
+			"begin": "^\\s*((#)\\s*else\\b)",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
+			"patterns": [
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"preprocessor_rule_enabled_else_block": {
+			"begin": "^\\s*((#)\\s*else\\b)",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.preprocessor.cpp"
+				},
+				"1": {
+					"name": "keyword.control.directive.conditional.cpp"
+				},
+				"2": {
+					"name": "punctuation.definition.directive.cpp"
+				}
+			},
+			"end": "(?=^\\s*((#)\\s*endif\\b))",
+			"patterns": [
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"preprocessor_rule_define_line_context": {
+			"patterns": [
+				{
+					"include": "#vararg_ellipses"
+				},
+				{
+					"include": "#macro_argument"
+				},
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.block.begin.bracket.curly.cpp"
+						}
+					},
+					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.block.end.bracket.curly.cpp"
+						}
+					},
+					"name": "meta.block.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_define_line_blocks_context"
+						}
+					]
+				},
+				{
+					"match": "\\(",
+					"name": "punctuation.section.parens.begin.bracket.round.cpp"
+				},
+				{
+					"match": "\\)",
+					"name": "punctuation.section.parens.end.bracket.round.cpp"
+				},
+				{
+					"begin": "(?x)\n(?<![\\w$]|\\[)(?!(?: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|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
+					"end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
+					"name": "meta.function.cpp",
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_define_line_functions_context"
+						}
+					]
+				},
+				{
+					"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": "#string_escapes_context_c"
+						},
+						{
+							"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": "#string_escapes_context_c"
+						},
+						{
+							"include": "#line_continuation_character"
+						}
+					]
+				},
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"preprocessor_rule_define_line_blocks_context": {
+			"patterns": [
+				{
+					"begin": "{",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.block.begin.bracket.curly.cpp"
+						}
+					},
+					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.block.end.bracket.curly.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_define_line_blocks_context"
+						},
+						{
+							"include": "#preprocessor_rule_define_line_context"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor_rule_define_line_context"
+				}
+			]
+		},
+		"preprocessor_rule_define_line_functions_context": {
+			"patterns": [
+				{
+					"include": "#comments"
+				},
+				{
+					"include": "#storage_types"
+				},
+				{
+					"include": "#vararg_ellipses"
+				},
+				{
+					"include": "#method_access"
+				},
+				{
+					"include": "#member_access"
+				},
+				{
+					"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(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "entity.name.function.cpp"
+						},
+						"2": {
+							"name": "punctuation.section.arguments.begin.bracket.round.cpp"
+						}
+					},
+					"end": "(\\))|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.arguments.end.bracket.round.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_define_line_functions_context"
+						}
+					]
+				},
+				{
+					"begin": "\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.cpp"
+						}
+					},
+					"end": "(\\))|(?<!\\\\)(?=\\s*\\n)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.parens.end.bracket.round.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#preprocessor_rule_define_line_functions_context"
+						}
+					]
+				},
+				{
+					"include": "#preprocessor_rule_define_line_context"
+				}
+			]
+		},
+		"macro_safe_constructor_root": {
+			"name": "meta.function.definition.special.constructor.cpp",
+			"begin": "(\\s*+((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))::((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\13((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\()))",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.function.definition.special.constructor.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"6": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"8": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"9": {
+					"name": "comment.block.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.constructor.cpp"
+						},
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"12": {
+					"patterns": [
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+							"name": "entity.name.type.constructor.cpp"
+						},
+						{
+							"match": "(?<=:)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.function.definition.special.constructor.cpp"
+						},
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.constructor.cpp"
+						}
+					]
+				},
+				"14": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"15": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"16": {
+					"name": "comment.block.cpp"
+				},
+				"17": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"19": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"20": {
+					"name": "comment.block.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.head.function.definition.special.constructor.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#ever_present_context"
+						},
+						{
+							"patterns": [
+								{
+									"match": "(\\=)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(default)|(delete))",
+									"captures": {
+										"1": {
+											"name": "keyword.operator.assignment.cpp"
+										},
+										"2": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"4": {
+											"name": "comment.block.cpp"
+										},
+										"5": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"6": {
+											"name": "keyword.other.default.constructor.cpp"
+										},
+										"7": {
+											"name": "keyword.other.delete.constructor.cpp"
+										}
+									}
+								}
+							]
+						},
+						{
+							"include": "#functional_specifiers_pre_parameters"
+						},
+						{
+							"begin": "(:)",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.separator.initializers.cpp"
+								}
+							},
+							"end": "(?=\\{)",
+							"patterns": [
+								{
+									"contentName": "meta.parameter.initialization.cpp",
+									"begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\()",
+									"beginCaptures": {
+										"1": {
+											"name": "entity.name.function.call.initializer.cpp"
+										},
+										"2": {
+											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"end": "(\\))",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#evaluation_context"
+										}
+									]
+								},
+								{
+									"contentName": "meta.parameter.initialization.cpp",
+									"begin": "((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(\\{)",
+									"beginCaptures": {
+										"1": {
+											"name": "entity.name.function.call.initializer.cpp"
+										},
+										"2": {
+											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"end": "(\\})",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#evaluation_context"
+										}
+									]
+								},
+								{
+									"include": "#comma"
+								}
+							]
+						},
+						{
+							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
+							"begin": "(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#function_parameter_context"
+								},
+								{
+									"include": "#evaluation_context"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.body.function.definition.special.constructor.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function_body_context"
+						}
+					]
+				},
+				{
+					"name": "meta.tail.function.definition.special.constructor.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_destructor_root": {
+			"name": "meta.function.definition.special.member.destructor.cpp",
+			"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(((?>(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))::((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))~\\13((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\()))",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.function.definition.special.member.destructor.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"6": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"8": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"9": {
+					"name": "comment.block.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.destructor.cpp"
+						},
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"12": {
+					"patterns": [
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?=:)",
+							"name": "entity.name.type.destructor.cpp"
+						},
+						{
+							"match": "(?<=:)~(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.function.definition.special.member.destructor.cpp"
+						},
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.destructor.cpp"
+						}
+					]
+				},
+				"14": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"15": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"16": {
+					"name": "comment.block.cpp"
+				},
+				"17": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"19": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"20": {
+					"name": "comment.block.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.head.function.definition.special.member.destructor.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#ever_present_context"
+						},
+						{
+							"patterns": [
+								{
+									"match": "(\\=)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(default)|(delete))",
+									"captures": {
+										"1": {
+											"name": "keyword.operator.assignment.cpp"
+										},
+										"2": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"4": {
+											"name": "comment.block.cpp"
+										},
+										"5": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"6": {
+											"name": "keyword.other.default.constructor.cpp"
+										},
+										"7": {
+											"name": "keyword.other.delete.constructor.cpp"
+										}
+									}
+								}
+							]
+						},
+						{
+							"contentName": "meta.function.definition.parameters.special.member.destructor.cpp",
+							"begin": "(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
+								}
+							}
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.body.function.definition.special.member.destructor.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function_body_context"
+						}
+					]
+				},
+				{
+					"name": "meta.tail.function.definition.special.member.destructor.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_function_definition": {
+			"name": "meta.function.definition.cpp",
+			"begin": "((?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:((?<!\\w)template(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:((?<!\\w)(?:(?:inline|constexpr|mutable|friend|explicit|virtual)|(?:const|static|volatile|register|restrict|extern))(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?<!\\Wnot|^not|\\Wcompl|^compl|\\Wsizeof|^sizeof|\\Wnew|^new|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wxor|^xor|\\Wbitor|^bitor|\\Wand|^and|\\Wor|^or|\\Wthrow|^throw|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wor_eq|^or_eq|\\Walignof|^alignof|\\Walignas|^alignas|\\Wtypeid|^typeid|\\Wnoexcept|^noexcept|\\Wnoexcept|^noexcept|\\Wstatic_cast|^static_cast|\\Wdynamic_cast|^dynamic_cast|\\Wconst_cast|^const_cast|\\Wreinterpret_cast|^reinterpret_cast|\\Wwhile|^while|\\Wfor|^for|\\Wdo|^do|\\Wif|^if|\\Welse|^else|\\Wgoto|^goto|\\Wswitch|^switch|\\Wtry|^try|\\Wcatch|^catch|\\Wreturn|^return|\\Wbreak|^break|\\Wcase|^case|\\Wcontinue|^continue|\\Wdefault|^default|\\Wauto|^auto|\\Wvoid|^void|\\Wchar|^char|\\Wshort|^short|\\Wint|^int|\\Wsigned|^signed|\\Wunsigned|^unsigned|\\Wlong|^long|\\Wfloat|^float|\\Wdouble|^double|\\Wbool|^bool|\\Wwchar_t|^wchar_t|\\Wu_char|^u_char|\\Wu_short|^u_short|\\Wu_int|^u_int|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wuint|^uint|\\Wu_quad_t|^u_quad_t|\\Wquad_t|^quad_t|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wdiv_t|^div_t|\\Wdev_t|^dev_t|\\Wfixpt_t|^fixpt_t|\\Wblkcnt_t|^blkcnt_t|\\Wblksize_t|^blksize_t|\\Wgid_t|^gid_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wino_t|^ino_t|\\Wkey_t|^key_t|\\Wmode_t|^mode_t|\\Wnlink_t|^nlink_t|\\Wid_t|^id_t|\\Wpid_t|^pid_t|\\Woff_t|^off_t|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wuid_t|^uid_t|\\Wid_t|^id_t|\\Wclock_t|^clock_t|\\Wsize_t|^size_t|\\Wssize_t|^ssize_t|\\Wtime_t|^time_t|\\Wuseconds_t|^useconds_t|\\Wsuseconds_t|^suseconds_t|\\Wint8_t|^int8_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wuint16_t|^uint16_t|\\Wuint32_t|^uint32_t|\\Wuint64_t|^uint64_t|\\Wint_least8_t|^int_least8_t|\\Wint_least16_t|^int_least16_t|\\Wint_least32_t|^int_least32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_least8_t|^uint_least8_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wint_fast8_t|^int_fast8_t|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wuint_fast64_t|^uint_fast64_t|\\Wintptr_t|^intptr_t|\\Wuintptr_t|^uintptr_t|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wfalse|^false|\\Wnullptr|^nullptr|\\Wclass|^class|\\Wstruct|^struct|\\Wunion|^union|\\Wenum|^enum|\\Wconst|^const|\\Wstatic|^static|\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wextern|^extern|\\Winline|^inline|\\Wconstexpr|^constexpr|\\Wmutable|^mutable|\\Wfriend|^friend|\\Wexplicit|^explicit|\\Wvirtual|^virtual|\\Wvolatile|^volatile|\\Wconst|^const|\\Wnoexcept|^noexcept|\\Wconstexpr|^constexpr|\\Wmutable|^mutable|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprivate|^private|\\Wprotected|^protected|\\Wpublic|^public|\\Wthis|^this|\\Wtemplate|^template|\\Wnamespace|^namespace|\\Wusing|^using|\\Woperator|^operator|\\Wtypedef|^typedef|\\Wdecltype|^decltype|\\Wtypename|^typename|\\Wasm|^asm|\\W__asm__|^__asm__|\\Wconcept|^concept|\\Wrequires|^requires|\\Wexport|^export|\\Wthread_local|^thread_local|\\Watomic_cancel|^atomic_cancel|\\Watomic_commit|^atomic_commit|\\Watomic_noexcept|^atomic_noexcept|\\Wco_await|^co_await|\\Wco_return|^co_return|\\Wco_yield|^co_yield|\\Wimport|^import|\\Wmodule|^module|\\Wreflexpr|^reflexpr|\\Wsynchronized|^synchronized)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\())",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.function.definition.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"6": {
+					"name": "storage.type.template.cpp"
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"8": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"9": {
+					"name": "comment.block.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "storage.modifier.$11.cpp"
+				},
+				"12": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"13": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"14": {
+					"name": "comment.block.cpp"
+				},
+				"15": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"16": {
+					"name": "meta.qualified_type.cpp",
+					"patterns": [
+						{
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
+						}
+					]
+				},
+				"17": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"19": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"20": {
+					"name": "comment.block.cpp"
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"27": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
+				},
+				"28": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"29": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"30": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"31": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"32": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"33": {
+					"name": "comment.block.cpp"
+				},
+				"34": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"35": {
+					"name": "entity.name.type.cpp"
+				},
+				"36": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
+				"37": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"38": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"39": {
+					"name": "comment.block.cpp"
+				},
+				"40": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"41": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"42": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"43": {
+					"name": "comment.block.cpp"
+				},
+				"44": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"45": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"46": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"47": {
+					"name": "comment.block.cpp"
+				},
+				"48": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"49": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"50": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"51": {
+					"name": "comment.block.cpp"
+				},
+				"52": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"53": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"54": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"55": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"56": {
+					"name": "comment.block.cpp"
+				},
+				"57": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"58": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_function_definition_inner_generated"
+						}
+					]
+				},
+				"59": {
+					"name": "entity.name.function.definition.cpp"
+				},
+				"60": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"61": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"62": {
+					"name": "comment.block.cpp"
+				},
+				"63": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.head.function.definition.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#ever_present_context"
+						},
+						{
+							"contentName": "meta.function.definition.parameters.cpp",
+							"begin": "(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.begin.bracket.round.cpp"
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.end.bracket.round.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#ever_present_context"
+								},
+								{
+									"include": "#parameter_or_maybe_value"
+								},
+								{
+									"include": "#comma"
+								},
+								{
+									"include": "#evaluation_context"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.body.function.definition.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.function.definition.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function_body_context"
+						}
+					]
+				},
+				{
+					"name": "meta.tail.function.definition.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_operator_overload": {
+			"name": "meta.function.definition.special.operator-overload.cpp",
+			"begin": "((?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(operator)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*)(?:(?:((?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|new|new\\[\\]|delete|delete\\[\\]|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,))|((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?:\\[\\])?)))|(\"\")((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=\\<|\\())",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.function.definition.special.operator-overload.cpp"
+				},
+				"2": {
+					"name": "meta.qualified_type.cpp",
+					"patterns": [
+						{
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
+						}
+					]
+				},
+				"3": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
+				"4": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"5": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"6": {
+					"name": "comment.block.cpp"
+				},
+				"7": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"10": {
+					"name": "comment.block.cpp"
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"13": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
+				},
+				"14": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"15": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"16": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"17": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"18": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"19": {
+					"name": "comment.block.cpp"
+				},
+				"20": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"21": {
+					"name": "entity.name.type.cpp"
+				},
+				"22": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
+						}
+					]
+				},
+				"23": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"24": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"25": {
+					"name": "comment.block.cpp"
+				},
+				"26": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"27": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"28": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"29": {
+					"name": "comment.block.cpp"
+				},
+				"30": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"31": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"32": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"33": {
+					"name": "comment.block.cpp"
+				},
+				"34": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"35": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"36": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"37": {
+					"name": "comment.block.cpp"
+				},
+				"38": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"39": {
+					"name": "storage.type.modifier.calling-convention.cpp"
+				},
+				"40": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"41": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"42": {
+					"name": "comment.block.cpp"
+				},
+				"43": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"44": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"45": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"46": {
+					"name": "comment.block.cpp"
+				},
+				"47": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"48": {
+					"patterns": [
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.operator.cpp"
+						},
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"49": {
+					"name": "keyword.other.operator.overload.cpp"
+				},
+				"50": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"51": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"52": {
+					"name": "comment.block.cpp"
+				},
+				"53": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"54": {
+					"patterns": [
+						{
+							"match": "::",
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.operator-overload.cpp"
+						},
+						{
+							"match": "(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)",
+							"name": "entity.name.scope-resolution.operator-overload.cpp"
+						},
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"55": {
+					"name": "entity.name.operator.cpp"
+				},
+				"56": {
+					"name": "entity.name.operator.type.cpp"
+				},
+				"57": {
+					"patterns": [
+						{
+							"match": "\\*",
+							"name": "entity.name.operator.type.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "entity.name.operator.type.reference.cpp"
+						}
+					]
+				},
+				"58": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"59": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"60": {
+					"name": "comment.block.cpp"
+				},
+				"61": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"62": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"63": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"64": {
+					"name": "comment.block.cpp"
+				},
+				"65": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"66": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"67": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"68": {
+					"name": "comment.block.cpp"
+				},
+				"69": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"70": {
+					"name": "entity.name.operator.type.array.cpp"
+				},
+				"71": {
+					"name": "entity.name.operator.custom-literal.cpp"
+				},
+				"72": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"73": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"74": {
+					"name": "comment.block.cpp"
+				},
+				"75": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"76": {
+					"name": "entity.name.operator.custom-literal.cpp"
+				},
+				"77": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"78": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"79": {
+					"name": "comment.block.cpp"
+				},
+				"80": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.head.function.definition.special.operator-overload.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.operator-overload.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#ever_present_context"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"contentName": "meta.function.definition.parameters.special.operator-overload.cpp",
+							"begin": "(\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.begin.bracket.round.special.operator-overload.cpp"
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parameters.end.bracket.round.special.operator-overload.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#function_parameter_context"
+								},
+								{
+									"include": "#evaluation_context"
+								}
+							]
+						},
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.body.function.definition.special.operator-overload.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.operator-overload.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function_body_context"
+						}
+					]
+				},
+				{
+					"name": "meta.tail.function.definition.special.operator-overload.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_using_namespace": {
+			"name": "meta.using-namespace.cpp",
+			"begin": "(?<!\\w)(using)\\s+(namespace)\\s+((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)?((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))(?=;|\\n)",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.using.directive.cpp"
+				},
+				"2": {
+					"name": "keyword.other.namespace.directive.cpp storage.type.namespace.directive.cpp"
+				},
+				"3": {
+					"patterns": [
+						{
+							"include": "#scope_resolution_namespace_using_inner_generated"
+						}
+					]
+				},
+				"4": {
+					"name": "entity.name.namespace.cpp"
+				}
+			},
+			"end": "(;)|(?<!\\\\)$",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.terminator.statement.cpp"
+				}
+			}
+		},
+		"macro_safe_namespace_block": {
+			"name": "meta.block.namespace.cpp",
+			"begin": "(((?<!\\w)namespace(?!\\w)))",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.namespace.cpp"
+				},
+				"2": {
+					"name": "keyword.other.namespace.definition.cpp storage.type.namespace.definition.cpp"
+				}
+			},
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.head.namespace.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.namespace.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#ever_present_context"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"match": "((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))\\s*(?:(::)\\s*(inline))?",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#scope_resolution_namespace_block_inner_generated"
+										}
+									]
+								},
+								"2": {
+									"name": "entity.name.namespace.cpp"
+								},
+								"3": {
+									"name": "punctuation.separator.scope-resolution.namespace.block.cpp"
+								},
+								"4": {
+									"name": "storage.modifier.inline.cpp"
+								}
+							}
+						}
+					]
+				},
+				{
+					"name": "meta.body.namespace.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.namespace.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.tail.namespace.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_extern_block": {
+			"name": "meta.block.extern.cpp",
+			"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(extern)(?=\\s*\\\"))",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.extern.cpp"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"6": {
+					"name": "storage.type.extern.cpp"
+				}
+			},
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.terminator.statement.cpp"
+				},
+				"2": {
+					"name": "punctuation.terminator.statement.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"name": "meta.head.extern.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.extern.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.body.extern.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.extern.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"name": "meta.tail.extern.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				},
+				{
+					"include": "$base"
+				}
+			]
+		},
+		"macro_safe_typedef_class": {
+			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)class(?!\\w))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.typedef.cpp"
+				}
+			},
+			"end": "(?<=;)|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.block.class.cpp",
+					"begin": "((((?<!\\w)class(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(DLLEXPORT)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*,?\\s*(?:private|protected|public)?\\s*(?:\\s*,?\\s*(?!(?:private|protected|public))(?:\\s*+(?:(?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:(?:(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?:::))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])))+)*))?))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.head.class.cpp"
+						},
+						"3": {
+							"name": "storage.type.$3.cpp"
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"7": {
+							"name": "comment.block.cpp"
+						},
+						"8": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"9": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"12": {
+							"name": "comment.block.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"include": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
+						"15": {
+							"name": "entity.name.type.$3.cpp"
+						},
+						"16": {
+							"name": "storage.type.modifier.final.cpp"
+						},
+						"17": {
+							"name": "punctuation.separator.colon.inheritance.cpp"
+						},
+						"18": {
+							"patterns": [
+								{
+									"include": "#inheritance_context"
+								}
+							]
+						}
+					},
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"name": "meta.head.class.cpp",
+							"begin": "\\G ?",
+							"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#ever_present_context"
+								},
+								{
+									"include": "#inheritance_context"
+								},
+								{
+									"include": "#template_call_range"
+								}
+							]
+						},
+						{
+							"name": "meta.body.class.cpp",
+							"begin": "(?<=\\{|<%|\\?\\?<)",
+							"end": "(\\}|%>|\\?\\?>)",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.class.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#function_pointer"
+								},
+								{
+									"include": "#static_assert"
+								},
+								{
+									"include": "#constructor_inline"
+								},
+								{
+									"include": "#destructor_inline"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.class.cpp",
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"captures": {
+										"1": {
+											"patterns": [
+												{
+													"match": "\\*",
+													"name": "storage.modifier.pointer.cpp"
+												},
+												{
+													"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+													"captures": {
+														"1": {
+															"patterns": [
+																{
+																	"include": "#inline_comment"
+																}
+															]
+														},
+														"2": {
+															"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+														},
+														"3": {
+															"name": "comment.block.cpp"
+														},
+														"4": {
+															"patterns": [
+																{
+																	"match": "\\*\\/",
+																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+																},
+																{
+																	"match": "\\*",
+																	"name": "comment.block.cpp"
+																}
+															]
+														}
+													},
+													"name": "invalid.illegal.reference-type.cpp"
+												},
+												{
+													"match": "\\&",
+													"name": "storage.modifier.reference.cpp"
+												}
+											]
+										},
+										"2": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"4": {
+											"name": "comment.block.cpp"
+										},
+										"5": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"6": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"7": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"8": {
+											"name": "comment.block.cpp"
+										},
+										"9": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"10": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"11": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"12": {
+											"name": "comment.block.cpp"
+										},
+										"13": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"14": {
+											"name": "entity.name.type.alias.cpp"
+										}
+									}
+								},
+								{
+									"match": ","
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_typedef_struct": {
+			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)struct(?!\\w))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.typedef.cpp"
+				}
+			},
+			"end": "(?<=;)|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.block.struct.cpp",
+					"begin": "((((?<!\\w)struct(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(DLLEXPORT)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*,?\\s*(?:private|protected|public)?\\s*(?:\\s*,?\\s*(?!(?:private|protected|public))(?:\\s*+(?:(?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:(?:(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?:::))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])))+)*))?))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.head.struct.cpp"
+						},
+						"3": {
+							"name": "storage.type.$3.cpp"
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"7": {
+							"name": "comment.block.cpp"
+						},
+						"8": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"9": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"12": {
+							"name": "comment.block.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"include": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
+						"15": {
+							"name": "entity.name.type.$3.cpp"
+						},
+						"16": {
+							"name": "storage.type.modifier.final.cpp"
+						},
+						"17": {
+							"name": "punctuation.separator.colon.inheritance.cpp"
+						},
+						"18": {
+							"patterns": [
+								{
+									"include": "#inheritance_context"
+								}
+							]
+						}
+					},
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"name": "meta.head.struct.cpp",
+							"begin": "\\G ?",
+							"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#ever_present_context"
+								},
+								{
+									"include": "#inheritance_context"
+								},
+								{
+									"include": "#template_call_range"
+								}
+							]
+						},
+						{
+							"name": "meta.body.struct.cpp",
+							"begin": "(?<=\\{|<%|\\?\\?<)",
+							"end": "(\\}|%>|\\?\\?>)",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#function_pointer"
+								},
+								{
+									"include": "#static_assert"
+								},
+								{
+									"include": "#constructor_inline"
+								},
+								{
+									"include": "#destructor_inline"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.struct.cpp",
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"captures": {
+										"1": {
+											"patterns": [
+												{
+													"match": "\\*",
+													"name": "storage.modifier.pointer.cpp"
+												},
+												{
+													"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+													"captures": {
+														"1": {
+															"patterns": [
+																{
+																	"include": "#inline_comment"
+																}
+															]
+														},
+														"2": {
+															"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+														},
+														"3": {
+															"name": "comment.block.cpp"
+														},
+														"4": {
+															"patterns": [
+																{
+																	"match": "\\*\\/",
+																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+																},
+																{
+																	"match": "\\*",
+																	"name": "comment.block.cpp"
+																}
+															]
+														}
+													},
+													"name": "invalid.illegal.reference-type.cpp"
+												},
+												{
+													"match": "\\&",
+													"name": "storage.modifier.reference.cpp"
+												}
+											]
+										},
+										"2": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"4": {
+											"name": "comment.block.cpp"
+										},
+										"5": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"6": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"7": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"8": {
+											"name": "comment.block.cpp"
+										},
+										"9": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"10": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"11": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"12": {
+											"name": "comment.block.cpp"
+										},
+										"13": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"14": {
+											"name": "entity.name.type.alias.cpp"
+										}
+									}
+								},
+								{
+									"match": ","
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_typedef_union": {
+			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)union(?!\\w))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.other.typedef.cpp"
+				}
+			},
+			"end": "(?<=;)|(?<!\\\\)$",
+			"patterns": [
+				{
+					"name": "meta.block.union.cpp",
+					"begin": "((((?<!\\w)union(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(DLLEXPORT)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*,?\\s*(?:private|protected|public)?\\s*(?:\\s*,?\\s*(?!(?:private|protected|public))(?:\\s*+(?:(?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:(?:(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?:::))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])))+)*))?))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.head.union.cpp"
+						},
+						"3": {
+							"name": "storage.type.$3.cpp"
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"7": {
+							"name": "comment.block.cpp"
+						},
+						"8": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"9": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"12": {
+							"name": "comment.block.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"include": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
+						"15": {
+							"name": "entity.name.type.$3.cpp"
+						},
+						"16": {
+							"name": "storage.type.modifier.final.cpp"
+						},
+						"17": {
+							"name": "punctuation.separator.colon.inheritance.cpp"
+						},
+						"18": {
+							"patterns": [
+								{
+									"include": "#inheritance_context"
+								}
+							]
+						}
+					},
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"name": "meta.head.union.cpp",
+							"begin": "\\G ?",
+							"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#ever_present_context"
+								},
+								{
+									"include": "#inheritance_context"
+								},
+								{
+									"include": "#template_call_range"
+								}
+							]
+						},
+						{
+							"name": "meta.body.union.cpp",
+							"begin": "(?<=\\{|<%|\\?\\?<)",
+							"end": "(\\}|%>|\\?\\?>)",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.union.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#function_pointer"
+								},
+								{
+									"include": "#static_assert"
+								},
+								{
+									"include": "#constructor_inline"
+								},
+								{
+									"include": "#destructor_inline"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.union.cpp",
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"match": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
+									"captures": {
+										"1": {
+											"patterns": [
+												{
+													"match": "\\*",
+													"name": "storage.modifier.pointer.cpp"
+												},
+												{
+													"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+													"captures": {
+														"1": {
+															"patterns": [
+																{
+																	"include": "#inline_comment"
+																}
+															]
+														},
+														"2": {
+															"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+														},
+														"3": {
+															"name": "comment.block.cpp"
+														},
+														"4": {
+															"patterns": [
+																{
+																	"match": "\\*\\/",
+																	"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+																},
+																{
+																	"match": "\\*",
+																	"name": "comment.block.cpp"
+																}
+															]
+														}
+													},
+													"name": "invalid.illegal.reference-type.cpp"
+												},
+												{
+													"match": "\\&",
+													"name": "storage.modifier.reference.cpp"
+												}
+											]
+										},
+										"2": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"4": {
+											"name": "comment.block.cpp"
+										},
+										"5": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"6": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"7": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"8": {
+											"name": "comment.block.cpp"
+										},
+										"9": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"10": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"11": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"12": {
+											"name": "comment.block.cpp"
+										},
+										"13": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										},
+										"14": {
+											"name": "entity.name.type.alias.cpp"
+										}
+									}
+								},
+								{
+									"match": ","
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"macro_safe_class_block": {
+			"name": "meta.block.class.cpp",
+			"begin": "((((?<!\\w)class(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(DLLEXPORT)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*,?\\s*(?:private|protected|public)?\\s*(?:\\s*,?\\s*(?!(?:private|protected|public))(?:\\s*+(?:(?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:(?:(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?:::))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])))+)*))?))",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.head.class.cpp"
+				},
+				"3": {
+					"name": "storage.type.$3.cpp"
 				},
-				"38": {
+				"4": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"include": "#attributes_context"
 						},
 						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#number_literal"
 						}
 					]
 				},
-				"39": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"40": {
+				"6": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"41": {
+				"7": {
 					"name": "comment.block.cpp"
 				},
-				"42": {
+				"8": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11866,68 +18164,24 @@
 							"name": "comment.block.cpp"
 						}
 					]
-				}
-			}
-		},
-		"over_qualified_types": {
-			"patterns": [
-				{
-					"include": "#parameter_struct"
-				},
-				{
-					"include": "#parameter_enum"
-				},
-				{
-					"include": "#parameter_union"
 				},
-				{
-					"include": "#parameter_class"
-				}
-			]
-		},
-		"hacky_fix_for_stray_directive": {
-			"match": "(?<!\\w)#(?:endif|else|elif)(?!\\w)",
-			"name": "keyword.control.directive.$0.cpp"
-		},
-		"single_line_macro": {
-			"match": "^((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))#define.*(?<![\\\\])(?:\\n|$)",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#meta_preprocessor_macro"
-						},
-						{
-							"include": "#comments"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#operators"
-						},
-						{
-							"include": "#semicolon"
-						}
-					]
+				"9": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
 				},
-				"1": {
+				"10": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"2": {
+				"11": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"3": {
+				"12": {
 					"name": "comment.block.cpp"
 				},
-				"4": {
+				"13": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -11937,1671 +18191,1158 @@
 							"match": "\\*",
 							"name": "comment.block.cpp"
 						}
-					]
-				}
-			}
-		},
-		"assembly": {
-			"name": "meta.asm.cpp",
-			"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
-			"beginCaptures": {
-				"1": {
-					"name": "storage.type.asm.cpp"
-				},
-				"2": {
-					"name": "storage.modifier.cpp"
-				},
-				"3": {
-					"name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
-				}
-			},
-			"end": "(\\))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"name": "string.quoted.double.cpp",
-					"contentName": "meta.embedded.assembly.cpp",
-					"begin": "(R?)(\")",
-					"beginCaptures": {
-						"1": {
-							"name": "meta.encoding.cpp"
-						},
-						"2": {
-							"name": "punctuation.definition.string.begin.assembly.cpp"
-						}
-					},
-					"end": "(\")",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.assembly.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "source.asm"
-						},
-						{
-							"include": "source.x86"
-						},
-						{
-							"include": "source.x86_64"
-						},
-						{
-							"include": "source.arm"
-						},
-						{
-							"include": "#backslash_escapes"
-						},
-						{
-							"include": "#string_escaped_char"
-						},
-						{
-							"match": "(?=not)possible"
-						}
-					]
-				},
-				{
-					"begin": "(\\()",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
-						}
-					},
-					"end": "(\\))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.parens.end.bracket.round.assembly.inner.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
-				},
-				{
-					"match": ":",
-					"name": "punctuation.separator.delimiter.colon.assembly.cpp"
-				},
-				{
-					"include": "#comments_context"
-				},
-				{
-					"include": "#comments"
-				}
-			]
-		},
-		"backslash_escapes": {
-			"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?]   |\n[0-3]\\d{,2}\t |\n[4-7]\\d?\t\t|\nx[a-fA-F0-9]{,2} |\nu[a-fA-F0-9]{,4} |\nU[a-fA-F0-9]{,8} )",
-			"name": "constant.character.escape.cpp"
-		},
-		"square_brackets": {
-			"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": "#evaluation_context"
-				}
-			]
-		},
-		"empty_square_brackets": {
-			"name": "storage.modifier.array.bracket.square.cpp",
-			"match": "(?-mix:(?-mix:(?<!delete))\\\\[\\\\s*\\\\])"
-		},
-		"misc_storage_modifiers": {
-			"match": "\\b(?:export|mutable|typename|thread_local|extern|register|restrict|static|volatile|inline)\\b",
-			"name": "storage.modifier.cpp"
-		},
-		"meta_preprocessor_macro": {
-			"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"
+				"14": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
 				},
-				"5": {
-					"name": "punctuation.definition.parameters.begin.cpp"
+				"15": {
+					"name": "entity.name.type.$3.cpp"
 				},
-				"6": {
-					"name": "variable.parameter.preprocessor.cpp"
+				"16": {
+					"name": "storage.type.modifier.final.cpp"
 				},
-				"8": {
-					"name": "punctuation.separator.parameters.cpp"
+				"17": {
+					"name": "punctuation.separator.colon.inheritance.cpp"
 				},
-				"9": {
-					"name": "punctuation.definition.parameters.end.cpp"
+				"18": {
+					"patterns": [
+						{
+							"include": "#inheritance_context"
+						}
+					]
 				}
 			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#preprocessor_rule_define_line_context"
-				}
-			]
-		},
-		"meta_preprocessor_diagnostic": {
-			"name": "meta.preprocessor.diagnostic.cpp",
-			"begin": "^\\s*((#)\\s*(error|warning))\\b\\s*",
-			"beginCaptures": {
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"endCaptures": {
 				"1": {
-					"name": "keyword.control.directive.diagnostic.$3.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)",
 			"patterns": [
 				{
-					"begin": "\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "\"|(?<!\\\\)(?=\\s*\\n)",
+					"name": "meta.head.class.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
 					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
 						}
 					},
-					"name": "string.quoted.double.cpp",
 					"patterns": [
 						{
-							"include": "#line_continuation_character"
+							"include": "#ever_present_context"
+						},
+						{
+							"include": "#inheritance_context"
+						},
+						{
+							"include": "#template_call_range"
 						}
 					]
 				},
 				{
-					"begin": "'",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "'|(?<!\\\\)(?=\\s*\\n)",
+					"name": "meta.body.class.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
 					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
+						"1": {
+							"name": "punctuation.section.block.end.bracket.curly.class.cpp"
 						}
 					},
-					"name": "string.quoted.single.cpp",
 					"patterns": [
 						{
-							"include": "#line_continuation_character"
+							"include": "#function_pointer"
+						},
+						{
+							"include": "#static_assert"
+						},
+						{
+							"include": "#constructor_inline"
+						},
+						{
+							"include": "#destructor_inline"
+						},
+						{
+							"include": "$base"
 						}
 					]
 				},
 				{
-					"begin": "[^'\"]",
-					"end": "(?<!\\\\)(?=\\s*\\n)",
-					"name": "string.unquoted.single.cpp",
+					"name": "meta.tail.class.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#line_continuation_character"
-						},
-						{
-							"include": "#comments"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"meta_preprocessor_include": {
-			"name": "meta.preprocessor.include.cpp",
-			"begin": "^\\s*((#)\\s*(include(?:_next)?|import))\\b\\s*",
+		"macro_safe_struct_block": {
+			"name": "meta.block.struct.cpp",
+			"begin": "((((?<!\\w)struct(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(DLLEXPORT)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*,?\\s*(?:private|protected|public)?\\s*(?:\\s*,?\\s*(?!(?:private|protected|public))(?:\\s*+(?:(?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:(?:(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?:::))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])))+)*))?))",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.control.directive.$3.cpp"
+					"name": "meta.head.struct.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#line_continuation_character"
+				"3": {
+					"name": "storage.type.$3.cpp"
 				},
-				{
-					"begin": "\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
+				"4": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
 						}
-					},
-					"end": "\"",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
+					]
+				},
+				"5": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
-					},
-					"name": "string.quoted.double.include.cpp"
+					]
 				},
-				{
-					"begin": "<",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
+				"6": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"7": {
+					"name": "comment.block.cpp"
+				},
+				"8": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
-					},
-					"end": ">",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
+					]
+				},
+				"9": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
-					},
-					"name": "string.quoted.other.lt-gt.include.cpp"
-				}
-			]
-		},
-		"meta_preprocessor_line": {
-			"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": "#string_context_c"
+				"11": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"include": "#number_literal"
+				"12": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"include": "#line_continuation_character"
-				}
-			]
-		},
-		"meta_preprocessor_undef": {
-			"name": "meta.preprocessor.cpp",
-			"begin": "^\\s*(?:((#)\\s*undef))\\b",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.undef.cpp"
+				"13": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"match": "(?-mix:[a-zA-Z_$][\\w$]*)",
-					"name": "entity.name.function.preprocessor.cpp"
+				"14": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
+				"15": {
+					"name": "entity.name.type.$3.cpp"
+				},
+				"16": {
+					"name": "storage.type.modifier.final.cpp"
 				},
-				{
-					"include": "#line_continuation_character"
+				"17": {
+					"name": "punctuation.separator.colon.inheritance.cpp"
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "#inheritance_context"
+						}
+					]
 				}
-			]
-		},
-		"meta_preprocessor_pragma": {
-			"name": "meta.preprocessor.pragma.cpp",
-			"begin": "^\\s*(?:((#)\\s*pragma))\\b",
-			"beginCaptures": {
+			},
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?<!\\\\)$",
+			"endCaptures": {
 				"1": {
-					"name": "keyword.control.directive.pragma.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
-			"end": "(?=(?://|/\\*))|(?<!\\\\)(?=\\n)",
-			"patterns": [
-				{
-					"include": "#string_context_c"
-				},
-				{
-					"match": "[a-zA-Z_$][\\w\\-$]*",
-					"name": "entity.other.attribute-name.pragma.preprocessor.cpp"
-				},
-				{
-					"include": "#number_literal"
-				},
-				{
-					"include": "#line_continuation_character"
-				}
-			]
-		},
-		"string_context": {
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"begin": "(((?:u|u8|U|L)?)\")",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.cpp"
-						},
-						"2": {
-							"name": "meta.encoding.cpp"
-						}
-					},
-					"end": "(\")",
+					"name": "meta.head.struct.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
 					"endCaptures": {
 						"1": {
-							"name": "punctuation.definition.string.end.cpp"
+							"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"match": "(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8})",
-							"name": "constant.character.escape.cpp"
-						},
-						{
-							"match": "\\\\['\"?\\\\abfnrtv]",
-							"name": "constant.character.escape.cpp"
-						},
-						{
-							"match": "\\\\[0-7]{1,3}",
-							"name": "constant.character.escape.cpp"
+							"include": "#ever_present_context"
 						},
 						{
-							"match": "\\\\x[0-9a-fA-F]{2,2}",
-							"name": "constant.character.escape.cpp"
+							"include": "#inheritance_context"
 						},
 						{
-							"include": "#string_escapes_context_c"
+							"include": "#template_call_range"
 						}
 					]
 				},
 				{
-					"name": "string.quoted.single.cpp",
-					"begin": "((?<![0-9A-Fa-f])((?:u|u8|U|L)?)')",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.cpp"
-						},
-						"2": {
-							"name": "meta.encoding.cpp"
-						}
-					},
-					"end": "(')",
+					"name": "meta.body.struct.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
 					"endCaptures": {
 						"1": {
-							"name": "punctuation.definition.string.end.cpp"
+							"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"include": "#string_escapes_context_c"
+							"include": "#function_pointer"
 						},
 						{
-							"include": "#line_continuation_character"
+							"include": "#static_assert"
+						},
+						{
+							"include": "#constructor_inline"
+						},
+						{
+							"include": "#destructor_inline"
+						},
+						{
+							"include": "$base"
 						}
 					]
 				},
 				{
-					"begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						},
-						"1": {
-							"name": "meta.encoding.cpp"
-						},
-						"3": {
-							"name": "invalid.illegal.delimiter-too-long.cpp"
-						}
-					},
-					"end": "\\)\\2(\\3)\"",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
-						},
-						"1": {
-							"name": "invalid.illegal.delimiter-too-long.cpp"
+					"name": "meta.tail.struct.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
 						}
-					},
-					"name": "string.quoted.double.raw.cpp"
+					]
 				}
 			]
 		},
-		"block": {
-			"name": "meta.block.cpp",
-			"begin": "({)",
+		"macro_safe_union_block": {
+			"name": "meta.block.union.cpp",
+			"begin": "((((?<!\\w)union(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(DLLEXPORT)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s+(final)\\s*)?(?:\\s*(:)((?:\\s*,?\\s*(?:private|protected|public)?\\s*(?:\\s*,?\\s*(?!(?:private|protected|public))(?:\\s*+(?:(?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:(?:(?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?:::))?(?:(?:(?:(?>\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.])))+)*))?))",
 			"beginCaptures": {
 				"1": {
-					"name": "punctuation.section.block.begin.bracket.curly.cpp"
-				}
-			},
-			"end": "(}|(?=\\s*#\\s*(?:elif|else|endif)\\b))",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.block.end.bracket.curly.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#function_body_context"
-				}
-			]
-		},
-		"disabled": {
-			"begin": "^\\s*#\\s*if(n?def)?\\b.*$",
-			"end": "^\\s*#\\s*endif\\b",
-			"patterns": [
-				{
-					"include": "#disabled"
+					"name": "meta.head.union.cpp"
 				},
-				{
-					"include": "#pragma_mark"
-				}
-			]
-		},
-		"line_continuation_character": {
-			"match": "(\\\\)\\n",
-			"captures": {
-				"1": {
-					"name": "constant.character.escape.line-continuation.cpp"
-				}
-			}
-		},
-		"parentheses": {
-			"name": "meta.parens.cpp",
-			"begin": "\\(",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.section.parens.begin.bracket.round.cpp"
-				}
-			},
-			"end": "\\)",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.section.parens.end.bracket.round.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"include": "#over_qualified_types"
+				"3": {
+					"name": "storage.type.$3.cpp"
 				},
-				{
-					"match": "(?-mix:(?<!:):(?!:))",
-					"name": "colon.cpp punctuation.separator.range-based.cpp"
+				"4": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
 				},
-				{
-					"include": "#evaluation_context"
-				}
-			]
-		},
-		"pragma_mark": {
-			"captures": {
-				"1": {
-					"name": "meta.preprocessor.pragma.cpp"
+				"5": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				"2": {
-					"name": "keyword.control.directive.pragma.pragma-mark.cpp"
+				"6": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"3": {
-					"name": "punctuation.definition.directive.cpp"
+				"7": {
+					"name": "comment.block.cpp"
 				},
-				"4": {
-					"name": "entity.name.tag.pragma-mark.cpp"
-				}
-			},
-			"match": "^\\s*(((#)\\s*pragma\\s+mark)\\s+(.*))",
-			"name": "meta.section.cpp"
-		},
-		"string_context_c": {
-			"patterns": [
-				{
-					"begin": "\"",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
+				"8": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
-					},
-					"end": "\"",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
+					]
+				},
+				"9": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
-					},
-					"name": "string.quoted.double.cpp",
+					]
+				},
+				"11": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"12": {
+					"name": "comment.block.cpp"
+				},
+				"13": {
 					"patterns": [
 						{
-							"include": "#string_escapes_context_c"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#line_continuation_character"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"begin": "(?-mix:(?<![\\da-fA-F])')",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "'",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"name": "string.quoted.single.cpp",
+				"14": {
 					"patterns": [
 						{
-							"include": "#string_escapes_context_c"
+							"include": "#attributes_context"
 						},
 						{
-							"include": "#line_continuation_character"
+							"include": "#number_literal"
 						}
 					]
-				}
-			]
-		},
-		"string_escapes_context_c": {
-			"patterns": [
-				{
-					"include": "#backslash_escapes"
 				},
-				{
-					"match": "\\\\.",
-					"name": "invalid.illegal.unknown-escape.cpp"
+				"15": {
+					"name": "entity.name.type.$3.cpp"
 				},
-				{
-					"match": "(?x) %\n(\\d+\\$)?\t\t\t\t\t\t   # field (argument #)\n[#0\\- +']*\t\t\t\t\t\t  # flags\n[,;:_]?\t\t\t\t\t\t\t  # separator character (AltiVec)\n((-?\\d+)|\\*(-?\\d+\\$)?)?\t\t  # minimum field width\n(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?\t# precision\n(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n[diouxXDOUeEfFgGaACcSspn%]\t\t   # conversion type",
-					"name": "constant.other.placeholder.cpp"
-				}
-			]
-		},
-		"vararg_ellipses": {
-			"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
-			"name": "punctuation.vararg-ellipses.cpp"
-		},
-		"preprocessor_rule_conditional": {
-			"begin": "^\\s*((#)\\s*if(?:n?def)?\\b)",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
+				"16": {
+					"name": "storage.type.modifier.final.cpp"
 				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+				"17": {
+					"name": "punctuation.separator.colon.inheritance.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
+				"18": {
+					"patterns": [
+						{
+							"include": "#inheritance_context"
+						}
+					]
 				}
 			},
-			"end": "^\\s*((#)\\s*endif\\b)",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?<!\\\\)$",
 			"endCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+					"name": "meta.head.union.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
+						}
+					},
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"include": "#ever_present_context"
+						},
+						{
+							"include": "#inheritance_context"
+						},
+						{
+							"include": "#template_call_range"
 						}
 					]
 				},
 				{
-					"include": "#preprocessor_rule_enabled_elif"
-				},
-				{
-					"include": "#preprocessor_rule_enabled_else"
-				},
-				{
-					"include": "#preprocessor_rule_disabled_elif"
-				},
-				{
-					"begin": "^\\s*((#)\\s*elif\\b)",
-					"beginCaptures": {
+					"name": "meta.body.union.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
 						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
-						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
+							"name": "punctuation.section.block.end.bracket.curly.union.cpp"
 						}
 					},
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"include": "#function_pointer"
+						},
+						{
+							"include": "#static_assert"
+						},
+						{
+							"include": "#constructor_inline"
+						},
+						{
+							"include": "#destructor_inline"
+						},
+						{
+							"include": "$base"
 						}
 					]
 				},
 				{
-					"include": "#initial_context"
+					"name": "meta.tail.union.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
 				}
 			]
 		},
-		"preprocessor_rule_conditional_block": {
-			"begin": "^\\s*((#)\\s*if(?:n?def)?\\b)",
+		"macro_safe_enum_block": {
+			"name": "meta.block.enum.cpp",
+			"begin": "(((?<!\\w)enum(?!\\w))(?:\\s+(class|struct))?(?:(?:\\s+|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))\\s*((?:(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))?)(?:\\s*(:)\\s*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?\\s*((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w)))?)",
 			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+					"name": "meta.head.enum.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "^\\s*((#)\\s*endif\\b)",
-			"endCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
+					"name": "storage.type.enum.cpp"
 				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+				"3": {
+					"name": "storage.type.enum.enum-key.$3.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+				"4": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
-						}
-					]
-				},
-				{
-					"include": "#preprocessor_rule_enabled_elif_block"
-				},
-				{
-					"include": "#preprocessor_rule_enabled_else_block"
-				},
-				{
-					"include": "#preprocessor_rule_disabled_elif"
-				},
-				{
-					"begin": "^\\s*((#)\\s*elif\\b)",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
+							"include": "#attributes_context"
 						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
-						}
-					},
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
-					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"include": "#number_literal"
 						}
 					]
 				},
-				{
-					"include": "#initial_context"
-				}
-			]
-		},
-		"preprocessor_rule_conditional_line_context": {
-			"patterns": [
-				{
-					"match": "(?:\\bdefined\\b\\s*$)|(?:\\bdefined\\b(?=\\s*\\(*\\s*(?:(?!defined\\b)[a-zA-Z_$][\\w$]*\\b)\\s*\\)*\\s*(?:\\n|//|/\\*|\\?|\\:|&&|\\|\\||\\\\\\s*\\n)))",
-					"name": "keyword.control.directive.conditional.cpp"
-				},
-				{
-					"match": "\\bdefined\\b",
-					"name": "invalid.illegal.macro-name.cpp"
-				},
-				{
-					"include": "#comments"
-				},
-				{
-					"include": "#string_context_c"
+				"5": {
+					"name": "entity.name.type.enum.cpp"
 				},
-				{
-					"include": "#number_literal"
+				"6": {
+					"name": "punctuation.separator.colon.type-specifier.cpp"
 				},
-				{
-					"begin": "\\?",
-					"beginCaptures": {
-						"0": {
-							"name": "keyword.operator.ternary.cpp"
-						}
-					},
-					"end": ":",
-					"endCaptures": {
-						"0": {
-							"name": "keyword.operator.ternary.cpp"
-						}
-					},
+				"8": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
-						}
-					]
-				},
-				{
-					"include": "#operators"
-				},
-				{
-					"include": "#language_constants"
-				},
-				{
-					"match": "(?-mix:[a-zA-Z_$][\\w$]*)",
-					"name": "entity.name.function.preprocessor.cpp"
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
 				},
-				{
-					"include": "#line_continuation_character"
+				"9": {
+					"name": "entity.name.scope-resolution.cpp"
 				},
-				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.parens.begin.bracket.round.cpp"
-						}
-					},
-					"end": "\\)|(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.parens.end.bracket.round.cpp"
-						}
-					},
+				"10": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"include": "#template_call_range"
 						}
 					]
-				}
-			]
-		},
-		"preprocessor_rule_disabled": {
-			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
 				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+				"11": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
+				"12": {
+					"name": "storage.type.integral.$12.cpp"
 				}
 			},
-			"end": "^\\s*((#)\\s*endif\\b)",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?<!\\\\)$",
 			"endCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+					"name": "meta.head.enum.cpp",
+					"begin": "\\G ?",
+					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.block.begin.bracket.curly.enum.cpp"
+						}
+					},
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"include": "$base"
 						}
 					]
 				},
 				{
-					"include": "#comments"
-				},
-				{
-					"include": "#preprocessor_rule_enabled_elif"
-				},
-				{
-					"include": "#preprocessor_rule_enabled_else"
-				},
-				{
-					"include": "#preprocessor_rule_disabled_elif"
-				},
-				{
-					"begin": "^\\s*((#)\\s*elif\\b)",
-					"beginCaptures": {
-						"0": {
-							"name": "meta.preprocessor.cpp"
-						},
+					"name": "meta.body.enum.cpp",
+					"begin": "(?<=\\{|<%|\\?\\?<)",
+					"end": "(\\}|%>|\\?\\?>)",
+					"endCaptures": {
 						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
-						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
+							"name": "punctuation.section.block.end.bracket.curly.enum.cpp"
 						}
 					},
-					"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 					"patterns": [
 						{
-							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-							"name": "meta.preprocessor.cpp",
-							"patterns": [
-								{
-									"include": "#preprocessor_rule_conditional_line_context"
-								}
-							]
+							"include": "#enumerator_list"
+						},
+						{
+							"include": "#comments"
+						},
+						{
+							"include": "#comma"
 						},
 						{
-							"include": "#initial_context"
+							"include": "#semicolon"
 						}
 					]
 				},
 				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-					"contentName": "comment.block.preprocessor.if-branch.cpp",
+					"name": "meta.tail.enum.cpp",
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
+					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
-							"include": "#disabled"
-						},
-						{
-							"include": "#pragma_mark"
+							"include": "$base"
 						}
 					]
 				}
 			]
 		},
-		"preprocessor_rule_disabled_block": {
-			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
+		"macro_safe_template_definition": {
+			"name": "meta.template.definition.cpp",
+			"begin": "(?<!\\w)(template)\\s*(<)",
 			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+					"name": "storage.type.template.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
 				}
 			},
-			"end": "^\\s*((#)\\s*endif\\b)",
+			"end": "(>)|(?<!\\\\)$",
 			"endCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+					"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": "#preprocessor_rule_conditional_line_context"
+							"include": "#template_call_context"
 						}
 					]
 				},
 				{
-					"include": "#comments"
-				},
+					"include": "#template_definition_context"
+				}
+			]
+		},
+		"macro_safe_block": {
+			"name": "meta.block.cpp",
+			"begin": "({)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.block.begin.bracket.curly.cpp"
+				}
+			},
+			"end": "(}|(?=\\s*#\\s*(?:elif|else|endif)\\b))|(?<!\\\\)$",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.block.end.bracket.curly.cpp"
+				}
+			},
+			"patterns": [
 				{
-					"include": "#preprocessor_rule_enabled_elif_block"
+					"include": "#function_body_context"
+				}
+			]
+		},
+		"macro_safe_static_assert": {
+			"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
+			"beginCaptures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
-				{
-					"include": "#preprocessor_rule_enabled_else_block"
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				{
-					"include": "#preprocessor_rule_disabled_elif"
+				"3": {
+					"name": "comment.block.cpp"
 				},
-				{
-					"begin": "^\\s*((#)\\s*elif\\b)",
-					"beginCaptures": {
-						"0": {
-							"name": "meta.preprocessor.cpp"
-						},
-						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
-						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
-						}
-					},
-					"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
+				"4": {
 					"patterns": [
 						{
-							"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-							"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-							"name": "meta.preprocessor.cpp",
-							"patterns": [
-								{
-									"include": "#preprocessor_rule_conditional_line_context"
-								}
-							]
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#initial_context"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-					"contentName": "comment.block.preprocessor.if-branch.in-block.cpp",
+				"5": {
+					"name": "keyword.other.static_assert.cpp"
+				},
+				"6": {
 					"patterns": [
 						{
-							"include": "#disabled"
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"8": {
+					"name": "comment.block.cpp"
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#pragma_mark"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
-				}
-			]
-		},
-		"preprocessor_rule_disabled_elif": {
-			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0+\\b\\)*\\s*(?:$|//|/\\*))",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
 				},
+				"10": {
+					"name": "punctuation.section.arguments.begin.bracket.round.static_assert.cpp"
+				}
+			},
+			"end": "(\\))|(?<!\\\\)$",
+			"endCaptures": {
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.static_assert.cpp"
 				}
 			},
-			"end": "(?=^\\s*((#)\\s*(?:elif|else|endif)\\b))",
 			"patterns": [
 				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
-					"patterns": [
-						{
-							"include": "#preprocessor_rule_conditional_line_context"
+					"name": "meta.static_assert.message.cpp",
+					"begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.separator.delimiter.comma.cpp"
 						}
-					]
-				},
-				{
-					"include": "#comments"
-				},
-				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-					"contentName": "comment.block.preprocessor.elif-branch.cpp",
+					},
+					"end": "(?=\\))",
 					"patterns": [
 						{
-							"include": "#disabled"
+							"include": "#string_context"
 						},
 						{
-							"include": "#pragma_mark"
+							"include": "#string_context_c"
 						}
 					]
+				},
+				{
+					"include": "#evaluation_context"
 				}
 			]
 		},
-		"preprocessor_rule_enabled": {
-			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+		"macro_safe_assembly": {
+			"name": "meta.asm.cpp",
+			"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
 			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+					"name": "storage.type.asm.cpp"
 				},
 				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "storage.modifier.cpp"
 				},
 				"3": {
-					"name": "constant.numeric.preprocessor.cpp"
+					"name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
 				}
 			},
-			"end": "^\\s*((#)\\s*endif\\b)",
+			"end": "(\\))|(?<!\\\\)$",
 			"endCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
+					"name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
-					"name": "meta.preprocessor.cpp",
-					"patterns": [
-						{
-							"include": "#preprocessor_rule_conditional_line_context"
-						}
-					]
-				},
-				{
-					"include": "#comments"
-				},
-				{
-					"begin": "^\\s*((#)\\s*else\\b)",
+					"name": "string.quoted.double.cpp",
+					"contentName": "meta.embedded.assembly.cpp",
+					"begin": "(R?)(\")",
 					"beginCaptures": {
-						"0": {
-							"name": "meta.preprocessor.cpp"
-						},
 						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
+							"name": "meta.encoding.cpp"
 						},
 						"2": {
-							"name": "punctuation.definition.directive.cpp"
+							"name": "punctuation.definition.string.begin.assembly.cpp"
+						}
+					},
+					"end": "(\")",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.assembly.cpp"
 						}
 					},
-					"end": "(?=^\\s*((#)\\s*endif\\b))",
-					"contentName": "comment.block.preprocessor.else-branch.cpp",
 					"patterns": [
 						{
-							"include": "#disabled"
+							"include": "source.asm"
 						},
 						{
-							"include": "#pragma_mark"
+							"include": "source.x86"
+						},
+						{
+							"include": "source.x86_64"
+						},
+						{
+							"include": "source.arm"
+						},
+						{
+							"include": "#backslash_escapes"
+						},
+						{
+							"include": "#string_escaped_char"
+						},
+						{
+							"match": "(?=not)possible"
 						}
 					]
 				},
 				{
-					"begin": "^\\s*((#)\\s*elif\\b)",
+					"begin": "(\\()",
 					"beginCaptures": {
-						"0": {
-							"name": "meta.preprocessor.cpp"
-						},
 						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
-						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
+							"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
+						}
+					},
+					"end": "(\\))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.section.parens.end.bracket.round.assembly.inner.cpp"
 						}
 					},
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-					"contentName": "comment.block.preprocessor.if-branch.cpp",
 					"patterns": [
 						{
-							"include": "#disabled"
-						},
-						{
-							"include": "#pragma_mark"
+							"include": "#evaluation_context"
 						}
 					]
 				},
 				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-					"patterns": [
-						{
-							"include": "#initial_context"
-						}
-					]
+					"match": ":",
+					"name": "punctuation.separator.delimiter.colon.assembly.cpp"
+				},
+				{
+					"include": "#comments_context"
+				},
+				{
+					"include": "#comments"
 				}
 			]
 		},
-		"preprocessor_rule_enabled_block": {
-			"begin": "^\\s*((#)\\s*if\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
+		"macro_safe_function_pointer": {
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:(?:(?:short|signed|unsigned|long)|(?:class|struct|union|enum))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(((?:::)?(?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*\\s*+(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?::)*\\s*+)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\s*+((?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(::))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|NULL|true|false|nullptr|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|final|override|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|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|audit|axiom|transaction_safe|transaction_safe_dynamic)\\b)((?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)\\b(?:(?<!<)<(?!<)(?:[^<>]*|[^>]*+<[^>]*+>)++>\\s*)?(?![\\w<:.]))(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))?(?:(?:\\&|\\*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))*(?:\\&|\\*))?((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()(\\*)\\s*((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)?)\\s*(?:(\\[)(\\w*)(\\])\\s*)*(\\))\\s*(\\()",
 			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "^\\s*((#)\\s*endif\\b)",
-			"endCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
 				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
-				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"patterns": [
-				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
-						}
-					]
-				},
-				{
-					"include": "#comments"
-				},
-				{
-					"begin": "^\\s*((#)\\s*else\\b)",
-					"beginCaptures": {
-						"0": {
-							"name": "meta.preprocessor.cpp"
+							"match": "(?:class|struct|union|enum)",
+							"name": "storage.type.$0.cpp"
 						},
-						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
+						{
+							"include": "#attributes_context"
 						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context_c"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"include": "#template_call_range"
+						},
+						{
+							"match": "(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*",
+							"name": "entity.name.type.cpp"
 						}
-					},
-					"end": "(?=^\\s*((#)\\s*endif\\b))",
-					"contentName": "comment.block.preprocessor.else-branch.in-block.cpp",
+					]
+				},
+				"2": {
 					"patterns": [
 						{
-							"include": "#disabled"
+							"include": "#attributes_context"
 						},
 						{
-							"include": "#pragma_mark"
+							"include": "#number_literal"
 						}
 					]
 				},
-				{
-					"begin": "^\\s*((#)\\s*elif\\b)",
-					"beginCaptures": {
-						"0": {
-							"name": "meta.preprocessor.cpp"
-						},
-						"1": {
-							"name": "keyword.control.directive.conditional.cpp"
-						},
-						"2": {
-							"name": "punctuation.definition.directive.cpp"
+				"3": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
-					},
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-					"contentName": "comment.block.preprocessor.if-branch.in-block.cpp",
+					]
+				},
+				"4": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"5": {
+					"name": "comment.block.cpp"
+				},
+				"6": {
 					"patterns": [
 						{
-							"include": "#disabled"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#pragma_mark"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
+				"7": {
 					"patterns": [
 						{
-							"include": "#initial_context"
+							"include": "#inline_comment"
 						}
 					]
-				}
-			]
-		},
-		"preprocessor_rule_enabled_elif": {
-			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
 				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+				"8": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=^\\s*((#)\\s*endif\\b))",
-			"patterns": [
-				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+				"9": {
+					"name": "comment.block.cpp"
+				},
+				"10": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"include": "#comments"
-				},
-				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+				"12": {
 					"patterns": [
 						{
-							"begin": "^\\s*((#)\\s*(else)\\b)",
-							"beginCaptures": {
-								"0": {
-									"name": "meta.preprocessor.cpp"
-								},
-								"1": {
-									"name": "keyword.control.directive.conditional.cpp"
-								},
-								"2": {
-									"name": "punctuation.definition.directive.cpp"
-								}
-							},
-							"end": "(?=^\\s*((#)\\s*endif\\b))",
-							"contentName": "comment.block.preprocessor.elif-branch.cpp",
-							"patterns": [
-								{
-									"include": "#disabled"
-								},
-								{
-									"include": "#pragma_mark"
-								}
-							]
-						},
-						{
-							"begin": "^\\s*((#)\\s*(elif)\\b)",
-							"beginCaptures": {
-								"0": {
-									"name": "meta.preprocessor.cpp"
-								},
-								"1": {
-									"name": "keyword.control.directive.conditional.cpp"
-								},
-								"2": {
-									"name": "punctuation.definition.directive.cpp"
-								}
-							},
-							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-							"contentName": "comment.block.preprocessor.elif-branch.cpp",
-							"patterns": [
-								{
-									"include": "#disabled"
-								},
-								{
-									"include": "#pragma_mark"
-								}
-							]
-						},
-						{
-							"include": "#initial_context"
+							"include": "#scope_resolution_inner_generated"
 						}
 					]
-				}
-			]
-		},
-		"preprocessor_rule_enabled_elif_block": {
-			"begin": "^\\s*((#)\\s*elif\\b)(?=\\s*\\(*\\b0*1\\b\\)*\\s*(?:$|//|/\\*))",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
 				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+				"13": {
+					"name": "entity.name.scope-resolution.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=^\\s*((#)\\s*endif\\b))",
-			"patterns": [
-				{
-					"begin": "\\G(?=.)(?!//|/\\*(?!.*\\\\\\s*\\n))",
-					"end": "(?=//)|(?=/\\*(?!.*\\\\\\s*\\n))|(?<!\\\\)(?=\\n)",
-					"name": "meta.preprocessor.cpp",
+				"14": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_conditional_line_context"
+							"include": "#template_call_range"
 						}
 					]
 				},
-				{
-					"include": "#comments"
+				"15": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				{
-					"begin": "\\n",
-					"end": "(?=^\\s*((#)\\s*(?:endif)\\b))",
+				"16": {
 					"patterns": [
 						{
-							"begin": "^\\s*((#)\\s*(else)\\b)",
-							"beginCaptures": {
-								"0": {
-									"name": "meta.preprocessor.cpp"
-								},
-								"1": {
-									"name": "keyword.control.directive.conditional.cpp"
-								},
-								"2": {
-									"name": "punctuation.definition.directive.cpp"
-								}
-							},
-							"end": "(?=^\\s*((#)\\s*endif\\b))",
-							"contentName": "comment.block.preprocessor.elif-branch.in-block.cpp",
-							"patterns": [
-								{
-									"include": "#disabled"
-								},
-								{
-									"include": "#pragma_mark"
-								}
-							]
-						},
-						{
-							"begin": "^\\s*((#)\\s*(elif)\\b)",
-							"beginCaptures": {
-								"0": {
-									"name": "meta.preprocessor.cpp"
-								},
-								"1": {
-									"name": "keyword.control.directive.conditional.cpp"
-								},
-								"2": {
-									"name": "punctuation.definition.directive.cpp"
-								}
-							},
-							"end": "(?=^\\s*((#)\\s*(?:else|elif|endif)\\b))",
-							"contentName": "comment.block.preprocessor.elif-branch.cpp",
-							"patterns": [
-								{
-									"include": "#disabled"
-								},
-								{
-									"include": "#pragma_mark"
-								}
-							]
-						},
-						{
-							"include": "#initial_context"
+							"include": "#inline_comment"
 						}
 					]
-				}
-			]
-		},
-		"preprocessor_rule_enabled_else": {
-			"begin": "^\\s*((#)\\s*else\\b)",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
-				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=^\\s*((#)\\s*endif\\b))",
-			"patterns": [
-				{
-					"include": "#initial_context"
-				}
-			]
-		},
-		"preprocessor_rule_enabled_else_block": {
-			"begin": "^\\s*((#)\\s*else\\b)",
-			"beginCaptures": {
-				"0": {
-					"name": "meta.preprocessor.cpp"
+				"17": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"1": {
-					"name": "keyword.control.directive.conditional.cpp"
+				"18": {
+					"name": "comment.block.cpp"
 				},
-				"2": {
-					"name": "punctuation.definition.directive.cpp"
-				}
-			},
-			"end": "(?=^\\s*((#)\\s*endif\\b))",
-			"patterns": [
-				{
-					"include": "#initial_context"
-				}
-			]
-		},
-		"preprocessor_rule_define_line_context": {
-			"patterns": [
-				{
-					"include": "#vararg_ellipses"
+				"19": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
-				{
-					"match": "(?-mix:##?(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*(?!\\w))",
-					"name": "variable.other.macro.argument.cpp"
+				"20": {
+					"name": "entity.name.type.cpp"
 				},
-				{
-					"begin": "{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.block.begin.bracket.curly.cpp"
-						}
-					},
-					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.block.end.bracket.curly.cpp"
-						}
-					},
-					"name": "meta.block.cpp",
+				"21": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_define_line_blocks_context"
+							"match": "\\*",
+							"name": "storage.modifier.pointer.cpp"
+						},
+						{
+							"match": "(?:\\&((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))){2,}\\&",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
+								},
+								"2": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"3": {
+									"name": "comment.block.cpp"
+								},
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							},
+							"name": "invalid.illegal.reference-type.cpp"
+						},
+						{
+							"match": "\\&",
+							"name": "storage.modifier.reference.cpp"
 						}
 					]
 				},
-				{
-					"match": "\\(",
-					"name": "punctuation.section.parens.begin.bracket.round.cpp"
-				},
-				{
-					"match": "\\)",
-					"name": "punctuation.section.parens.end.bracket.round.cpp"
-				},
-				{
-					"begin": "(?x)\n(?<![\\w$]|\\[)(?!(?: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|asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void)\\s*\\()\n(?=\n  (?:[A-Za-z_][A-Za-z0-9_]*+|::)++\\s*\\(  # actual name\n  |\n  (?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\\s*\\(\n)",
-					"end": "(?<=\\))(?!\\w)|(?<!\\\\)(?=\\s*\\n)",
-					"name": "meta.function.cpp",
+				"22": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_define_line_functions_context"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				{
-					"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",
+				"23": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#string_escapes_context_c"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#line_continuation_character"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"begin": "'",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
-					"end": "'|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.cpp"
+				"26": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
-					},
-					"name": "string.quoted.single.cpp",
+					]
+				},
+				"27": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"28": {
+					"name": "comment.block.cpp"
+				},
+				"29": {
 					"patterns": [
 						{
-							"include": "#string_escapes_context_c"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#line_continuation_character"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"include": "#initial_context"
-				}
-			]
-		},
-		"preprocessor_rule_define_line_blocks_context": {
-			"patterns": [
-				{
-					"begin": "{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.block.begin.bracket.curly.cpp"
-						}
-					},
-					"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.block.end.bracket.curly.cpp"
+				"30": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
 						}
-					},
+					]
+				},
+				"31": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"32": {
+					"name": "comment.block.cpp"
+				},
+				"33": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_define_line_blocks_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						},
 						{
-							"include": "#preprocessor_rule_define_line_context"
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				{
-					"include": "#preprocessor_rule_define_line_context"
-				}
-			]
-		},
-		"preprocessor_rule_define_line_functions_context": {
-			"patterns": [
-				{
-					"include": "#comments"
+				"34": {
+					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
 				},
-				{
-					"include": "#storage_types"
+				"35": {
+					"name": "punctuation.definition.function.pointer.dereference.cpp"
 				},
-				{
-					"include": "#vararg_ellipses"
+				"36": {
+					"name": "variable.other.definition.pointer.function.cpp"
 				},
-				{
-					"include": "#method_access"
+				"37": {
+					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				{
-					"include": "#member_access"
+				"38": {
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
-				{
-					"include": "#operators"
+				"39": {
+					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				{
-					"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(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.function.cpp"
-						},
-						"2": {
-							"name": "punctuation.section.arguments.begin.bracket.round.cpp"
-						}
-					},
-					"end": "(\\))|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.arguments.end.bracket.round.cpp"
-						}
-					},
+				"40": {
+					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
+				},
+				"41": {
+					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
+				}
+			},
+			"end": "(\\))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?=[{=,);]|\\n)(?!\\()|(?<!\\\\)$",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
+				},
+				"2": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_define_line_functions_context"
+							"include": "#inline_comment"
 						}
 					]
 				},
-				{
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.parens.begin.bracket.round.cpp"
-						}
-					},
-					"end": "(\\))|(?<!\\\\)(?=\\s*\\n)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.parens.end.bracket.round.cpp"
-						}
-					},
+				"3": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"4": {
+					"name": "comment.block.cpp"
+				},
+				"5": {
 					"patterns": [
 						{
-							"include": "#preprocessor_rule_define_line_functions_context"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
-				},
+				}
+			},
+			"patterns": [
 				{
-					"include": "#preprocessor_rule_define_line_context"
+					"include": "#function_parameter_context"
 				}
 			]
 		},
-		"initial_context": {
+		"macro_context": {
 			"patterns": [
 				{
 					"include": "#ever_present_context"
 				},
 				{
-					"include": "#constructor_root"
+					"include": "#macro_safe_constructor_root"
 				},
 				{
-					"include": "#destructor_root"
+					"include": "#macro_safe_destructor_root"
 				},
 				{
-					"include": "#function_definition"
+					"include": "#macro_safe_function_definition"
 				},
 				{
-					"include": "#operator_overload"
+					"include": "#macro_safe_operator_overload"
 				},
 				{
-					"include": "#using_namespace"
+					"include": "#macro_safe_using_namespace"
 				},
 				{
 					"include": "#type_alias"
@@ -13613,19 +19354,19 @@
 					"include": "#namespace_alias"
 				},
 				{
-					"include": "#namespace_block"
+					"include": "#macro_safe_namespace_block"
 				},
 				{
-					"include": "#extern_block"
+					"include": "#macro_safe_extern_block"
 				},
 				{
-					"include": "#typedef_class"
+					"include": "#macro_safe_typedef_class"
 				},
 				{
-					"include": "#typedef_struct"
+					"include": "#macro_safe_typedef_struct"
 				},
 				{
-					"include": "#typedef_union"
+					"include": "#macro_safe_typedef_union"
 				},
 				{
 					"include": "#typedef_keyword"
@@ -13634,37 +19375,37 @@
 					"include": "#standard_declares"
 				},
 				{
-					"include": "#class_block"
+					"include": "#macro_safe_class_block"
 				},
 				{
-					"include": "#struct_block"
+					"include": "#macro_safe_struct_block"
 				},
 				{
-					"include": "#union_block"
+					"include": "#macro_safe_union_block"
 				},
 				{
-					"include": "#enum_block"
+					"include": "#macro_safe_enum_block"
 				},
 				{
 					"include": "#template_isolated_definition"
 				},
 				{
-					"include": "#template_definition"
+					"include": "#macro_safe_template_definition"
 				},
 				{
 					"include": "#access_control_keywords"
 				},
 				{
-					"include": "#block"
+					"include": "#macro_safe_block"
 				},
 				{
-					"include": "#static_assert"
+					"include": "#macro_safe_static_assert"
 				},
 				{
-					"include": "#assembly"
+					"include": "#macro_safe_assembly"
 				},
 				{
-					"include": "#function_pointer"
+					"include": "#macro_safe_function_pointer"
 				},
 				{
 					"include": "#evaluation_context"
diff --git a/extensions/cpp/test/colorize-results/test-23630_cpp.json b/extensions/cpp/test/colorize-results/test-23630_cpp.json
index 55aec19d2cb3e870f73ff6fce6bde5a2059abb0c..a58961ae945b0e76e28c93edb7ea5bdbfcb2a243 100644
--- a/extensions/cpp/test/colorize-results/test-23630_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-23630_cpp.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "ifndef",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "_UCRT",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "define",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "_UCRT",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "endif",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
diff --git a/extensions/cpp/test/colorize-results/test-23850_cpp.json b/extensions/cpp/test/colorize-results/test-23850_cpp.json
index dfcdfd6787a98e99c954335c6c4a91b77c9e0676..924bbc782432b7d5278ed1ccc64932fca0ed33cc 100644
--- a/extensions/cpp/test/colorize-results/test-23850_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-23850_cpp.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "ifndef",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "_UCRT",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "define",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "_UCRT",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "endif",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/cpp/test/colorize-results/test_cc.json
index 6bd7dcf50a4d2ecd68a239e2a536cd06b7e6cb08..4567285df2384a47cb98cc5e1d316d5e32d4a8cb 100644
--- a/extensions/cpp/test/colorize-results/test_cc.json
+++ b/extensions/cpp/test/colorize-results/test_cc.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": "if",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "B4G_DEBUG_CHECK",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.cpp entity.name.function.preprocessor.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "fprintf",
-		"t": "source.cpp source.cpp entity.name.function.call.cpp",
+		"t": "source.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "stderr",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -111,7 +111,7 @@
 	},
 	{
 		"c": "num_candidate_ret=",
-		"t": "source.cpp source.cpp string.quoted.double.cpp",
+		"t": "source.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "%d",
-		"t": "source.cpp source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
+		"t": "source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -133,7 +133,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.cpp source.cpp string.quoted.double.cpp",
+		"t": "source.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -144,7 +144,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -166,7 +166,7 @@
 	},
 	{
 		"c": " num_candidate",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -188,7 +188,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -199,7 +199,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "for",
-		"t": "source.cpp source.cpp keyword.control.for.cpp",
+		"t": "source.cpp keyword.control.for.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.parens.cpp punctuation.section.parens.begin.bracket.round.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.section.parens.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.parens.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.parens.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": " i",
-		"t": "source.cpp source.cpp meta.parens.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.cpp source.cpp meta.parens.cpp keyword.operator.assignment.cpp",
+		"t": "source.cpp meta.parens.cpp keyword.operator.assignment.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.cpp source.cpp meta.parens.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.parens.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.parens.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.cpp source.cpp meta.parens.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": "<",
-		"t": "source.cpp source.cpp meta.parens.cpp keyword.operator.comparison.cpp",
+		"t": "source.cpp meta.parens.cpp keyword.operator.comparison.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "num_candidate",
-		"t": "source.cpp source.cpp meta.parens.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.parens.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "++",
-		"t": "source.cpp source.cpp meta.parens.cpp keyword.operator.increment.cpp",
+		"t": "source.cpp meta.parens.cpp keyword.operator.increment.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.cpp source.cpp meta.parens.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.parens.cpp punctuation.section.parens.end.bracket.round.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.section.parens.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "fprintf",
-		"t": "source.cpp source.cpp entity.name.function.call.cpp",
+		"t": "source.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "stderr",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -408,7 +408,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -419,7 +419,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "%d",
-		"t": "source.cpp source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
+		"t": "source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -441,7 +441,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp string.quoted.double.cpp",
+		"t": "source.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -452,7 +452,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -463,7 +463,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "user_candidate",
-		"t": "source.cpp source.cpp meta.bracket.square.access.cpp variable.other.object.cpp",
+		"t": "source.cpp meta.bracket.square.access.cpp variable.other.object.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.cpp source.cpp meta.bracket.square.access.cpp punctuation.definition.begin.bracket.square.cpp",
+		"t": "source.cpp meta.bracket.square.access.cpp punctuation.definition.begin.bracket.square.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.cpp source.cpp meta.bracket.square.access.cpp",
+		"t": "source.cpp meta.bracket.square.access.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.cpp source.cpp meta.bracket.square.access.cpp punctuation.definition.end.bracket.square.cpp",
+		"t": "source.cpp meta.bracket.square.access.cpp punctuation.definition.end.bracket.square.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -540,7 +540,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -551,7 +551,7 @@
 	},
 	{
 		"c": "fprintf",
-		"t": "source.cpp source.cpp entity.name.function.call.cpp",
+		"t": "source.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -562,7 +562,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -573,7 +573,7 @@
 	},
 	{
 		"c": "stderr",
-		"t": "source.cpp source.cpp",
+		"t": "source.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -584,7 +584,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +595,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -606,7 +606,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp string.quoted.double.cpp",
+		"t": "source.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -617,7 +617,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -628,7 +628,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -650,7 +650,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -661,7 +661,7 @@
 	},
 	{
 		"c": "endif",
-		"t": "source.cpp source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
+		"t": "source.cpp meta.preprocessor.cpp keyword.control.directive.conditional.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -672,7 +672,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +683,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -694,7 +694,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -705,7 +705,7 @@
 	},
 	{
 		"c": "main",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": "O",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp entity.name.type.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp entity.name.type.parameter.cpp",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -738,7 +738,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": "obj",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -760,7 +760,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +771,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -782,7 +782,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -793,7 +793,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -804,7 +804,7 @@
 	},
 	{
 		"c": "LOG_INFO",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -815,7 +815,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -826,7 +826,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -837,7 +837,7 @@
 	},
 	{
 		"c": "not hilighted as string",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -848,7 +848,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -859,7 +859,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,7 +870,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -881,7 +881,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -892,7 +892,7 @@
 	},
 	{
 		"c": "LOG_INFO",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -903,7 +903,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -914,7 +914,7 @@
 	},
 	{
 		"c": "obj ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +925,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -936,7 +936,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +947,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -958,7 +958,7 @@
 	},
 	{
 		"c": ", even worse; ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -969,7 +969,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -980,7 +980,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -991,7 +991,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1002,7 +1002,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1013,7 +1013,7 @@
 	},
 	{
 		"c": "obj",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.object.access.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.object.access.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1024,7 +1024,7 @@
 	},
 	{
 		"c": ".",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.dot-access.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.dot-access.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1035,7 +1035,7 @@
 	},
 	{
 		"c": "x",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.property.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.property.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1046,7 +1046,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1068,7 +1068,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": " check this out.",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1112,7 +1112,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1156,7 +1156,7 @@
 	},
 	{
 		"c": " everything from this point on is interpeted as a string literal...",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "    O x",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1178,7 +1178,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1189,7 +1189,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1200,7 +1200,7 @@
 	},
 	{
 		"c": "std",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.scope-resolution.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.scope-resolution.cpp",
 		"r": {
 			"dark_plus": "entity.name.scope-resolution: #4EC9B0",
 			"light_plus": "entity.name.scope-resolution: #267F99",
@@ -1211,7 +1211,7 @@
 	},
 	{
 		"c": "::",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1222,7 +1222,7 @@
 	},
 	{
 		"c": "unique_ptr",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1233,7 @@
 	},
 	{
 		"c": "<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.comparison.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.comparison.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1244,7 +1244,7 @@
 	},
 	{
 		"c": "O",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1255,7 +1255,7 @@
 	},
 	{
 		"c": ">",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.comparison.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.comparison.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1266,7 +1266,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1277,7 @@
 	},
 	{
 		"c": "o",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1288,7 +1288,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": "new",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.wordlike.cpp keyword.operator.new.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.wordlike.cpp keyword.operator.new.cpp",
 		"r": {
 			"dark_plus": "source.cpp keyword.operator.new: #C586C0",
 			"light_plus": "source.cpp keyword.operator.new: #AF00DB",
@@ -1310,7 +1310,7 @@
 	},
 	{
 		"c": " O",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1321,7 +1321,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1332,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1343,7 +1343,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1354,7 +1354,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1365,7 +1365,7 @@
 	},
 	{
 		"c": " sadness.",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1376,7 +1376,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "sprintf",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1398,7 +1398,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1409,7 +1409,7 @@
 	},
 	{
 		"c": "options",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1431,7 +1431,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1442,7 +1442,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1453,7 +1453,7 @@
 	},
 	{
 		"c": "STYLE=Keramik;TITLE=",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1464,7 +1464,7 @@
 	},
 	{
 		"c": "%s",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1475,7 +1475,7 @@
 	},
 	{
 		"c": ";THEME=",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1486,7 +1486,7 @@
 	},
 	{
 		"c": "%s",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1497,7 +1497,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1508,7 +1508,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1519,7 +1519,7 @@
 	},
 	{
 		"c": " ...",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1530,7 +1530,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1541,7 +1541,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1552,7 +1552,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1563,7 +1563,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1574,7 +1574,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1585,7 +1585,7 @@
 	},
 	{
 		"c": "main2",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1596,7 +1596,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1607,7 +1607,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1618,7 +1618,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1629,7 +1629,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1640,7 +1640,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1651,7 +1651,7 @@
 	},
 	{
 		"c": "printf",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1662,7 +1662,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1673,7 +1673,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1684,7 +1684,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1706,7 +1706,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1717,7 +1717,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1728,7 +1728,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1739,7 +1739,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1750,7 +1750,7 @@
 	},
 	{
 		"c": " the rest of",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1761,7 +1761,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1772,7 +1772,7 @@
 	},
 	{
 		"c": "asm",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp storage.type.asm.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp storage.type.asm.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1783,7 +1783,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp punctuation.section.parens.begin.bracket.round.assembly.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp punctuation.section.parens.begin.bracket.round.assembly.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1794,7 +1794,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp punctuation.definition.string.begin.assembly.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp punctuation.definition.string.begin.assembly.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1805,7 +1805,7 @@
 	},
 	{
 		"c": "movw $0x38, %ax; ltr %ax",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp meta.embedded.assembly.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp meta.embedded.assembly.cpp",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -1816,7 +1816,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp punctuation.definition.string.end.assembly.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp string.quoted.double.cpp punctuation.definition.string.end.assembly.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1827,7 +1827,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp punctuation.section.parens.end.bracket.round.assembly.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.asm.cpp punctuation.section.parens.end.bracket.round.assembly.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1838,7 +1838,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1860,7 +1860,7 @@
 	},
 	{
 		"c": "fn",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.call.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1871,7 +1871,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1882,7 +1882,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1893,7 +1893,7 @@
 	},
 	{
 		"c": "{};",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1904,7 +1904,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1915,7 +1915,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1926,7 +1926,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1937,7 +1937,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1948,7 +1948,7 @@
 	},
 	{
 		"c": "//",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1959,7 +1959,7 @@
 	},
 	{
 		"c": " the rest of",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1970,7 +1970,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/cpp/test/colorize-results/test_cpp.json
index bf47c52c329994aff911f4b9fd9cf41dde90ee50..0cda6fbe21a97299ad33208b689c9d1be54736e4 100644
--- a/extensions/cpp/test/colorize-results/test_cpp.json
+++ b/extensions/cpp/test/colorize-results/test_cpp.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "//",
-		"t": "source.cpp source.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
+		"t": "source.cpp comment.line.double-slash.cpp punctuation.definition.comment.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -12,7 +12,7 @@
 	},
 	{
 		"c": " classes example",
-		"t": "source.cpp source.cpp comment.line.double-slash.cpp",
+		"t": "source.cpp comment.line.double-slash.cpp",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -22,74 +22,63 @@
 		}
 	},
 	{
-		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp punctuation.definition.directive.cpp",
+		"c": "#include",
+		"t": "source.cpp variable.other.macro.argument.cpp",
 		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
-		}
-	},
-	{
-		"c": "include",
-		"t": "source.cpp source.cpp meta.preprocessor.include.cpp keyword.control.directive.include.cpp",
-		"r": {
-			"dark_plus": "keyword.control: #C586C0",
-			"light_plus": "keyword.control: #AF00DB",
-			"dark_vs": "keyword.control: #569CD6",
-			"light_vs": "keyword.control: #0000FF",
-			"hc_black": "keyword.control: #C586C0"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.include.cpp",
+		"t": "source.cpp",
 		"r": {
-			"dark_plus": "meta.preprocessor: #569CD6",
-			"light_plus": "meta.preprocessor: #0000FF",
-			"dark_vs": "meta.preprocessor: #569CD6",
-			"light_vs": "meta.preprocessor: #0000FF",
-			"hc_black": "meta.preprocessor: #569CD6"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": "<",
-		"t": "source.cpp source.cpp meta.preprocessor.include.cpp string.quoted.other.lt-gt.include.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp keyword.operator.comparison.cpp",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
 		}
 	},
 	{
 		"c": "iostream",
-		"t": "source.cpp source.cpp meta.preprocessor.include.cpp string.quoted.other.lt-gt.include.cpp",
+		"t": "source.cpp",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
 		}
 	},
 	{
 		"c": ">",
-		"t": "source.cpp source.cpp meta.preprocessor.include.cpp string.quoted.other.lt-gt.include.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp keyword.operator.comparison.cpp",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
 		}
 	},
 	{
 		"c": "using",
-		"t": "source.cpp source.cpp meta.using-namespace.cpp keyword.other.using.directive.cpp",
+		"t": "source.cpp meta.using-namespace.cpp keyword.other.using.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.other.using: #C586C0",
 			"light_plus": "keyword.other.using: #AF00DB",
@@ -100,7 +89,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.using-namespace.cpp",
+		"t": "source.cpp meta.using-namespace.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -111,7 +100,7 @@
 	},
 	{
 		"c": "namespace",
-		"t": "source.cpp source.cpp meta.using-namespace.cpp keyword.other.namespace.directive.cpp storage.type.namespace.directive.cpp",
+		"t": "source.cpp meta.using-namespace.cpp keyword.other.namespace.directive.cpp storage.type.namespace.directive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -122,7 +111,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.using-namespace.cpp",
+		"t": "source.cpp meta.using-namespace.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -133,7 +122,7 @@
 	},
 	{
 		"c": "std",
-		"t": "source.cpp source.cpp meta.using-namespace.cpp entity.name.namespace.cpp",
+		"t": "source.cpp meta.using-namespace.cpp entity.name.namespace.cpp",
 		"r": {
 			"dark_plus": "entity.name.namespace: #4EC9B0",
 			"light_plus": "entity.name.namespace: #267F99",
@@ -144,7 +133,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.using-namespace.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.using-namespace.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +144,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp punctuation.definition.directive.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -166,7 +155,7 @@
 	},
 	{
 		"c": "define",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp keyword.control.directive.define.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -177,7 +166,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -188,7 +177,7 @@
 	},
 	{
 		"c": "EXTERN_C",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp entity.name.function.preprocessor.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -199,7 +188,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -210,7 +199,7 @@
 	},
 	{
 		"c": "extern",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp storage.type.extern.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp storage.type.extern.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -221,7 +210,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -232,7 +221,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -243,7 +232,7 @@
 	},
 	{
 		"c": "C",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -254,7 +243,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.extern.cpp meta.head.extern.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -265,7 +254,7 @@
 	},
 	{
 		"c": "class",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.head.class.cpp storage.type.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.head.class.cpp storage.type.class.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -276,7 +265,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.head.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.head.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -287,7 +276,7 @@
 	},
 	{
 		"c": "Rectangle",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.head.class.cpp entity.name.type.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.head.class.cpp entity.name.type.class.cpp",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -298,7 +287,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.head.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.head.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +298,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.head.class.cpp punctuation.section.block.begin.bracket.curly.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.head.class.cpp punctuation.section.block.begin.bracket.curly.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +309,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +320,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -342,7 +331,7 @@
 	},
 	{
 		"c": " width",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -353,7 +342,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -364,7 +353,7 @@
 	},
 	{
 		"c": " height",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -375,7 +364,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -386,7 +375,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -397,7 +386,7 @@
 	},
 	{
 		"c": "public",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp storage.type.modifier.access.control.public.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp storage.type.modifier.access.control.public.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -408,7 +397,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp storage.type.modifier.access.control.public.cpp colon.cpp punctuation.separator.delimiter.colon.access.control.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp storage.type.modifier.access.control.public.cpp punctuation.separator.colon.access.control.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -419,7 +408,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -430,7 +419,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -441,7 +430,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -452,7 +441,7 @@
 	},
 	{
 		"c": "set_values",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -463,7 +452,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -474,7 +463,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -485,7 +474,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -496,7 +485,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +496,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -518,7 +507,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -529,7 +518,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -540,7 +529,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -551,7 +540,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -562,7 +551,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -573,7 +562,7 @@
 	},
 	{
 		"c": "area",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -584,7 +573,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -595,7 +584,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -606,7 +595,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -617,7 +606,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -628,7 +617,7 @@
 	},
 	{
 		"c": "return",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.return.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.return.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -639,7 +628,7 @@
 	},
 	{
 		"c": " width",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -650,7 +639,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -661,7 +650,7 @@
 	},
 	{
 		"c": "height",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -672,7 +661,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -683,7 +672,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -694,7 +683,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.section.block.end.bracket.curly.class.cpp",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp punctuation.section.block.end.bracket.curly.class.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -705,7 +694,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.block.class.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.block.class.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +705,7 @@
 	},
 	{
 		"c": "void",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -727,7 +716,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -738,7 +727,7 @@
 	},
 	{
 		"c": "Rectangle",
-		"t": "source.cpp source.cpp meta.function.definition.cpp entity.name.scope-resolution.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp entity.name.scope-resolution.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.scope-resolution: #4EC9B0",
 			"light_plus": "entity.name.scope-resolution: #267F99",
@@ -749,7 +738,7 @@
 	},
 	{
 		"c": "::",
-		"t": "source.cpp source.cpp meta.function.definition.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -760,7 +749,7 @@
 	},
 	{
 		"c": "set_values",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -771,7 +760,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -782,7 +771,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -793,7 +782,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -804,7 +793,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -815,7 +804,7 @@
 	},
 	{
 		"c": "x",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -826,7 +815,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -837,7 +826,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -848,7 +837,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -859,7 +848,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,7 +859,7 @@
 	},
 	{
 		"c": "y",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters.cpp meta.parameter.cpp variable.parameter.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -881,7 +870,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -892,7 +881,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -903,7 +892,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -914,7 +903,7 @@
 	},
 	{
 		"c": "  width ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +914,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.assignment.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.assignment.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -936,7 +925,7 @@
 	},
 	{
 		"c": " x",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -947,7 +936,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -958,7 +947,7 @@
 	},
 	{
 		"c": "  height ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -969,7 +958,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.assignment.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.assignment.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -980,7 +969,7 @@
 	},
 	{
 		"c": " y",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -991,7 +980,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1002,7 +991,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1013,7 +1002,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.qualified_type.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1024,7 +1013,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1035,7 +1024,7 @@
 	},
 	{
 		"c": "main",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp entity.name.function.definition.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1046,7 +1035,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1046,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1068,7 +1057,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.parameters.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1068,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1079,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp punctuation.section.block.begin.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1101,7 +1090,7 @@
 	},
 	{
 		"c": "  Rectangle rect",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1112,7 +1101,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1112,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1134,7 +1123,7 @@
 	},
 	{
 		"c": "rect",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.object.access.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.object.access.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1145,7 +1134,7 @@
 	},
 	{
 		"c": ".",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.dot-access.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.dot-access.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1156,7 +1145,7 @@
 	},
 	{
 		"c": "set_values",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.member.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.member.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1167,7 +1156,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1178,7 +1167,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.member.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.member.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1189,7 +1178,7 @@
 	},
 	{
 		"c": "3",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1200,7 +1189,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1211,7 +1200,7 @@
 	},
 	{
 		"c": "4",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1222,7 +1211,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.member.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.member.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1222,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1244,7 +1233,7 @@
 	},
 	{
 		"c": "  cout ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1255,7 +1244,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1266,7 +1255,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1266,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1288,7 +1277,7 @@
 	},
 	{
 		"c": "area: ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1299,7 +1288,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1310,7 +1299,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1321,7 +1310,7 @@
 	},
 	{
 		"c": "<<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.operator.bitwise.shift.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1332,7 +1321,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1343,7 +1332,7 @@
 	},
 	{
 		"c": "rect",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.object.access.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp variable.other.object.access.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1354,7 +1343,7 @@
 	},
 	{
 		"c": ".",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.dot-access.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.dot-access.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1365,7 +1354,7 @@
 	},
 	{
 		"c": "area",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.member.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.function.member.cpp",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1376,7 +1365,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.member.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.begin.bracket.round.function.member.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1387,7 +1376,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.member.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.arguments.end.bracket.round.function.member.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1398,7 +1387,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1409,7 +1398,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1409,7 @@
 	},
 	{
 		"c": "Task",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.scope-resolution.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp entity.name.scope-resolution.cpp",
 		"r": {
 			"dark_plus": "entity.name.scope-resolution: #4EC9B0",
 			"light_plus": "entity.name.scope-resolution: #267F99",
@@ -1431,7 +1420,7 @@
 	},
 	{
 		"c": "<",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp punctuation.section.angle-brackets.begin.template.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp punctuation.section.angle-brackets.begin.template.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1442,7 +1431,7 @@
 	},
 	{
 		"c": "ANY_OUTPUT_TYPE",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp entity.name.type.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp entity.name.type.cpp",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1453,7 +1442,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp comma.cpp punctuation.separator.template.argument.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp punctuation.separator.delimiter.comma.template.argument.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1464,7 +1453,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1475,7 +1464,7 @@
 	},
 	{
 		"c": "ANY_INPUT_TYPE",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp entity.name.type.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp entity.name.type.cpp",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -1486,7 +1475,7 @@
 	},
 	{
 		"c": ">",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp punctuation.section.angle-brackets.end.template.call.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp punctuation.section.angle-brackets.end.template.call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1497,7 +1486,7 @@
 	},
 	{
 		"c": "::",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1508,7 +1497,7 @@
 	},
 	{
 		"c": "links_to",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1519,7 +1508,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1530,7 +1519,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1541,7 +1530,7 @@
 	},
 	{
 		"c": "return",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.return.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp keyword.control.return.cpp",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -1552,7 +1541,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1563,7 +1552,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1574,7 +1563,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1585,7 +1574,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
+		"t": "source.cpp meta.function.definition.cpp meta.body.function.definition.cpp punctuation.section.block.end.bracket.curly.function.definition.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",