diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json
index c216c10420b..cdcea133032 100644
--- a/extensions/cpp/cgmanifest.json
+++ b/extensions/cpp/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jeff-hykin/cpp-textmate-grammar",
 					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "666808cab3907fc91ed4d3901060ee6b045cca58"
+					"commitHash": "5b6f67859e895da83dc242b849480ee04ce7ce38"
 				}
 			},
 			"license": "MIT",
-			"version": "1.14.15",
+			"version": "1.14.20",
 			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
 		},
 		{
diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json
index bb037f684a5..acf62fab955 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/72b309aabb63bf14a3cdf0280149121db005d616",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/85b9008b406cc9d3b1c9e779e94cc071116c8426",
 	"name": "C",
 	"scopeName": "source.c",
 	"patterns": [
@@ -464,7 +464,7 @@
 			]
 		},
 		"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} )",
+			"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?]   |\n[0-3][0-7]{,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.c"
 		},
 		"block": {
@@ -690,12 +690,20 @@
 							"name": "storage.type.class.doxygen.c"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.c"
 								},
 								"2": {
+									"patterns": [
+										{
+											"match": "in|out",
+											"name": "keyword.other.parameter.direction.$0.c"
+										}
+									]
+								},
+								"3": {
 									"name": "variable.parameter.c"
 								}
 							}
@@ -768,12 +776,20 @@
 									"name": "storage.type.class.doxygen.c"
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+									"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.c"
 										},
 										"2": {
+											"patterns": [
+												{
+													"match": "in|out",
+													"name": "keyword.other.parameter.direction.$0.c"
+												}
+											]
+										},
+										"3": {
 											"name": "variable.parameter.c"
 										}
 									}
@@ -859,12 +875,20 @@
 							"name": "storage.type.class.doxygen.c"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?\\s*(?:in|out)\\s*)+)\\])?\\s+(\\b\\w+\\b)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.c"
 								},
 								"2": {
+									"patterns": [
+										{
+											"match": "in|out",
+											"name": "keyword.other.parameter.direction.$0.c"
+										}
+									]
+								},
+								"3": {
 									"name": "variable.parameter.c"
 								}
 							}
@@ -2874,95 +2898,219 @@
 				},
 				{
 					"name": "meta.asm.c",
-					"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
+					"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.type.asm.c"
 						},
 						"2": {
 							"name": "storage.modifier.c"
-						},
-						"3": {
-							"name": "punctuation.section.parens.begin.bracket.round.assembly.c"
-						}
-					},
-					"end": "(\\))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.section.parens.end.bracket.round.assembly.c"
 						}
 					},
+					"end": "(?!\\G)",
 					"patterns": [
 						{
-							"name": "string.quoted.double.c",
-							"contentName": "meta.embedded.assembly.c",
-							"begin": "(R?)(\")",
-							"beginCaptures": {
+							"match": "(?:^)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(?:\\n|$)",
+							"captures": {
 								"1": {
-									"name": "meta.encoding.c"
+									"patterns": [
+										{
+											"include": "#inline_comment"
+										}
+									]
 								},
 								"2": {
-									"name": "punctuation.definition.string.begin.assembly.c"
-								}
-							},
-							"end": "(\")",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.end.assembly.c"
-								}
-							},
-							"patterns": [
-								{
-									"include": "source.asm"
+									"name": "comment.block.c punctuation.definition.comment.begin.c"
 								},
-								{
-									"include": "source.x86"
+								"3": {
+									"name": "comment.block.c"
 								},
-								{
-									"include": "source.x86_64"
-								},
-								{
-									"include": "source.arm"
-								},
-								{
-									"include": "#backslash_escapes"
-								},
-								{
-									"include": "#string_escaped_char"
-								},
-								{
-									"match": "(?=not)possible"
+								"4": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.c punctuation.definition.comment.end.c"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.c"
+										}
+									]
 								}
-							]
-						},
-						{
-							"begin": "(\\()",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.c"
-								}
-							},
-							"end": "(\\))",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.section.parens.end.bracket.round.assembly.inner.c"
-								}
-							},
-							"patterns": [
-								{
-									"include": "#evaluation_context"
-								}
-							]
-						},
-						{
-							"match": ":",
-							"name": "punctuation.separator.delimiter.colon.assembly.c"
+							}
 						},
 						{
 							"include": "#comments_context"
 						},
 						{
 							"include": "#comments"
+						},
+						{
+							"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\()",
+							"beginCaptures": {
+								"1": {
+									"name": "punctuation.section.parens.begin.bracket.round.assembly.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"
+										}
+									]
+								}
+							},
+							"end": "(\\))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.parens.end.bracket.round.assembly.c"
+								}
+							},
+							"patterns": [
+								{
+									"name": "string.quoted.double.c",
+									"contentName": "meta.embedded.assembly.c",
+									"begin": "(R?)(\")",
+									"beginCaptures": {
+										"1": {
+											"name": "meta.encoding.c"
+										},
+										"2": {
+											"name": "punctuation.definition.string.begin.assembly.c"
+										}
+									},
+									"end": "(\")",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.definition.string.end.assembly.c"
+										}
+									},
+									"patterns": [
+										{
+											"include": "source.asm"
+										},
+										{
+											"include": "source.x86"
+										},
+										{
+											"include": "source.x86_64"
+										},
+										{
+											"include": "source.arm"
+										},
+										{
+											"include": "#backslash_escapes"
+										},
+										{
+											"include": "#string_escaped_char"
+										}
+									]
+								},
+								{
+									"begin": "(\\()",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.c"
+										}
+									},
+									"end": "(\\))",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.parens.end.bracket.round.assembly.inner.c"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#evaluation_context"
+										}
+									]
+								},
+								{
+									"match": "\\[((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))([a-zA-Z_]\\w*)((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))\\]",
+									"captures": {
+										"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": "variable.other.asm.label.c"
+										},
+										"6": {
+											"patterns": [
+												{
+													"include": "#inline_comment"
+												}
+											]
+										},
+										"7": {
+											"name": "comment.block.c punctuation.definition.comment.begin.c"
+										},
+										"8": {
+											"name": "comment.block.c"
+										},
+										"9": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.c punctuation.definition.comment.end.c"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.c"
+												}
+											]
+										}
+									}
+								},
+								{
+									"match": ":",
+									"name": "punctuation.separator.delimiter.colon.assembly.c"
+								},
+								{
+									"include": "#comments_context"
+								},
+								{
+									"include": "#comments"
+								}
+							]
 						}
 					]
 				}
diff --git a/extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json b/extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
index e1ff11c5d9b..e1a423160dc 100644
--- a/extensions/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.embedded.macro.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/666808cab3907fc91ed4d3901060ee6b045cca58",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/5b6f67859e895da83dc242b849480ee04ce7ce38",
 	"name": "C++",
 	"scopeName": "source.cpp.embedded.macro",
 	"patterns": [
@@ -27,13 +27,13 @@
 			"include": "#using_namespace"
 		},
 		{
-			"include": "#type_alias"
+			"include": "source.cpp#type_alias"
 		},
 		{
-			"include": "#using_name"
+			"include": "source.cpp#using_name"
 		},
 		{
-			"include": "#namespace_alias"
+			"include": "source.cpp#namespace_alias"
 		},
 		{
 			"include": "#namespace_block"
@@ -51,10 +51,10 @@
 			"include": "#typedef_union"
 		},
 		{
-			"include": "#typedef_keyword"
+			"include": "source.cpp#misc_keywords"
 		},
 		{
-			"include": "#standard_declares"
+			"include": "source.cpp#standard_declares"
 		},
 		{
 			"include": "#class_block"
@@ -69,13 +69,13 @@
 			"include": "#enum_block"
 		},
 		{
-			"include": "#template_isolated_definition"
+			"include": "source.cpp#template_isolated_definition"
 		},
 		{
 			"include": "#template_definition"
 		},
 		{
-			"include": "#access_control_keywords"
+			"include": "source.cpp#access_control_keywords"
 		},
 		{
 			"include": "#block"
@@ -94,56 +94,20 @@
 		}
 	],
 	"repository": {
-		"access_control_keywords": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(((?:protected|private|public))\\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": "storage.type.modifier.access.control.$6.cpp"
-				},
-				"7": {
-					"name": "punctuation.separator.colon.access.control.cpp"
-				}
-			}
-		},
 		"alignas_attribute": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(alignas\\()",
+			"begin": "alignas\\(",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -151,6 +115,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -161,7 +127,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -188,13 +154,13 @@
 					"name": "entity.other.attribute.$0.cpp"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				}
 			]
 		},
 		"alignas_operator": {
-			"contentName": "meta.arguments.operator.alignas.cpp",
-			"begin": "((?<!\\w)alignas(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
@@ -202,7 +168,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -228,12 +194,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.alignas",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -241,8 +207,8 @@
 			]
 		},
 		"alignof_operator": {
-			"contentName": "meta.arguments.operator.alignof.cpp",
-			"begin": "((?<!\\w)alignof(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
@@ -250,7 +216,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -276,12 +242,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.alignof",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -289,103 +255,224 @@
 			]
 		},
 		"assembly": {
-			"name": "meta.asm.cpp",
-			"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
+			"begin": "(\\b(?:__asm__|asm)\\b)(?:(?:\\s)+)?((?:volatile)?)",
+			"end": "(?!\\G)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.type.asm.cpp"
 				},
 				"2": {
 					"name": "storage.modifier.cpp"
-				},
-				"3": {
-					"name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
-				}
-			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
-			"endCaptures": {
-				"1": {
-					"name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
 				}
 			},
+			"endCaptures": {},
+			"name": "meta.asm.cpp",
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"contentName": "meta.embedded.assembly.cpp",
-					"begin": "(R?)(\")",
-					"beginCaptures": {
+					"match": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\n)|$)",
+					"captures": {
 						"1": {
-							"name": "meta.encoding.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"2": {
-							"name": "punctuation.definition.string.begin.assembly.cpp"
-						}
-					},
-					"end": "(\")|(?=(?<!\\\\)\n)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.assembly.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "source.asm"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						{
-							"include": "source.x86"
+						"3": {
+							"name": "comment.block.cpp"
 						},
-						{
-							"include": "source.x86_64"
-						},
-						{
-							"include": "source.arm"
-						},
-						{
-							"include": "#backslash_escapes"
-						},
-						{
-							"include": "#string_escaped_char"
-						},
-						{
-							"match": "(?=not)possible"
+						"4": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						}
-					]
-				},
-				{
-					"begin": "(\\()",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
-						}
-					},
-					"end": "(\\))|(?=(?<!\\\\)\n)",
-					"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"
+				},
+				{
+					"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\(",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
+						},
+						"1": {
+							"patterns": [
+								{
+									"include": "source.cpp#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"
+								}
+							]
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "(R?)(\")",
+							"end": "\"|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"1": {
+									"name": "meta.encoding.cpp"
+								},
+								"2": {
+									"name": "punctuation.definition.string.begin.assembly.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.assembly.cpp"
+								}
+							},
+							"name": "string.quoted.double.cpp",
+							"contentName": "meta.embedded.assembly",
+							"patterns": [
+								{
+									"include": "source.asm"
+								},
+								{
+									"include": "source.x86"
+								},
+								{
+									"include": "source.x86_64"
+								},
+								{
+									"include": "source.arm"
+								},
+								{
+									"include": "source.cpp#backslash_escapes"
+								},
+								{
+									"include": "#string_escaped_char"
+								}
+							]
+						},
+						{
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.parens.end.bracket.round.assembly.inner.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#evaluation_context"
+								}
+							]
+						},
+						{
+							"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}))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "source.cpp#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.other.asm.label.cpp"
+								},
+								"6": {
+									"patterns": [
+										{
+											"include": "source.cpp#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"
+										}
+									]
+								}
+							}
+						},
+						{
+							"match": ":",
+							"name": "punctuation.separator.delimiter.colon.assembly.cpp"
+						},
+						{
+							"include": "#comments_context"
+						},
+						{
+							"include": "#comments"
+						}
+					]
 				}
 			]
 		},
-		"assignment_operator": {
-			"match": "\\=",
-			"name": "keyword.operator.assignment.cpp"
-		},
 		"attributes_context": {
 			"patterns": [
 				{
@@ -402,24 +489,20 @@
 				}
 			]
 		},
-		"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"
-		},
 		"block": {
-			"name": "meta.block.cpp",
-			"begin": "({)",
+			"begin": "{",
+			"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.block.begin.bracket.curly.cpp"
 				}
 			},
-			"end": "(}|(?=\\s*#\\s*(?:elif|else|endif)\\b))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.block.end.bracket.curly.cpp"
 				}
 			},
+			"name": "meta.block.cpp",
 			"patterns": [
 				{
 					"include": "#function_body_context"
@@ -427,27 +510,28 @@
 			]
 		},
 		"block_comment": {
-			"name": "comment.block.cpp",
 			"begin": "\\s*+(\\/\\*)",
+			"end": "\\*\\/|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.begin.cpp"
 				}
 			},
-			"end": "(\\*\\/)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.definition.comment.end.cpp"
 				}
-			}
+			},
+			"name": "comment.block.cpp"
 		},
 		"builtin_storage_type_initilizer": {
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w)))|((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))|((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\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)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -472,7 +556,7 @@
 				"5": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -500,7 +584,7 @@
 				"10": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -528,7 +612,7 @@
 				"15": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -556,7 +640,7 @@
 				"20": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -584,7 +668,7 @@
 				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -610,9 +694,8 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.initializer.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.initializer.cpp"
 				}
 			},
@@ -623,13 +706,13 @@
 			]
 		},
 		"case_statement": {
-			"name": "meta.conditional.case.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)case(?!\\w))",
+			"end": ":|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -655,12 +738,12 @@
 					"name": "keyword.control.case.cpp"
 				}
 			},
-			"end": "(:)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.separator.colon.case.cpp"
 				}
 			},
+			"name": "meta.conditional.case.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -671,92 +754,92 @@
 			]
 		},
 		"class_block": {
-			"name": "meta.block.class.cpp",
-			"begin": "((((?<!\\w)class(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+			"begin": "((?<!\\w)class(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.class.cpp"
 				},
-				"3": {
-					"name": "storage.type.$3.cpp"
+				"1": {
+					"name": "storage.type.$1.cpp"
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"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": "#attributes_context"
+						},
+						{
+							"include": "source.cpp#number_literal"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
 				"12": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"13": {
-					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-				},
-				"14": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"15": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -768,111 +851,111 @@
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"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.$1.cpp"
+				},
 				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"23": {
-					"name": "entity.name.type.$3.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"25": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"26": {
-					"name": "comment.block.cpp"
+					"name": "storage.type.modifier.final.cpp"
 				},
 				"27": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"28": {
-					"name": "storage.type.modifier.final.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"31": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"32": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"33": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -884,18 +967,10 @@
 						}
 					]
 				},
-				"37": {
+				"35": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inheritance_context"
-						}
-					]
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -904,16 +979,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.class.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.class.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
 						}
 					},
+					"name": "meta.head.class.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -927,14 +1004,15 @@
 					]
 				},
 				{
-					"name": "meta.body.class.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.class.cpp"
 						}
 					},
+					"name": "meta.body.class.cpp",
 					"patterns": [
 						{
 							"include": "#function_pointer"
@@ -954,9 +1032,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.class.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -965,217 +1045,28 @@
 				}
 			]
 		},
-		"class_declare": {
-			"match": "((?<!\\w)class(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
-			"captures": {
-				"1": {
-					"name": "storage.type.class.declare.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": "entity.name.type.class.cpp"
-				},
-				"7": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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": [
-						{
-							"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": {
-					"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": {
-					"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": "variable.other.object.declare.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"
-						}
-					]
-				}
-			}
-		},
-		"comma": {
-			"match": ",",
-			"name": "punctuation.separator.delimiter.comma.cpp"
-		},
-		"comma_in_template_argument": {
-			"match": ",",
-			"name": "punctuation.separator.delimiter.comma.template.argument.cpp"
-		},
 		"comments": {
 			"patterns": [
 				{
-					"name": "comment.line.double-slash.documentation.cpp",
-					"begin": "(?:^)(?>\\s*)(\\/\\/[!\\/]+)",
+					"begin": "^(?:(?:\\s)+)?+(\\/\\/[!\\/]+)",
+					"end": "(?<=\\n)(?<!\\\\\\n)|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.comment.documentation.cpp"
 						}
 					},
-					"end": "(?<=\\n)(?<!\\\\\\n)|(?=(?<!\\\\)\n)",
+					"endCaptures": {},
+					"name": "comment.line.double-slash.documentation.cpp",
 					"patterns": [
 						{
-							"include": "#line_continuation_character"
+							"include": "source.cpp#line_continuation_character"
 						},
 						{
 							"match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1186,7 +1077,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]b)(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1197,7 +1088,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1216,12 +1107,20 @@
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:(?:\\s)+)?(?:in|out)(?:(?:\\s)+)?)+)\\])?(?:\\s)+(\\b\\w+\\b)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								"2": {
+									"patterns": [
+										{
+											"match": "in|out",
+											"name": "keyword.other.parameter.direction.$0.cpp"
+										}
+									]
+								},
+								"3": {
 									"name": "variable.parameter.cpp"
 								}
 							}
@@ -1253,7 +1152,7 @@
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+									"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))(?:\\s)+(\\S+)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
@@ -1264,7 +1163,7 @@
 									}
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+									"match": "((?<=[\\s*!\\/])[\\\\@]b)(?:\\s)+(\\S+)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
@@ -1275,7 +1174,7 @@
 									}
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+									"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))(?:\\s)+(\\S+)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
@@ -1294,12 +1193,20 @@
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+									"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:(?:\\s)+)?(?:in|out)(?:(?:\\s)+)?)+)\\])?(?:\\s)+(\\b\\w+\\b)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
 										},
 										"2": {
+											"patterns": [
+												{
+													"match": "in|out",
+													"name": "keyword.other.parameter.direction.$0.cpp"
+												}
+											]
+										},
+										"3": {
 											"name": "variable.parameter.cpp"
 										}
 									}
@@ -1325,26 +1232,26 @@
 					"name": "comment.block.documentation.cpp"
 				},
 				{
-					"name": "comment.block.documentation.cpp",
-					"begin": "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
+					"begin": "(?:(?:\\s)+)?+\\/\\*[!*]+(?:(?:(?:\\n)|$)|(?=\\s))",
+					"end": "[!*]*\\*\\/|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.comment.begin.documentation.cpp"
 						}
 					},
-					"end": "([!*]*\\*\\/)|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.comment.end.documentation.cpp"
 						}
 					},
+					"name": "comment.block.documentation.cpp",
 					"patterns": [
 						{
 							"match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1355,7 +1262,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]b)(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1366,7 +1273,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1385,12 +1292,20 @@
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:(?:\\s)+)?(?:in|out)(?:(?:\\s)+)?)+)\\])?(?:\\s)+(\\b\\w+\\b)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								"2": {
+									"patterns": [
+										{
+											"match": "in|out",
+											"name": "keyword.other.parameter.direction.$0.cpp"
+										}
+									]
+								},
+								"3": {
 									"name": "variable.parameter.cpp"
 								}
 							}
@@ -1410,7 +1325,7 @@
 					]
 				},
 				{
-					"include": "#emacs_file_banner"
+					"include": "source.cpp#emacs_file_banner"
 				},
 				{
 					"include": "#block_comment"
@@ -1419,31 +1334,31 @@
 					"include": "#line_comment"
 				},
 				{
-					"include": "#invalid_comment_end"
+					"include": "source.cpp#invalid_comment_end"
 				}
 			]
 		},
 		"constructor_inline": {
-			"name": "meta.function.definition.special.constructor.cpp",
-			"begin": "(^((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:(?:constexpr|explicit|mutable|virtual|inline|friend)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\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)(?=\\()))",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\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)(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.constructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1455,80 +1370,80 @@
 						}
 					]
 				},
+				"5": {
+					"patterns": [
+						{
+							"include": "source.cpp#functional_specifiers_pre_parameters"
+						}
+					]
+				},
 				"6": {
 					"patterns": [
 						{
-							"include": "#functional_specifiers_pre_parameters"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"7": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"8": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"10": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"11": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"12": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "comment.block.cpp"
 				},
 				"13": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"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": {
+				"15": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"17": {
+				"16": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"18": {
+				"17": {
 					"name": "comment.block.cpp"
 				},
-				"19": {
+				"18": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1540,83 +1455,82 @@
 						}
 					]
 				},
-				"20": {
+				"19": {
 					"name": "entity.name.function.constructor.cpp entity.name.function.definition.special.constructor.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.constructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.constructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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": {
+							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"captures": {
 								"1": {
+									"name": "keyword.operator.assignment.cpp"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "source.cpp#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": "source.cpp#functional_specifiers_pre_parameters"
+						},
+						{
+							"begin": ":",
+							"end": "(?=\\{)|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
 									"name": "punctuation.separator.initializers.cpp"
 								}
 							},
-							"end": "(?=\\{)|(?=(?<!\\\\)\n)",
+							"endCaptures": {},
 							"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))(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<3>?)+)>)\\s*)?(\\()",
+									"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))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?(\\()",
+									"end": "\\)|(?=(?<!\\\\)\n)",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -1629,16 +1543,17 @@
 												}
 											]
 										},
+										"3": {},
 										"4": {
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\))|(?=(?<!\\\\)\n)",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -1646,8 +1561,8 @@
 									]
 								},
 								{
-									"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))(\\{)",
+									"end": "\\}|(?=(?<!\\\\)\n)",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -1656,12 +1571,12 @@
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\})|(?=(?<!\\\\)\n)",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -1669,7 +1584,8 @@
 									]
 								},
 								{
-									"include": "#comma"
+									"match": ",",
+									"name": "punctuation.separator.delimiter.comma.cpp"
 								},
 								{
 									"include": "#comments"
@@ -1677,19 +1593,19 @@
 							]
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
 								}
 							},
-							"end": "(\\))|(?=(?<!\\\\)\n)",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters.special.constructor",
 							"patterns": [
 								{
 									"include": "#function_parameter_context"
@@ -1705,14 +1621,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.constructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -1720,9 +1637,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.constructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -1732,54 +1651,54 @@
 			]
 		},
 		"constructor_root": {
-			"name": "meta.function.definition.special.constructor.cpp",
-			"begin": "(\\s*+((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<14>?)+)>)\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))::((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\16((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\()))",
+			"begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.constructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "comment.block.cpp"
 				},
 				"4": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"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": {
+				"6": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1791,7 +1710,7 @@
 						}
 					]
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"match": "::",
@@ -1806,7 +1725,7 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -1814,7 +1733,8 @@
 						}
 					]
 				},
-				"15": {
+				"12": {},
+				"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}))*(?=:)",
@@ -1830,45 +1750,46 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"16": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"17": {
+					"name": "comment.block.cpp"
+				},
 				"18": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"19": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"20": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1880,20 +1801,20 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"26": {
+				"24": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"27": {
+				"25": {
 					"name": "comment.block.cpp"
 				},
-				"28": {
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1906,79 +1827,78 @@
 					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.constructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.constructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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": {
+							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"captures": {
 								"1": {
+									"name": "keyword.operator.assignment.cpp"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "source.cpp#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": "source.cpp#functional_specifiers_pre_parameters"
+						},
+						{
+							"begin": ":",
+							"end": "(?=\\{)|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
 									"name": "punctuation.separator.initializers.cpp"
 								}
 							},
-							"end": "(?=\\{)|(?=(?<!\\\\)\n)",
+							"endCaptures": {},
 							"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))(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<3>?)+)>)\\s*)?(\\()",
+									"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))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?(\\()",
+									"end": "\\)|(?=(?<!\\\\)\n)",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -1991,16 +1911,17 @@
 												}
 											]
 										},
+										"3": {},
 										"4": {
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\))|(?=(?<!\\\\)\n)",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -2008,8 +1929,8 @@
 									]
 								},
 								{
-									"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))(\\{)",
+									"end": "\\}|(?=(?<!\\\\)\n)",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -2018,12 +1939,12 @@
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\})|(?=(?<!\\\\)\n)",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -2031,7 +1952,8 @@
 									]
 								},
 								{
-									"include": "#comma"
+									"match": ",",
+									"name": "punctuation.separator.delimiter.comma.cpp"
 								},
 								{
 									"include": "#comments"
@@ -2039,19 +1961,19 @@
 							]
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
 								}
 							},
-							"end": "(\\))|(?=(?<!\\\\)\n)",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters.special.constructor",
 							"patterns": [
 								{
 									"include": "#function_parameter_context"
@@ -2067,14 +1989,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.constructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -2082,9 +2005,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.constructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -2093,53 +2018,20 @@
 				}
 			]
 		},
-		"control_flow_keywords": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:continue|default|switch|return|throw|break|catch|while|case|goto|else|try|for|do|if)(?!\\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": "keyword.control.$5.cpp"
-				}
-			}
-		},
 		"cpp_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(\\[\\[)",
+			"begin": "\\[\\[",
+			"end": "\\]\\]|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\]\\])|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -2147,6 +2039,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -2157,7 +2051,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -2184,19 +2078,19 @@
 					"name": "entity.other.attribute.$0.cpp"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				}
 			]
 		},
 		"curly_initializer": {
-			"name": "meta.initialization.cpp",
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\{)",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)",
+			"end": "\\}|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -2209,19 +2103,36 @@
 							"include": "#storage_types"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						},
 						{
 							"include": "#string_context"
 						},
 						{
-							"include": "#comma"
+							"include": "source.cpp#comma"
 						},
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -2235,14 +2146,14 @@
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
 				"3": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -2267,7 +2178,7 @@
 				"7": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -2289,17 +2200,17 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"13": {
+				"12": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"15": {
+				"13": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2307,10 +2218,11 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"18": {
+				"16": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2318,23 +2230,24 @@
 						}
 					]
 				},
+				"17": {},
+				"18": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
 				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"23": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2346,10 +2259,10 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"name": "entity.name.type.cpp"
 				},
-				"26": {
+				"24": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2357,20 +2270,21 @@
 						}
 					]
 				},
-				"28": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"29": {
+				"27": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"30": {
+				"28": {
 					"name": "comment.block.cpp"
 				},
-				"31": {
+				"29": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2382,28 +2296,28 @@
 						}
 					]
 				},
-				"32": {
+				"30": {
 					"name": "punctuation.section.arguments.begin.bracket.curly.initializer.cpp"
 				}
 			},
-			"end": "(\\})|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.curly.initializer.cpp"
 				}
 			},
+			"name": "meta.initialization.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
 				},
 				{
-					"include": "#comma"
+					"include": "source.cpp#comma"
 				}
 			]
 		},
 		"decltype": {
-			"contentName": "meta.arguments.decltype.cpp",
-			"begin": "((?<!\\w)decltype(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2411,7 +2325,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -2437,12 +2351,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
 				}
 			},
+			"contentName": "meta.arguments.decltype",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2450,8 +2364,8 @@
 			]
 		},
 		"decltype_specifier": {
-			"contentName": "meta.arguments.decltype.cpp",
-			"begin": "((?<!\\w)decltype(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2459,7 +2373,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -2485,12 +2399,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
 				}
 			},
+			"contentName": "meta.arguments.decltype",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2498,13 +2412,13 @@
 			]
 		},
 		"default_statement": {
-			"name": "meta.conditional.case.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)default(?!\\w))",
+			"end": ":|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -2530,12 +2444,12 @@
 					"name": "keyword.control.default.cpp"
 				}
 			},
-			"end": "(:)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.separator.colon.case.default.cpp"
 				}
 			},
+			"name": "meta.conditional.case.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2546,51 +2460,51 @@
 			]
 		},
 		"destructor_inline": {
-			"name": "meta.function.definition.special.member.destructor.cpp",
-			"begin": "(^((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:(?:constexpr|explicit|mutable|virtual|inline|friend)((?>(?:(?:(?>(?<!\\s)\\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)(?=\\()))",
+			"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)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\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)(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.member.destructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"5": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"6": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp"
 				},
-				"9": {
+				"8": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2602,55 +2516,55 @@
 						}
 					]
 				},
-				"10": {
+				"9": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"13": {
+				"12": {
 					"name": "comment.block.cpp"
 				},
+				"13": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"14": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#functional_specifiers_pre_parameters"
 						}
 					]
 				},
 				"15": {
 					"patterns": [
 						{
-							"include": "#functional_specifiers_pre_parameters"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"16": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"17": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"18": {
+				"17": {
 					"name": "comment.block.cpp"
 				},
-				"19": {
+				"18": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2662,82 +2576,81 @@
 						}
 					]
 				},
-				"20": {
+				"19": {
 					"name": "entity.name.function.destructor.cpp entity.name.function.definition.special.member.destructor.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.member.destructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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"
+							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"captures": {
+								"1": {
+									"name": "keyword.operator.assignment.cpp"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "source.cpp#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": "(\\()",
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
 								}
 							},
-							"end": "(\\))|(?=(?<!\\\\)\n)",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
 								}
-							}
+							},
+							"contentName": "meta.function.definition.parameters.special.member.destructor",
+							"patterns": []
 						},
 						{
 							"include": "$self"
@@ -2745,14 +2658,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -2760,9 +2674,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.member.destructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -2772,54 +2688,54 @@
 			]
 		},
 		"destructor_root": {
-			"name": "meta.function.definition.special.member.destructor.cpp",
-			"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<14>?)+)>)\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))::((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))~\\16((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\()))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.member.destructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "comment.block.cpp"
 				},
 				"4": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"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": {
+				"6": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2831,7 +2747,7 @@
 						}
 					]
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"match": "::",
@@ -2846,7 +2762,7 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2854,7 +2770,8 @@
 						}
 					]
 				},
-				"15": {
+				"12": {},
+				"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}))*(?=:)",
@@ -2870,45 +2787,46 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"16": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"17": {
+					"name": "comment.block.cpp"
+				},
 				"18": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"19": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"20": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2920,20 +2838,20 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"26": {
+				"24": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"27": {
+				"25": {
 					"name": "comment.block.cpp"
 				},
-				"28": {
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2946,78 +2864,77 @@
 					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.member.destructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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"
+							"match": "(\\=)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(default)|(delete))",
+							"captures": {
+								"1": {
+									"name": "keyword.operator.assignment.cpp"
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "source.cpp#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": "(\\()",
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
 								}
 							},
-							"end": "(\\))|(?=(?<!\\\\)\n)",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
 								}
-							}
+							},
+							"contentName": "meta.function.definition.parameters.special.member.destructor",
+							"patterns": []
 						},
 						{
 							"include": "$self"
@@ -3025,14 +2942,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -3040,9 +2958,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.member.destructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3052,8 +2972,8 @@
 			]
 		},
 		"diagnostic": {
-			"name": "meta.preprocessor.diagnostic.$reference(directive).cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*((?:error|warning)))\\b\\s*",
+			"begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?",
+			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.diagnostic.$7.cpp"
@@ -3061,7 +2981,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -3085,57 +3005,61 @@
 				},
 				"6": {
 					"name": "punctuation.definition.directive.cpp"
-				}
+				},
+				"7": {}
 			},
-			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.diagnostic.$reference(directive).cpp",
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"begin": "(\")",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
+					"begin": "\"",
 					"end": "(?:(\")|(?<!\\\\)(?=\\n))|(?=(?<!\\\\)\n)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#line_continuation_character"
-						}
-					]
-				},
-				{
-					"name": "string.quoted.single.cpp",
-					"begin": "(')",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
 						}
 					},
-					"end": "(?:(')|(?<!\\\\)(?=\\n))|(?=(?<!\\\\)\n)",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
+					"name": "string.quoted.double.cpp",
 					"patterns": [
 						{
-							"include": "#line_continuation_character"
+							"include": "source.cpp#line_continuation_character"
+						}
+					]
+				},
+				{
+					"begin": "'",
+					"end": "(?:(')|(?<!\\\\)(?=\\n))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.single.cpp",
+					"patterns": [
+						{
+							"include": "source.cpp#line_continuation_character"
 						}
 					]
 				},
 				{
-					"name": "string.unquoted.cpp",
 					"begin": "[^'\"]",
 					"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
+					"name": "string.unquoted.cpp",
 					"patterns": [
 						{
-							"include": "#line_continuation_character"
+							"include": "source.cpp#line_continuation_character"
 						},
 						{
 							"include": "#comments"
@@ -3144,78 +3068,57 @@
 				}
 			]
 		},
-		"emacs_file_banner": {
-			"match": "(?:(^\\s*((\\/\\/)\\s*((?>[#;\\/=*C~]+)(?![#;\\/=*C~]))\\s*.+\\s*\\8\\s*(?:\\n|$)))|(^\\s*((\\/\\*)\\s*?((?>[#;\\/=*C~]+)(?![#;\\/=*C~]))\\s*.+\\s*\\8\\s*\\*\\/)))",
-			"captures": {
-				"1": {
-					"name": "meta.toc-list.banner.double-slash.cpp"
-				},
-				"2": {
-					"name": "comment.line.double-slash.cpp"
-				},
-				"3": {
-					"name": "punctuation.definition.comment.cpp"
-				},
-				"4": {
-					"name": "meta.banner.character.cpp"
-				},
-				"5": {
-					"name": "meta.toc-list.banner.block.cpp"
-				},
-				"6": {
-					"name": "comment.line.banner.cpp"
-				},
-				"7": {
-					"name": "punctuation.definition.comment.cpp"
-				},
-				"8": {
-					"name": "meta.banner.character.cpp"
-				}
-			}
-		},
-		"empty_square_brackets": {
-			"name": "storage.modifier.array.bracket.square.cpp",
-			"match": "(?-mix:(?-mix:(?<!delete))\\\\[\\\\s*\\\\])"
-		},
 		"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*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<15>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<15>?)+)>)\\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)))?)",
+			"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)+)?(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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)))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.enum.cpp"
 				},
-				"2": {
+				"1": {
 					"name": "storage.type.enum.cpp"
 				},
-				"3": {
-					"name": "storage.type.enum.enum-key.$3.cpp"
+				"2": {
+					"name": "storage.type.enum.enum-key.$2.cpp"
 				},
-				"4": {
+				"3": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
-				"5": {
+				"4": {
 					"name": "entity.name.type.enum.cpp"
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.separator.colon.type-specifier.cpp"
 				},
-				"8": {
+				"6": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"9": {
+				"7": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
+				"8": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"9": {},
+				"10": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
 				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
@@ -3224,25 +3127,14 @@
 						}
 					]
 				},
+				"12": {},
 				"13": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"14": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"16": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"17": {
-					"name": "storage.type.integral.$17.cpp"
+				"14": {
+					"name": "storage.type.integral.$14.cpp"
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -3251,16 +3143,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.enum.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.enum.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.enum.cpp"
 						}
 					},
+					"name": "meta.head.enum.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3268,36 +3162,39 @@
 					]
 				},
 				{
-					"name": "meta.body.enum.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.enum.cpp"
 						}
 					},
+					"name": "meta.body.enum.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"include": "#enumerator_list"
+							"include": "source.cpp#enumerator_list"
 						},
 						{
 							"include": "#comments"
 						},
 						{
-							"include": "#comma"
+							"include": "source.cpp#comma"
 						},
 						{
-							"include": "#semicolon"
+							"include": "source.cpp#semicolon"
 						}
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.enum.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3306,227 +3203,6 @@
 				}
 			]
 		},
-		"enum_declare": {
-			"match": "((?<!\\w)enum(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
-			"captures": {
-				"1": {
-					"name": "storage.type.enum.declare.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": "entity.name.type.enum.cpp"
-				},
-				"7": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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": [
-						{
-							"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": {
-					"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": {
-					"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": "variable.other.object.declare.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"
-						}
-					]
-				}
-			}
-		},
-		"enumerator_list": {
-			"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))\\s*((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*(?:(\\=)\\s*(.+?)\\s*)?(?:(?:((?:[,;](?!')|\\n))|(?=\\}[^']))|(?=(?:\\/\\/|\\/\\*)))",
-			"captures": {
-				"1": {
-					"name": "variable.other.enummember.cpp"
-				},
-				"2": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"3": {
-					"name": "keyword.operator.assignment.cpp"
-				},
-				"4": {
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
-				},
-				"5": {
-					"patterns": [
-						{
-							"include": "#comma"
-						},
-						{
-							"include": "#semicolon"
-						}
-					]
-				}
-			},
-			"name": "meta.enum.definition.cpp"
-		},
 		"evaluation_context": {
 			"patterns": [
 				{
@@ -3536,49 +3212,49 @@
 					"include": "#string_context"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				},
 				{
 					"include": "#method_access"
 				},
 				{
-					"include": "#member_access"
+					"include": "source.cpp#member_access"
 				},
 				{
-					"include": "#predefined_macros"
+					"include": "source.cpp#predefined_macros"
 				},
 				{
 					"include": "#operators"
 				},
 				{
-					"include": "#memory_operators"
+					"include": "source.cpp#memory_operators"
 				},
 				{
-					"include": "#wordlike_operators"
+					"include": "source.cpp#wordlike_operators"
 				},
 				{
-					"include": "#type_casting_operators"
+					"include": "source.cpp#type_casting_operators"
 				},
 				{
-					"include": "#control_flow_keywords"
+					"include": "source.cpp#control_flow_keywords"
 				},
 				{
-					"include": "#exception_keywords"
+					"include": "source.cpp#exception_keywords"
 				},
 				{
-					"include": "#the_this_keyword"
+					"include": "source.cpp#the_this_keyword"
 				},
 				{
-					"include": "#language_constants"
+					"include": "source.cpp#language_constants"
 				},
 				{
 					"include": "#builtin_storage_type_initilizer"
 				},
 				{
-					"include": "#qualifiers_and_specifiers_post_parameters"
+					"include": "source.cpp#qualifiers_and_specifiers_post_parameters"
 				},
 				{
-					"include": "#functional_specifiers_pre_parameters"
+					"include": "source.cpp#functional_specifiers_pre_parameters"
 				},
 				{
 					"include": "#storage_types"
@@ -3599,35 +3275,29 @@
 					"include": "#function_call"
 				},
 				{
-					"include": "#scope_resolution_inner_generated"
+					"include": "source.cpp#scope_resolution_inner_generated"
 				},
 				{
 					"include": "#square_brackets"
 				},
 				{
-					"include": "#empty_square_brackets"
+					"include": "source.cpp#semicolon"
 				},
 				{
-					"include": "#semicolon"
-				},
-				{
-					"include": "#comma"
+					"include": "source.cpp#comma"
 				}
 			]
 		},
 		"ever_present_context": {
 			"patterns": [
 				{
-					"include": "#pragma_mark"
+					"include": "source.cpp#pragma_mark"
 				},
 				{
 					"include": "#pragma"
 				},
 				{
-					"include": "#include"
-				},
-				{
-					"include": "#module_import"
+					"include": "source.cpp#include"
 				},
 				{
 					"include": "#line"
@@ -3636,85 +3306,52 @@
 					"include": "#diagnostic"
 				},
 				{
-					"include": "#undef"
+					"include": "source.cpp#undef"
 				},
 				{
 					"include": "#preprocessor_conditional_range"
 				},
 				{
-					"include": "#single_line_macro"
+					"include": "source.cpp#single_line_macro"
 				},
 				{
 					"include": "#macro"
 				},
 				{
-					"include": "#preprocessor_conditional_standalone"
+					"include": "source.cpp#preprocessor_conditional_standalone"
 				},
 				{
-					"include": "#macro_argument"
+					"include": "source.cpp#macro_argument"
 				},
 				{
 					"include": "#comments"
 				},
 				{
-					"include": "#line_continuation_character"
+					"include": "source.cpp#line_continuation_character"
 				}
 			]
 		},
-		"exception_keywords": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:throw|catch|try)(?!\\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": "keyword.control.exception.$5.cpp"
-				}
-			}
-		},
 		"extern_block": {
-			"name": "meta.block.extern.cpp",
-			"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(extern)(?=\\s*\\\"))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(extern)(?=\\s*\\\")",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.extern.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3726,11 +3363,10 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "storage.type.extern.cpp"
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -3739,16 +3375,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.extern.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.extern.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.extern.cpp"
 						}
 					},
+					"name": "meta.head.extern.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3756,14 +3394,15 @@
 					]
 				},
 				{
-					"name": "meta.body.extern.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.extern.cpp"
 						}
 					},
+					"name": "meta.body.extern.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3771,9 +3410,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.extern.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3794,13 +3435,13 @@
 					"include": "#using_namespace"
 				},
 				{
-					"include": "#type_alias"
+					"include": "source.cpp#type_alias"
 				},
 				{
-					"include": "#using_name"
+					"include": "source.cpp#using_name"
 				},
 				{
-					"include": "#namespace_alias"
+					"include": "source.cpp#namespace_alias"
 				},
 				{
 					"include": "#typedef_class"
@@ -3812,10 +3453,10 @@
 					"include": "#typedef_union"
 				},
 				{
-					"include": "#typedef_keyword"
+					"include": "source.cpp#misc_keywords"
 				},
 				{
-					"include": "#standard_declares"
+					"include": "source.cpp#standard_declares"
 				},
 				{
 					"include": "#class_block"
@@ -3830,7 +3471,7 @@
 					"include": "#enum_block"
 				},
 				{
-					"include": "#access_control_keywords"
+					"include": "source.cpp#access_control_keywords"
 				},
 				{
 					"include": "#block"
@@ -3848,30 +3489,31 @@
 					"include": "#switch_statement"
 				},
 				{
-					"include": "#goto_statement"
+					"include": "source.cpp#goto_statement"
 				},
 				{
 					"include": "#evaluation_context"
 				},
 				{
-					"include": "#label"
+					"include": "source.cpp#label"
 				}
 			]
 		},
 		"function_call": {
-			"begin": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<12>?)+)>)\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least16_t|^int_least16_t|\\Watomic_commit|^atomic_commit|\\Watomic_cancel|^atomic_cancel|\\Wuint_fast64_t|^uint_fast64_t|\\Wuint_least8_t|^uint_least8_t|\\Wint_least64_t|^int_least64_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_fast64_t|^int_fast64_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast16_t|^int_fast16_t|\\Wsynchronized|^synchronized|\\Wint_least8_t|^int_least8_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wco_return|^co_return|\\Wuint16_t|^uint16_t|\\Wdecltype|^decltype|\\Wu_quad_t|^u_quad_t|\\Wreflexpr|^reflexpr|\\Wregister|^register|\\Wco_await|^co_await|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wuint64_t|^uint64_t|\\Wrestrict|^restrict|\\Wtypename|^typename|\\Wexplicit|^explicit|\\Wuint32_t|^uint32_t|\\Wunsigned|^unsigned|\\Woperator|^operator|\\Wvolatile|^volatile|\\Wblkcnt_t|^blkcnt_t|\\Wcontinue|^continue|\\Wtemplate|^template|\\Wmutable|^mutable|\\Walignas|^alignas|\\Walignof|^alignof|\\Wnullptr|^nullptr|\\Wconcept|^concept|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wtypedef|^typedef|\\Wfixpt_t|^fixpt_t|\\W__asm__|^__asm__|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wmutable|^mutable|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wclock_t|^clock_t|\\Wu_short|^u_short|\\Wssize_t|^ssize_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wstruct|^struct|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wexport|^export|\\Wnot_eq|^not_eq|\\Wdelete|^delete|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wtime_t|^time_t|\\Wint8_t|^int8_t|\\Wtypeid|^typeid|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wbitand|^bitand|\\Wsizeof|^sizeof|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wimport|^import|\\Wmodule|^module|\\Wpublic|^public|\\Wswitch|^switch|\\Wreturn|^return|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wwhile|^while|\\Wcatch|^catch|\\Wcompl|^compl|\\Wbreak|^break|\\Wuid_t|^uid_t|\\Wconst|^const|\\Woff_t|^off_t|\\Wpid_t|^pid_t|\\Wkey_t|^key_t|\\Wino_t|^ino_t|\\Wshort|^short|\\Wgid_t|^gid_t|\\Wusing|^using|\\Wdev_t|^dev_t|\\Wdiv_t|^div_t|\\Wu_int|^u_int|\\Wfloat|^float|\\Wbitor|^bitor|\\Wfalse|^false|\\Wthrow|^throw|\\Welse|^else|\\Wtrue|^true|\\Wauto|^auto|\\Wvoid|^void|\\Wuint|^uint|\\Wid_t|^id_t|\\Wbool|^bool|\\WNULL|^NULL|\\Wlong|^long|\\Wid_t|^id_t|\\Wcase|^case|\\Wgoto|^goto|\\Wthis|^this|\\Wchar|^char|\\Wenum|^enum|\\Wxor|^xor|\\Wint|^int|\\Wasm|^asm|\\Wnew|^new|\\Wtry|^try|\\Wand|^and|\\Wfor|^for|\\Wnot|^not|\\Wdo|^do|\\Wor|^or|\\Wif|^if)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<12>?)+)>)\\s*)?(\\()",
+			"begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:(?:\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least64_t|^uint_least64_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Watomic_commit|^atomic_commit|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Watomic_cancel|^atomic_cancel|\\Wuint_least8_t|^uint_least8_t|\\Wint_least16_t|^int_least16_t|\\Wsynchronized|^synchronized|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_least8_t|^int_least8_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wuseconds_t|^useconds_t|\\Wconst_cast|^const_cast|\\Win_port_t|^in_port_t|\\Wco_return|^co_return|\\Wuintptr_t|^uintptr_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wnamespace|^namespace|\\Wuintmax_t|^uintmax_t|\\Wprotected|^protected|\\Wconstexpr|^constexpr|\\Wuintmax_t|^uintmax_t|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Wconstexpr|^constexpr|\\Wregister|^register|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wtypename|^typename|\\Wdecltype|^decltype|\\Woperator|^operator|\\Wco_await|^co_await|\\Wtemplate|^template|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wreflexpr|^reflexpr|\\Wexplicit|^explicit|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wrestrict|^restrict|\\Wuint32_t|^uint32_t|\\Wvolatile|^volatile|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wuint16_t|^uint16_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wmutable|^mutable|\\Wconcept|^concept|\\Wuint8_t|^uint8_t|\\Walignas|^alignas|\\Wnlink_t|^nlink_t|\\Wnullptr|^nullptr|\\Wprivate|^private|\\Wdefault|^default|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wclock_t|^clock_t|\\Wint64_t|^int64_t|\\Wssize_t|^ssize_t|\\Walignof|^alignof|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wmutable|^mutable|\\Wvirtual|^virtual|\\Wfixpt_t|^fixpt_t|\\Wtypedef|^typedef|\\W__asm__|^__asm__|\\Wtime_t|^time_t|\\Wsizeof|^sizeof|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wtypeid|^typeid|\\Wswitch|^switch|\\Wreturn|^return|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wint8_t|^int8_t|\\Wstruct|^struct|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wpublic|^public|\\Wexport|^export|\\Wimport|^import|\\Wmodule|^module|\\Wkey_t|^key_t|\\Wuid_t|^uid_t|\\Wgid_t|^gid_t|\\Wfalse|^false|\\Wbreak|^break|\\Wusing|^using|\\Wcatch|^catch|\\Wor_eq|^or_eq|\\Wbitor|^bitor|\\Wdev_t|^dev_t|\\Wwhile|^while|\\Wcompl|^compl|\\Wdiv_t|^div_t|\\Wpid_t|^pid_t|\\Wunion|^union|\\Wu_int|^u_int|\\Wthrow|^throw|\\Wconst|^const|\\Wfloat|^float|\\Wconst|^const|\\Woff_t|^off_t|\\Wshort|^short|\\Wclass|^class|\\Wino_t|^ino_t|\\Wid_t|^id_t|\\Wenum|^enum|\\Wuint|^uint|\\Wbool|^bool|\\Wlong|^long|\\Wchar|^char|\\Wvoid|^void|\\Wauto|^auto|\\Wthis|^this|\\Wcase|^case|\\Wgoto|^goto|\\Welse|^else|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wasm|^asm|\\Wtry|^try|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wfor|^for|\\Wnew|^new|\\Wint|^int|\\Wor|^or|\\Wdo|^do|\\Wif|^if)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:(?:\\s)+)?)?(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_call_inner_generated"
+							"include": "source.cpp#scope_resolution_function_call_inner_generated"
 						}
 					]
 				},
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -3879,23 +3521,24 @@
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.function.call.cpp"
 				},
-				"7": {
+				"6": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3907,7 +3550,7 @@
 						}
 					]
 				},
-				"11": {
+				"10": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -3915,13 +3558,13 @@
 						}
 					]
 				},
-				"13": {
+				"11": {},
+				"12": {
 					"name": "punctuation.section.arguments.begin.bracket.round.function.call.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.function.call.cpp"
 				}
 			},
@@ -3932,26 +3575,26 @@
 			]
 		},
 		"function_definition": {
-			"name": "meta.function.definition.cpp",
-			"begin": "((?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:((?<!\\w)template(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:((?<!\\w)(?:(?:constexpr|explicit|mutable|virtual|inline|friend)|(?:volatile|register|restrict|static|extern|const))(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least16_t|^int_least16_t|\\Watomic_commit|^atomic_commit|\\Watomic_cancel|^atomic_cancel|\\Wuint_fast64_t|^uint_fast64_t|\\Wuint_least8_t|^uint_least8_t|\\Wint_least64_t|^int_least64_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_fast64_t|^int_fast64_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast16_t|^int_fast16_t|\\Wsynchronized|^synchronized|\\Wint_least8_t|^int_least8_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wco_return|^co_return|\\Wuint16_t|^uint16_t|\\Wdecltype|^decltype|\\Wu_quad_t|^u_quad_t|\\Wreflexpr|^reflexpr|\\Wregister|^register|\\Wco_await|^co_await|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wuint64_t|^uint64_t|\\Wrestrict|^restrict|\\Wtypename|^typename|\\Wexplicit|^explicit|\\Wuint32_t|^uint32_t|\\Wunsigned|^unsigned|\\Woperator|^operator|\\Wvolatile|^volatile|\\Wblkcnt_t|^blkcnt_t|\\Wcontinue|^continue|\\Wtemplate|^template|\\Wmutable|^mutable|\\Walignas|^alignas|\\Walignof|^alignof|\\Wnullptr|^nullptr|\\Wconcept|^concept|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wtypedef|^typedef|\\Wfixpt_t|^fixpt_t|\\W__asm__|^__asm__|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wmutable|^mutable|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wclock_t|^clock_t|\\Wu_short|^u_short|\\Wssize_t|^ssize_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wstruct|^struct|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wexport|^export|\\Wnot_eq|^not_eq|\\Wdelete|^delete|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wtime_t|^time_t|\\Wint8_t|^int8_t|\\Wtypeid|^typeid|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wbitand|^bitand|\\Wsizeof|^sizeof|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wimport|^import|\\Wmodule|^module|\\Wpublic|^public|\\Wswitch|^switch|\\Wreturn|^return|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wwhile|^while|\\Wcatch|^catch|\\Wcompl|^compl|\\Wbreak|^break|\\Wuid_t|^uid_t|\\Wconst|^const|\\Woff_t|^off_t|\\Wpid_t|^pid_t|\\Wkey_t|^key_t|\\Wino_t|^ino_t|\\Wshort|^short|\\Wgid_t|^gid_t|\\Wusing|^using|\\Wdev_t|^dev_t|\\Wdiv_t|^div_t|\\Wu_int|^u_int|\\Wfloat|^float|\\Wbitor|^bitor|\\Wfalse|^false|\\Wthrow|^throw|\\Welse|^else|\\Wtrue|^true|\\Wauto|^auto|\\Wvoid|^void|\\Wuint|^uint|\\Wid_t|^id_t|\\Wbool|^bool|\\WNULL|^NULL|\\Wlong|^long|\\Wid_t|^id_t|\\Wcase|^case|\\Wgoto|^goto|\\Wthis|^this|\\Wchar|^char|\\Wenum|^enum|\\Wxor|^xor|\\Wint|^int|\\Wasm|^asm|\\Wnew|^new|\\Wtry|^try|\\Wand|^and|\\Wfor|^for|\\Wnot|^not|\\Wdo|^do|\\Wor|^or|\\Wif|^if)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\())",
+			"begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)template(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:((?<!\\w)(?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\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)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least64_t|^uint_least64_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Watomic_commit|^atomic_commit|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Watomic_cancel|^atomic_cancel|\\Wuint_least8_t|^uint_least8_t|\\Wint_least16_t|^int_least16_t|\\Wsynchronized|^synchronized|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_least8_t|^int_least8_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wuseconds_t|^useconds_t|\\Wconst_cast|^const_cast|\\Win_port_t|^in_port_t|\\Wco_return|^co_return|\\Wuintptr_t|^uintptr_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wnamespace|^namespace|\\Wuintmax_t|^uintmax_t|\\Wprotected|^protected|\\Wconstexpr|^constexpr|\\Wuintmax_t|^uintmax_t|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Wconstexpr|^constexpr|\\Wregister|^register|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wtypename|^typename|\\Wdecltype|^decltype|\\Woperator|^operator|\\Wco_await|^co_await|\\Wtemplate|^template|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wreflexpr|^reflexpr|\\Wexplicit|^explicit|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wrestrict|^restrict|\\Wuint32_t|^uint32_t|\\Wvolatile|^volatile|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wuint16_t|^uint16_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wmutable|^mutable|\\Wconcept|^concept|\\Wuint8_t|^uint8_t|\\Walignas|^alignas|\\Wnlink_t|^nlink_t|\\Wnullptr|^nullptr|\\Wprivate|^private|\\Wdefault|^default|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wclock_t|^clock_t|\\Wint64_t|^int64_t|\\Wssize_t|^ssize_t|\\Walignof|^alignof|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wmutable|^mutable|\\Wvirtual|^virtual|\\Wfixpt_t|^fixpt_t|\\Wtypedef|^typedef|\\W__asm__|^__asm__|\\Wtime_t|^time_t|\\Wsizeof|^sizeof|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wtypeid|^typeid|\\Wswitch|^switch|\\Wreturn|^return|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wint8_t|^int8_t|\\Wstruct|^struct|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wpublic|^public|\\Wexport|^export|\\Wimport|^import|\\Wmodule|^module|\\Wkey_t|^key_t|\\Wuid_t|^uid_t|\\Wgid_t|^gid_t|\\Wfalse|^false|\\Wbreak|^break|\\Wusing|^using|\\Wcatch|^catch|\\Wor_eq|^or_eq|\\Wbitor|^bitor|\\Wdev_t|^dev_t|\\Wwhile|^while|\\Wcompl|^compl|\\Wdiv_t|^div_t|\\Wpid_t|^pid_t|\\Wunion|^union|\\Wu_int|^u_int|\\Wthrow|^throw|\\Wconst|^const|\\Wfloat|^float|\\Wconst|^const|\\Woff_t|^off_t|\\Wshort|^short|\\Wclass|^class|\\Wino_t|^ino_t|\\Wid_t|^id_t|\\Wenum|^enum|\\Wuint|^uint|\\Wbool|^bool|\\Wlong|^long|\\Wchar|^char|\\Wvoid|^void|\\Wauto|^auto|\\Wthis|^this|\\Wcase|^case|\\Wgoto|^goto|\\Welse|^else|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wasm|^asm|\\Wtry|^try|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wfor|^for|\\Wnew|^new|\\Wint|^int|\\Wor|^or|\\Wdo|^do|\\Wif|^if)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3963,38 +3606,38 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "storage.type.template.cpp"
 				},
-				"7": {
+				"6": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"10": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"11": {
-					"patterns": [
-						{
-							"match": "((?<!\\w)(?:(?:constexpr|explicit|mutable|virtual|inline|friend)|(?:volatile|register|restrict|static|extern|const))(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))",
+							"match": "((?<!\\w)(?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
 							"captures": {
 								"1": {
 									"name": "storage.modifier.$1.cpp"
@@ -4002,7 +3645,7 @@
 								"2": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -4028,23 +3671,23 @@
 						}
 					]
 				},
-				"12": {
-					"name": "storage.modifier.$1.cpp"
+				"11": {
+					"name": "storage.modifier.$11.cpp"
 				},
-				"13": {
+				"12": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"14": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"15": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"16": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4056,11 +3699,11 @@
 						}
 					]
 				},
-				"17": {
+				"16": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -4073,19 +3716,36 @@
 							"include": "#storage_types"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						},
 						{
 							"include": "#string_context"
 						},
 						{
-							"include": "#comma"
+							"include": "source.cpp#comma"
 						},
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -4093,55 +3753,55 @@
 						}
 					]
 				},
-				"18": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"19": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"20": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"20": {
 					"name": "comment.block.cpp"
 				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"23": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"24": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"25": {
+				"24": {
 					"name": "comment.block.cpp"
 				},
-				"26": {
+				"25": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4153,16 +3813,28 @@
 						}
 					]
 				},
-				"28": {
+				"26": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"29": {
+				"27": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
+				"28": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"29": {},
+				"30": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
 				"31": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
@@ -4171,34 +3843,24 @@
 						}
 					]
 				},
+				"32": {},
 				"33": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"34": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"36": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"37": {
+				"34": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"38": {
+				"35": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"39": {
+				"36": {
 					"name": "comment.block.cpp"
 				},
-				"40": {
+				"37": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4210,10 +3872,10 @@
 						}
 					]
 				},
-				"41": {
+				"38": {
 					"name": "entity.name.type.cpp"
 				},
-				"42": {
+				"39": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4221,19 +3883,20 @@
 						}
 					]
 				},
-				"44": {
+				"40": {},
+				"41": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -4264,123 +3927,123 @@
 						}
 					]
 				},
+				"42": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
+				"43": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"44": {
+					"name": "comment.block.cpp"
+				},
 				"45": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"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"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"47": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"48": {
+					"name": "comment.block.cpp"
+				},
 				"49": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"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"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"51": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"52": {
+					"name": "comment.block.cpp"
+				},
 				"53": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"54": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"55": {
-					"name": "comment.block.cpp"
-				},
-				"56": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"55": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"56": {
+					"name": "comment.block.cpp"
+				},
 				"57": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"58": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "storage.type.modifier.calling-convention.cpp"
 				},
 				"59": {
-					"name": "comment.block.cpp"
-				},
-				"60": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"60": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"61": {
-					"name": "storage.type.modifier.calling-convention.cpp"
+					"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": "\\*\\/",
@@ -4392,17 +4055,17 @@
 						}
 					]
 				},
-				"66": {
+				"63": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_function_definition_inner_generated"
+							"include": "source.cpp#scope_resolution_function_definition_inner_generated"
 						}
 					]
 				},
-				"67": {
+				"64": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				},
-				"69": {
+				"65": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4410,23 +4073,24 @@
 						}
 					]
 				},
-				"71": {
+				"66": {},
+				"67": {
 					"name": "entity.name.function.definition.cpp"
 				},
-				"72": {
+				"68": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"73": {
+				"69": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"74": {
+				"70": {
 					"name": "comment.block.cpp"
 				},
-				"75": {
+				"71": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4439,35 +4103,37 @@
 					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.function.definition.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"contentName": "meta.function.definition.parameters.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.cpp"
 								}
 							},
-							"end": "(\\))|(?=(?<!\\\\)\n)",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -4476,7 +4142,7 @@
 									"include": "#parameter_or_maybe_value"
 								},
 								{
-									"include": "#comma"
+									"include": "source.cpp#comma"
 								},
 								{
 									"include": "#evaluation_context"
@@ -4489,14 +4155,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -4504,9 +4171,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -4524,18 +4193,19 @@
 					"include": "#parameter"
 				},
 				{
-					"include": "#comma"
+					"include": "source.cpp#comma"
 				}
 			]
 		},
 		"function_pointer": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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*(\\()",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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)+)?(\\()",
+			"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -4548,19 +4218,36 @@
 							"include": "#storage_types"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						},
 						{
 							"include": "#string_context"
 						},
 						{
-							"include": "#comma"
+							"include": "source.cpp#comma"
 						},
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -4574,14 +4261,14 @@
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
 				"3": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -4606,7 +4293,7 @@
 				"7": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -4628,17 +4315,17 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"13": {
+				"12": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"15": {
+				"13": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4646,10 +4333,11 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"18": {
+				"16": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4657,23 +4345,24 @@
 						}
 					]
 				},
+				"17": {},
+				"18": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
 				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"23": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4685,10 +4374,10 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"name": "entity.name.type.cpp"
 				},
-				"26": {
+				"24": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4696,19 +4385,20 @@
 						}
 					]
 				},
-				"28": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -4739,70 +4429,70 @@
 						}
 					]
 				},
-				"29": {
+				"27": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"28": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"29": {
+					"name": "comment.block.cpp"
+				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"31": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"32": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"33": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"35": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"37": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"38": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"39": {
+				"37": {
 					"name": "comment.block.cpp"
 				},
-				"40": {
+				"38": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4814,36 +4504,35 @@
 						}
 					]
 				},
-				"41": {
+				"39": {
 					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
 				},
-				"42": {
+				"40": {
 					"name": "punctuation.definition.function.pointer.dereference.cpp"
 				},
-				"43": {
+				"41": {
 					"name": "variable.other.definition.pointer.function.cpp"
 				},
-				"44": {
+				"42": {
 					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				"45": {
+				"43": {
 					"patterns": [
 						{
 							"include": "#evaluation_context"
 						}
 					]
 				},
-				"46": {
+				"44": {
 					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				"47": {
+				"45": {
 					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
 				},
-				"48": {
+				"46": {
 					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
 				}
 			},
-			"end": "(\\))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=[{=,);]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -4851,7 +4540,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -4881,13 +4570,14 @@
 			]
 		},
 		"function_pointer_parameter": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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*(\\()",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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)+)?(\\()",
+			"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -4900,19 +4590,36 @@
 							"include": "#storage_types"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						},
 						{
 							"include": "#string_context"
 						},
 						{
-							"include": "#comma"
+							"include": "source.cpp#comma"
 						},
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -4926,14 +4633,14 @@
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
 				"3": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -4958,7 +4665,7 @@
 				"7": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -4980,17 +4687,17 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"13": {
+				"12": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"15": {
+				"13": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4998,10 +4705,11 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"18": {
+				"16": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -5009,23 +4717,24 @@
 						}
 					]
 				},
+				"17": {},
+				"18": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
 				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"23": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5037,10 +4746,10 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"name": "entity.name.type.cpp"
 				},
-				"26": {
+				"24": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -5048,19 +4757,20 @@
 						}
 					]
 				},
-				"28": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -5091,70 +4801,70 @@
 						}
 					]
 				},
-				"29": {
+				"27": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"28": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"29": {
+					"name": "comment.block.cpp"
+				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"31": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"32": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"33": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"35": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"37": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"38": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"39": {
+				"37": {
 					"name": "comment.block.cpp"
 				},
-				"40": {
+				"38": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5166,36 +4876,35 @@
 						}
 					]
 				},
-				"41": {
+				"39": {
 					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
 				},
-				"42": {
+				"40": {
 					"name": "punctuation.definition.function.pointer.dereference.cpp"
 				},
-				"43": {
+				"41": {
 					"name": "variable.parameter.pointer.function.cpp"
 				},
-				"44": {
+				"42": {
 					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				"45": {
+				"43": {
 					"patterns": [
 						{
 							"include": "#evaluation_context"
 						}
 					]
 				},
-				"46": {
+				"44": {
 					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				"47": {
+				"45": {
 					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
 				},
-				"48": {
+				"46": {
 					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
 				}
 			},
-			"end": "(\\))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=[{=,);]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -5203,7 +4912,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -5232,24 +4941,20 @@
 				}
 			]
 		},
-		"functional_specifiers_pre_parameters": {
-			"match": "(?<!\\w)(?:constexpr|explicit|mutable|virtual|inline|friend)(?!\\w)",
-			"name": "storage.modifier.specifier.functional.pre-parameters.$0.cpp"
-		},
 		"gcc_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(__attribute(?:__)?\\(\\()",
+			"begin": "__attribute(?:__)?\\(\\(",
+			"end": "\\)\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\)\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -5257,6 +4962,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -5267,7 +4974,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -5294,229 +5001,10 @@
 					"name": "entity.other.attribute.$0.cpp"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				}
 			]
 		},
-		"goto_statement": {
-			"match": "((?<!\\w)goto(?!\\w))((?>(?:(?:(?>(?<!\\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}))*)",
-			"captures": {
-				"1": {
-					"name": "keyword.control.goto.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": "entity.name.label.call.cpp"
-				}
-			}
-		},
-		"include": {
-			"match": "(?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((#)\\s*((?:include|include_next))\\b)\\s*(?:(?:(?:((<)[^>]*(>?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/))))|(((?>(?:(?:(?>(?<!\\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}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))",
-			"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": "keyword.control.directive.$7.cpp"
-				},
-				"6": {
-					"name": "punctuation.definition.directive.cpp"
-				},
-				"8": {
-					"name": "string.quoted.other.lt-gt.include.cpp"
-				},
-				"9": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"10": {
-					"name": "punctuation.definition.string.end.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": "string.quoted.double.include.cpp"
-				},
-				"16": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"17": {
-					"name": "punctuation.definition.string.end.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": {
-					"name": "entity.name.other.preprocessor.macro.include.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"
-						}
-					]
-				}
-			},
-			"name": "meta.preprocessor.include.cpp"
-		},
 		"inheritance_context": {
 			"patterns": [
 				{
@@ -5527,7 +5015,7 @@
 					"name": "punctuation.separator.delimiter.comma.inheritance.cpp"
 				},
 				{
-					"match": "(?<!\\w)(?:protected|private|public)(?!\\w)",
+					"match": "(?<!\\w)(?:(?:protected)|(?:private)|(?:public))(?!\\w)",
 					"name": "storage.type.modifier.access.$0.cpp"
 				},
 				{
@@ -5535,13 +5023,13 @@
 					"name": "storage.type.modifier.virtual.cpp"
 				},
 				{
-					"match": "(?<=protected|virtual|private|public|,|:)\\s*(?!(?:(?:protected|private|public)|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))",
+					"match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))",
 					"captures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
 							"patterns": [
 								{
-									"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+									"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 									"name": "storage.type.$0.cpp"
 								},
 								{
@@ -5554,19 +5042,36 @@
 									"include": "#storage_types"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								},
 								{
 									"include": "#string_context"
 								},
 								{
-									"include": "#comma"
+									"include": "source.cpp#comma"
 								},
 								{
-									"include": "#scope_resolution_inner_generated"
+									"include": "source.cpp#scope_resolution_inner_generated"
 								},
 								{
-									"include": "#template_call_range"
+									"begin": "<",
+									"end": ">|(?=(?<!\\\\)\n)",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_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}))*",
@@ -5580,71 +5085,111 @@
 									"include": "#attributes_context"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								}
 							]
 						},
 						"3": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"4": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
 						},
 						"5": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"6": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
 								}
 							]
 						},
 						"7": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#scope_resolution_inner_generated"
 								}
 							]
 						},
 						"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"
-								}
-							]
-						},
-						"12": {
-							"patterns": [
-								{
-									"include": "#scope_resolution_inner_generated"
-								}
-							]
-						},
-						"13": {
 							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 						},
-						"15": {
+						"9": {
+							"patterns": [
+								{
+									"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+									"captures": {
+										"1": {
+											"name": "meta.template.call.cpp",
+											"patterns": [
+												{
+													"include": "#template_call_range"
+												}
+											]
+										},
+										"2": {}
+									}
+								}
+							]
+						},
+						"10": {},
+						"11": {
+							"name": "entity.name.scope-resolution.cpp"
+						},
+						"12": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -5652,8 +5197,46 @@
 								}
 							]
 						},
+						"13": {},
+						"14": {
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+						},
+						"15": {
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
 						"17": {
-							"name": "entity.name.scope-resolution.cpp"
+							"name": "entity.name.type.cpp"
 						},
 						"18": {
 							"name": "meta.template.call.cpp",
@@ -5663,151 +5246,26 @@
 								}
 							]
 						},
-						"20": {
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-						},
-						"26": {
-							"name": "meta.template.call.cpp",
-							"patterns": [
-								{
-									"include": "#template_call_range"
-								}
-							]
-						}
+						"19": {}
 					}
 				}
 			]
 		},
-		"inline_comment": {
-			"match": "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))",
-			"captures": {
-				"1": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"2": {
-					"name": "comment.block.cpp"
-				},
-				"3": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			}
-		},
-		"invalid_comment_end": {
-			"match": "\\*\\/",
-			"name": "invalid.illegal.unexpected.punctuation.definition.comment.end.cpp"
-		},
-		"label": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)",
-			"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": "entity.name.label.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": {
-					"name": "punctuation.separator.label.cpp"
-				}
-			}
-		},
 		"lambdas": {
-			"begin": "((?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))\\s*(\\[(?!\\[| *+\"| *+\\d))((?>(?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?>(?:(?>[^\\[\\]]*)\\g<4>?)+)\\]))*))(\\](?!\\[)))",
+			"begin": "(?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))(?:(?:\\s)+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++\\]))*+)(\\](?!((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))[\\[\\];]))",
+			"end": "(?<=[;}])|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"2": {
+				"1": {
 					"name": "punctuation.definition.capture.begin.lambda.cpp"
 				},
-				"3": {
+				"2": {
 					"name": "meta.lambda.capture.cpp",
 					"patterns": [
 						{
-							"include": "#the_this_keyword"
+							"include": "source.cpp#the_this_keyword"
 						},
 						{
-							"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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))",
+							"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)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))",
 							"captures": {
 								"1": {
 									"name": "variable.parameter.capture.cpp"
@@ -5815,7 +5273,7 @@
 								"2": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -5850,26 +5308,52 @@
 						}
 					]
 				},
-				"5": {
+				"3": {},
+				"4": {
 					"name": "punctuation.definition.capture.end.lambda.cpp"
+				},
+				"5": {
+					"patterns": [
+						{
+							"include": "source.cpp#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"
+						}
+					]
 				}
 			},
-			"end": "(?<=})|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.function.definition.parameters.lambda.cpp",
-					"begin": "(\\()",
+					"begin": "\\(",
+					"end": "\\)|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.parameters.begin.lambda.cpp"
 						}
 					},
-					"end": "(\\))|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.parameters.end.lambda.cpp"
 						}
 					},
+					"name": "meta.function.definition.parameters.lambda.cpp",
 					"patterns": [
 						{
 							"include": "#function_parameter_context"
@@ -5877,7 +5361,7 @@
 					]
 				},
 				{
-					"match": "(?<!\\w)(?:constexpr|consteval|mutable)(?!\\w)",
+					"match": "(?<!\\w)(?:(?:constexpr)|(?:consteval)|(?:mutable))(?!\\w)",
 					"name": "storage.modifier.lambda.$0.cpp"
 				},
 				{
@@ -5892,19 +5376,19 @@
 					}
 				},
 				{
-					"name": "meta.function.definition.body.lambda.cpp",
-					"begin": "(\\{)",
+					"begin": "\\{",
+					"end": "\\}|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.lambda.cpp"
 						}
 					},
-					"end": "(\\})|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.lambda.cpp"
 						}
 					},
+					"name": "meta.function.definition.body.lambda.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -5913,31 +5397,27 @@
 				}
 			]
 		},
-		"language_constants": {
-			"match": "(?<!\\w)(?:nullptr|false|NULL|true)(?!\\w)",
-			"name": "constant.language.$0.cpp"
-		},
 		"line": {
-			"name": "meta.preprocessor.line.cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*line\\b)",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b",
+			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.control.directive.line.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5949,11 +5429,12 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.definition.directive.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.line.cpp",
 			"patterns": [
 				{
 					"include": "#string_context_c"
@@ -5962,32 +5443,29 @@
 					"include": "#preprocessor_number_literal"
 				},
 				{
-					"include": "#line_continuation_character"
+					"include": "source.cpp#line_continuation_character"
 				}
 			]
 		},
 		"line_comment": {
-			"name": "comment.line.double-slash.cpp",
 			"begin": "\\s*+(\\/\\/)",
+			"end": "(?<=\\n)(?<!\\\\\\n)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.cpp"
 				}
 			},
-			"end": "(?<=\\n)(?<!\\\\\\n)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "comment.line.double-slash.cpp",
 			"patterns": [
 				{
-					"include": "#line_continuation_character"
+					"include": "source.cpp#line_continuation_character"
 				}
 			]
 		},
-		"line_continuation_character": {
-			"match": "\\\\\\n",
-			"name": "constant.character.escape.line-continuation.cpp"
-		},
 		"macro": {
-			"name": "meta.preprocessor.macro.cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*define\\b)\\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))",
+			"begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\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))",
+			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.define.cpp"
@@ -5995,7 +5473,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -6024,24 +5502,25 @@
 					"name": "entity.name.function.preprocessor.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.macro.cpp",
 			"patterns": [
 				{
-					"begin": "\\G\\s*(\\()",
+					"begin": "\\G(?:(?:\\s)+)?(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.parameters.begin.preprocessor.cpp"
 						}
 					},
-					"end": "(\\))|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.parameters.end.preprocessor.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"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*",
+							"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)+)?",
 							"captures": {
 								"1": {
 									"name": "variable.parameter.preprocessor.cpp"
@@ -6062,14 +5541,10 @@
 					"include": "#macro_context"
 				},
 				{
-					"include": "#macro_argument"
+					"include": "source.cpp#macro_argument"
 				}
 			]
 		},
-		"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)",
-			"name": "variable.other.macro.argument.cpp"
-		},
 		"macro_context": {
 			"patterns": [
 				{
@@ -6077,201 +5552,14 @@
 				}
 			]
 		},
-		"macro_name": {
-			"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.function.preprocessor.cpp"
-		},
-		"member_access": {
-			"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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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(?!uint_least64_t[^(?-mix:\\w)]|uint_least16_t[^(?-mix:\\w)]|uint_least32_t[^(?-mix:\\w)]|int_least16_t[^(?-mix:\\w)]|uint_fast64_t[^(?-mix:\\w)]|uint_fast32_t[^(?-mix:\\w)]|uint_fast16_t[^(?-mix:\\w)]|uint_least8_t[^(?-mix:\\w)]|int_least64_t[^(?-mix:\\w)]|int_least32_t[^(?-mix:\\w)]|int_fast32_t[^(?-mix:\\w)]|int_fast16_t[^(?-mix:\\w)]|int_least8_t[^(?-mix:\\w)]|uint_fast8_t[^(?-mix:\\w)]|int_fast64_t[^(?-mix:\\w)]|int_fast8_t[^(?-mix:\\w)]|suseconds_t[^(?-mix:\\w)]|useconds_t[^(?-mix:\\w)]|in_addr_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintptr_t[^(?-mix:\\w)]|blksize_t[^(?-mix:\\w)]|in_port_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|unsigned[^(?-mix:\\w)]|blkcnt_t[^(?-mix:\\w)]|uint32_t[^(?-mix:\\w)]|u_quad_t[^(?-mix:\\w)]|uint16_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|uint64_t[^(?-mix:\\w)]|intptr_t[^(?-mix:\\w)]|swblk_t[^(?-mix:\\w)]|wchar_t[^(?-mix:\\w)]|u_short[^(?-mix:\\w)]|qaddr_t[^(?-mix:\\w)]|caddr_t[^(?-mix:\\w)]|daddr_t[^(?-mix:\\w)]|fixpt_t[^(?-mix:\\w)]|nlink_t[^(?-mix:\\w)]|segsz_t[^(?-mix:\\w)]|clock_t[^(?-mix:\\w)]|ssize_t[^(?-mix:\\w)]|int16_t[^(?-mix:\\w)]|int32_t[^(?-mix:\\w)]|int64_t[^(?-mix:\\w)]|uint8_t[^(?-mix:\\w)]|int8_t[^(?-mix:\\w)]|mode_t[^(?-mix:\\w)]|quad_t[^(?-mix:\\w)]|ushort[^(?-mix:\\w)]|u_long[^(?-mix:\\w)]|u_char[^(?-mix:\\w)]|double[^(?-mix:\\w)]|size_t[^(?-mix:\\w)]|signed[^(?-mix:\\w)]|time_t[^(?-mix:\\w)]|key_t[^(?-mix:\\w)]|ino_t[^(?-mix:\\w)]|gid_t[^(?-mix:\\w)]|dev_t[^(?-mix:\\w)]|div_t[^(?-mix:\\w)]|float[^(?-mix:\\w)]|u_int[^(?-mix:\\w)]|uid_t[^(?-mix:\\w)]|short[^(?-mix:\\w)]|off_t[^(?-mix:\\w)]|pid_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|bool[^(?-mix:\\w)]|char[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|uint[^(?-mix:\\w)]|void[^(?-mix:\\w)]|long[^(?-mix:\\w)]|auto[^(?-mix:\\w)]|int[^(?-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": {
-					"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.access.cpp"
-				},
-				"7": {
-					"name": "punctuation.separator.dot-access.cpp"
-				},
-				"8": {
-					"name": "punctuation.separator.pointer-access.cpp"
-				},
-				"9": {
-					"patterns": [
-						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?>(?:(?:(?>(?<!\\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": "(?:((?>(?:(?:(?>(?<!\\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.access.cpp"
-								},
-								"7": {
-									"name": "punctuation.separator.dot-access.cpp"
-								},
-								"8": {
-									"name": "punctuation.separator.pointer-access.cpp"
-								}
-							}
-						},
-						{
-							"include": "#member_access"
-						},
-						{
-							"include": "#method_access"
-						}
-					]
-				},
-				"10": {
-					"name": "variable.other.property.cpp"
-				}
-			}
-		},
-		"memory_operators": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\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": "keyword.operator.wordlike.cpp"
-				},
-				"6": {
-					"name": "keyword.operator.delete.array.cpp"
-				},
-				"7": {
-					"name": "keyword.operator.delete.array.bracket.cpp"
-				},
-				"8": {
-					"name": "keyword.operator.delete.cpp"
-				},
-				"9": {
-					"name": "keyword.operator.new.cpp"
-				}
-			}
-		},
 		"method_access": {
-			"begin": "(?:((?>(?:(?:(?>(?<!\\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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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)+)?(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -6308,12 +5596,12 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?>(?:(?:(?>(?<!\\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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"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"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -6350,12 +5638,12 @@
 							}
 						},
 						{
-							"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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"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": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -6392,7 +5680,7 @@
 							}
 						},
 						{
-							"include": "#member_access"
+							"include": "source.cpp#member_access"
 						},
 						{
 							"include": "#method_access"
@@ -6406,9 +5694,8 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.function.member.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.function.member.cpp"
 				}
 			},
@@ -6418,207 +5705,20 @@
 				}
 			]
 		},
-		"misc_storage_modifiers": {
-			"match": "\\b(?:export|mutable|typename|thread_local|register|restrict|static|volatile|inline)\\b",
-			"name": "storage.modifier.$0.cpp"
-		},
-		"module_import": {
-			"match": "(?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((import))\\s*(?:(?:(?:((<)[^>]*(>?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/))))|(((?>(?:(?:(?>(?<!\\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}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))\\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": "keyword.control.directive.import.cpp"
-				},
-				"7": {
-					"name": "string.quoted.other.lt-gt.include.cpp"
-				},
-				"8": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"9": {
-					"name": "punctuation.definition.string.end.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": "string.quoted.double.include.cpp"
-				},
-				"15": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"16": {
-					"name": "punctuation.definition.string.end.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.other.preprocessor.macro.include.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.terminator.statement.cpp"
-				}
-			},
-			"name": "meta.preprocessor.import.cpp"
-		},
 		"ms_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(__declspec\\()",
+			"begin": "__declspec\\(",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -6626,6 +5726,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -6636,7 +5738,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -6663,74 +5765,34 @@
 					"name": "entity.other.attribute.$0.cpp"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				}
 			]
 		},
-		"namespace_alias": {
-			"match": "(?<!\\w)(namespace)\\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*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<9>?)+)>)\\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*(?:(;)|\\n))",
-			"captures": {
-				"1": {
-					"name": "keyword.other.namespace.alias.cpp storage.type.namespace.alias.cpp"
-				},
-				"2": {
-					"name": "entity.name.namespace.alias.cpp"
-				},
-				"3": {
-					"name": "keyword.operator.assignment.cpp"
-				},
-				"4": {
-					"name": "meta.declaration.namespace.alias.value.cpp"
-				},
-				"5": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_alias_inner_generated"
-						}
-					]
-				},
-				"6": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
-				},
-				"8": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"10": {
-					"name": "entity.name.namespace.cpp"
-				},
-				"11": {
-					"name": "punctuation.terminator.statement.cpp"
-				}
-			},
-			"name": "meta.declaration.namespace.alias.cpp"
-		},
 		"namespace_block": {
-			"name": "meta.block.namespace.cpp",
-			"begin": "(((?<!\\w)namespace(?!\\w)))",
+			"begin": "((?<!\\w)namespace(?!\\w))",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.namespace.cpp"
 				},
-				"2": {
+				"1": {
 					"name": "keyword.other.namespace.definition.cpp storage.type.namespace.definition.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.block.namespace.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.namespace.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.namespace.cpp"
 						}
 					},
+					"name": "meta.head.namespace.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -6739,19 +5801,19 @@
 							"include": "#attributes_context"
 						},
 						{
-							"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<5>?)+)>)\\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))?",
+							"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:(?:\\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"
+											"include": "source.cpp#scope_resolution_namespace_block_inner_generated"
 										}
 									]
 								},
 								"2": {
 									"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
 								},
-								"4": {
+								"3": {
 									"name": "meta.template.call.cpp",
 									"patterns": [
 										{
@@ -6759,13 +5821,14 @@
 										}
 									]
 								},
-								"6": {
+								"4": {},
+								"5": {
 									"name": "entity.name.namespace.cpp"
 								},
-								"7": {
+								"6": {
 									"name": "punctuation.separator.scope-resolution.namespace.block.cpp"
 								},
-								"8": {
+								"7": {
 									"name": "storage.modifier.inline.cpp"
 								}
 							}
@@ -6773,14 +5836,15 @@
 					]
 				},
 				{
-					"name": "meta.body.namespace.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.namespace.cpp"
 						}
 					},
+					"name": "meta.body.namespace.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -6788,9 +5852,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.namespace.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -6800,8 +5866,8 @@
 			]
 		},
 		"noexcept_operator": {
-			"contentName": "meta.arguments.operator.noexcept.cpp",
-			"begin": "((?<!\\w)noexcept(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
@@ -6809,7 +5875,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -6835,334 +5901,30 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.noexcept",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
 				}
 			]
 		},
-		"non_primitive_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\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"
-				}
-			}
-		},
-		"number_literal": {
-			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"begin": "(?=.)",
-							"end": "$|(?=(?<!\\\\)\n)",
-							"patterns": [
-								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.hexadecimal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "constant.numeric.hexadecimal.cpp"
-										},
-										"5": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"8": {
-											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
-										},
-										"9": {
-											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
-										},
-										"10": {
-											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
-										},
-										"11": {
-											"name": "constant.numeric.exponent.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"12": {
-											"name": "keyword.other.unit.suffix.floating-point.cpp"
-										},
-										"13": {
-											"name": "keyword.other.unit.user-defined.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)",
-									"captures": {
-										"2": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "constant.numeric.decimal.point.cpp"
-										},
-										"5": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"8": {
-											"name": "keyword.other.unit.exponent.decimal.cpp"
-										},
-										"9": {
-											"name": "keyword.operator.plus.exponent.decimal.cpp"
-										},
-										"10": {
-											"name": "keyword.operator.minus.exponent.decimal.cpp"
-										},
-										"11": {
-											"name": "constant.numeric.exponent.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"12": {
-											"name": "keyword.other.unit.suffix.floating-point.cpp"
-										},
-										"13": {
-											"name": "keyword.other.unit.user-defined.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.binary.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.binary.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.user-defined.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.octal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.octal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.user-defined.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.hexadecimal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
-										},
-										"6": {
-											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
-										},
-										"7": {
-											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
-										},
-										"8": {
-											"name": "constant.numeric.exponent.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"9": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										},
-										"10": {
-											"name": "keyword.other.unit.user-defined.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)",
-									"captures": {
-										"2": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.exponent.decimal.cpp"
-										},
-										"6": {
-											"name": "keyword.operator.plus.exponent.decimal.cpp"
-										},
-										"7": {
-											"name": "keyword.operator.minus.exponent.decimal.cpp"
-										},
-										"8": {
-											"name": "constant.numeric.exponent.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"9": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										},
-										"10": {
-											"name": "keyword.other.unit.user-defined.cpp"
-										}
-									}
-								},
-								{
-									"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
-									"name": "invalid.illegal.constant.numeric.cpp"
-								}
-							]
-						}
-					]
-				}
-			}
-		},
 		"operator_overload": {
-			"name": "meta.function.definition.special.operator-overload.cpp",
-			"begin": "((?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?::)*)(operator)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?::)*)(?:(?:((?:delete\\[\\]|delete|new\\[\\]|<=>|<<=|new|>>=|\\->\\*|\\/=|%=|&=|>=|\\|=|\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|<<|>>|\\-\\-|<=|\\^=|==|!=|&&|\\|\\||\\+=|\\-=|\\*=|,|\\+|\\-|!|~|\\*|&|\\*|\\/|%|\\+|\\-|<|>|&|\\^|\\||=))|((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:\\[\\])?)))|(\"\")((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\<|\\())",
+			"begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\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)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\s)+)?)?::)*)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\s)+)?)?::)*)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?<!\\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)))(?=\\<|\\()",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.operator-overload.cpp"
 				},
-				"2": {
+				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -7175,19 +5937,36 @@
 							"include": "#storage_types"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						},
 						{
 							"include": "#string_context"
 						},
 						{
-							"include": "#comma"
+							"include": "source.cpp#comma"
 						},
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">|(?=(?<!\\\\)\n)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -7195,55 +5974,55 @@
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
+						}
+					]
+				},
+				"3": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"4": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"5": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"5": {
 					"name": "comment.block.cpp"
 				},
+				"6": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"9": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"10": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7255,16 +6034,28 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_inner_generated"
+							"include": "source.cpp#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"14": {
+				"12": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
+				"13": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"14": {},
+				"15": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
 				"16": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
@@ -7273,34 +6064,24 @@
 						}
 					]
 				},
+				"17": {},
 				"18": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"19": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"21": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"22": {
+				"19": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"20": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7312,10 +6093,10 @@
 						}
 					]
 				},
-				"26": {
+				"23": {
 					"name": "entity.name.type.cpp"
 				},
-				"27": {
+				"24": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -7323,19 +6104,20 @@
 						}
 					]
 				},
-				"29": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -7366,148 +6148,148 @@
 						}
 					]
 				},
+				"27": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
+				"28": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"29": {
+					"name": "comment.block.cpp"
+				},
 				"30": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"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"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"32": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"33": {
+					"name": "comment.block.cpp"
+				},
 				"34": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"35": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"36": {
-					"name": "comment.block.cpp"
-				},
-				"37": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"36": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"37": {
+					"name": "comment.block.cpp"
+				},
 				"38": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"39": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"40": {
-					"name": "comment.block.cpp"
-				},
-				"41": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"40": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"41": {
+					"name": "comment.block.cpp"
+				},
 				"42": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"43": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "storage.type.modifier.calling-convention.cpp"
 				},
 				"44": {
-					"name": "comment.block.cpp"
-				},
-				"45": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"45": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"46": {
-					"name": "storage.type.modifier.calling-convention.cpp"
+					"name": "comment.block.cpp"
 				},
 				"47": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"48": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"49": {
-					"name": "comment.block.cpp"
-				},
-				"50": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
+				"49": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"50": {
+					"name": "comment.block.cpp"
+				},
 				"51": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"52": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"53": {
-					"name": "comment.block.cpp"
-				},
-				"54": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7519,7 +6301,7 @@
 						}
 					]
 				},
-				"55": {
+				"52": {
 					"patterns": [
 						{
 							"match": "::",
@@ -7534,7 +6316,7 @@
 						}
 					]
 				},
-				"57": {
+				"53": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -7542,23 +6324,24 @@
 						}
 					]
 				},
-				"59": {
+				"54": {},
+				"55": {
 					"name": "keyword.other.operator.overload.cpp"
 				},
-				"60": {
+				"56": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"61": {
+				"57": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"62": {
+				"58": {
 					"name": "comment.block.cpp"
 				},
-				"63": {
+				"59": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7570,7 +6353,7 @@
 						}
 					]
 				},
-				"64": {
+				"60": {
 					"patterns": [
 						{
 							"match": "::",
@@ -7585,7 +6368,7 @@
 						}
 					]
 				},
-				"66": {
+				"61": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -7593,25 +6376,26 @@
 						}
 					]
 				},
-				"68": {
+				"62": {},
+				"63": {
 					"name": "entity.name.operator.cpp"
 				},
-				"69": {
+				"64": {
 					"name": "entity.name.operator.type.cpp"
 				},
-				"70": {
+				"65": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "entity.name.operator.type.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
 										{
-											"include": "#inline_comment"
+											"include": "source.cpp#inline_comment"
 										}
 									]
 								},
@@ -7642,70 +6426,101 @@
 						}
 					]
 				},
-				"71": {
+				"66": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"72": {
+				"67": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"73": {
+				"68": {
 					"name": "comment.block.cpp"
 				},
+				"69": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"70": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
+				"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"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"74": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"75": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"76": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "comment.block.cpp"
 				},
 				"77": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"78": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "entity.name.operator.type.array.cpp"
 				},
 				"79": {
+					"name": "entity.name.operator.custom-literal.cpp"
+				},
+				"80": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"80": {
+				"81": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"81": {
+				"82": {
 					"name": "comment.block.cpp"
 				},
-				"82": {
+				"83": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7717,16 +6532,13 @@
 						}
 					]
 				},
-				"83": {
-					"name": "entity.name.operator.type.array.cpp"
-				},
 				"84": {
 					"name": "entity.name.operator.custom-literal.cpp"
 				},
 				"85": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -7747,47 +6559,21 @@
 							"name": "comment.block.cpp"
 						}
 					]
-				},
-				"89": {
-					"name": "entity.name.operator.custom-literal.cpp"
-				},
-				"90": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"91": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"92": {
-					"name": "comment.block.cpp"
-				},
-				"93": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.operator-overload.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.operator-overload.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.operator-overload.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.operator-overload.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -7796,19 +6582,19 @@
 							"include": "#template_call_range"
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.operator-overload.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)|(?=(?<!\\\\)\n)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.operator-overload.cpp"
 								}
 							},
-							"end": "(\\))|(?=(?<!\\\\)\n)",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.operator-overload.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters.special.operator-overload",
 							"patterns": [
 								{
 									"include": "#function_parameter_context"
@@ -7819,7 +6605,7 @@
 							]
 						},
 						{
-							"include": "#qualifiers_and_specifiers_post_parameters"
+							"include": "source.cpp#qualifiers_and_specifiers_post_parameters"
 						},
 						{
 							"include": "$self"
@@ -7827,14 +6613,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.operator-overload.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.operator-overload.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.operator-overload.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -7842,9 +6629,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.operator-overload.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -7856,22 +6645,292 @@
 		"operators": {
 			"patterns": [
 				{
-					"include": "#sizeof_operator"
+					"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.cpp#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": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.sizeof",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#alignof_operator"
+					"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.cpp#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": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.alignof",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#alignas_operator"
+					"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.cpp#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": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.alignas",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#typeid_operator"
+					"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.cpp#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": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.typeid",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#noexcept_operator"
+					"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.cpp#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": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.noexcept",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#sizeof_variadic_operator"
+					"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "source.cpp#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": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.sizeof.variadic",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
 					"match": "--",
@@ -7906,7 +6965,7 @@
 					"name": "keyword.operator.cpp"
 				},
 				{
-					"include": "#assignment_operator"
+					"include": "source.cpp#assignment_operator"
 				},
 				{
 					"match": "%|\\*|\\/|-|\\+",
@@ -7917,30 +6976,14 @@
 				}
 			]
 		},
-		"over_qualified_types": {
-			"patterns": [
-				{
-					"include": "#parameter_struct"
-				},
-				{
-					"include": "#parameter_enum"
-				},
-				{
-					"include": "#parameter_union"
-				},
-				{
-					"include": "#parameter_class"
-				}
-			]
-		},
 		"parameter": {
-			"name": "meta.parameter.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\w)",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\w)",
+			"end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -7963,12 +7006,12 @@
 					]
 				}
 			},
-			"end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.separator.delimiter.comma.cpp"
 				}
 			},
+			"name": "meta.parameter.cpp",
 			"patterns": [
 				{
 					"include": "#ever_present_context"
@@ -7980,10 +7023,10 @@
 					"include": "#decltype"
 				},
 				{
-					"include": "#vararg_ellipses"
+					"include": "source.cpp#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:volatile|register|restrict|static|extern|const))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))+)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w)))|((?>(?:(?:(?>(?<!\\s)\\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)\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=,|\\)|=)",
+					"match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\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)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))|((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -7998,7 +7041,7 @@
 						"3": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8023,7 +7066,7 @@
 						"7": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8048,7 +7091,7 @@
 						"11": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8073,7 +7116,7 @@
 						"15": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8101,7 +7144,7 @@
 						"20": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8129,7 +7172,7 @@
 						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8157,7 +7200,7 @@
 						"30": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8188,7 +7231,7 @@
 						"36": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8216,15 +7259,16 @@
 					"include": "#storage_types"
 				},
 				{
-					"include": "#scope_resolution_parameter_inner_generated"
+					"include": "source.cpp#scope_resolution_parameter_inner_generated"
 				},
 				{
-					"match": "(?:struct|class|union|enum)",
+					"match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
 					"name": "storage.type.$0.cpp"
 				},
 				{
 					"begin": "(?<==)",
 					"end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.separator.delimiter.comma.cpp"
@@ -8237,15 +7281,16 @@
 					]
 				},
 				{
-					"include": "#assignment_operator"
+					"match": "\\=",
+					"name": "keyword.operator.assignment.cpp"
 				},
 				{
-					"match": "(?<!\\s|\\(|,|:)((?>(?:(?:(?>(?<!\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\)|,|\\[|=|\\n)",
+					"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": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8273,7 +7318,7 @@
 						"6": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8301,19 +7346,19 @@
 					"include": "#attributes_context"
 				},
 				{
-					"name": "meta.bracket.square.array.cpp",
-					"begin": "(\\[)",
+					"begin": "\\[",
+					"end": "\\]|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.begin.bracket.square.array.type.cpp"
 						}
 					},
-					"end": "(\\])|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.end.bracket.square.array.type.cpp"
 						}
 					},
+					"name": "meta.bracket.square.array.cpp",
 					"patterns": [
 						{
 							"include": "#evaluation_context"
@@ -8328,7 +7373,7 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*)",
+					"match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
 					"captures": {
 						"0": {
 							"patterns": [
@@ -8337,12 +7382,12 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -8376,7 +7421,7 @@
 						"1": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8401,7 +7446,7 @@
 						"5": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -8427,528 +7472,14 @@
 				}
 			]
 		},
-		"parameter_class": {
-			"match": "(class)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?=,|\\)|\\n)",
-			"captures": {
-				"1": {
-					"name": "storage.type.class.parameter.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": "entity.name.type.class.parameter.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": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-				},
-				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			}
-		},
-		"parameter_enum": {
-			"match": "(enum)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?=,|\\)|\\n)",
-			"captures": {
-				"1": {
-					"name": "storage.type.enum.parameter.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": "entity.name.type.enum.parameter.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": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-				},
-				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			}
-		},
 		"parameter_or_maybe_value": {
-			"name": "meta.parameter.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\w)",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\w)",
+			"end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -8971,12 +7502,12 @@
 					]
 				}
 			},
-			"end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.separator.delimiter.comma.cpp"
 				}
 			},
+			"name": "meta.parameter.cpp",
 			"patterns": [
 				{
 					"include": "#ever_present_context"
@@ -8985,7 +7516,7 @@
 					"include": "#function_pointer_parameter"
 				},
 				{
-					"include": "#memory_operators"
+					"include": "source.cpp#memory_operators"
 				},
 				{
 					"include": "#builtin_storage_type_initilizer"
@@ -8997,10 +7528,10 @@
 					"include": "#decltype"
 				},
 				{
-					"include": "#vararg_ellipses"
+					"include": "source.cpp#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:volatile|register|restrict|static|extern|const))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))+)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w)))|((?>(?:(?:(?>(?<!\\s)\\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)\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=,|\\)|=)",
+					"match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\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)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))|((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -9015,7 +7546,7 @@
 						"3": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9040,7 +7571,7 @@
 						"7": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9065,7 +7596,7 @@
 						"11": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9090,7 +7621,7 @@
 						"15": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9118,7 +7649,7 @@
 						"20": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9146,7 +7677,7 @@
 						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9174,7 +7705,7 @@
 						"30": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9205,7 +7736,7 @@
 						"36": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9236,15 +7767,16 @@
 					"include": "#function_call"
 				},
 				{
-					"include": "#scope_resolution_parameter_inner_generated"
+					"include": "source.cpp#scope_resolution_parameter_inner_generated"
 				},
 				{
-					"match": "(?:struct|class|union|enum)",
+					"match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
 					"name": "storage.type.$0.cpp"
 				},
 				{
 					"begin": "(?<==)",
 					"end": "(?:(?=\\))|(,))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.separator.delimiter.comma.cpp"
@@ -9257,12 +7789,12 @@
 					]
 				},
 				{
-					"match": "(?<!\\s|\\(|,|:)((?>(?:(?:(?>(?<!\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=(?:\\)|,|\\[|=|\\/\\/|(?:\\n|$)))",
+					"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": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9290,7 +7822,7 @@
 						"6": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9318,19 +7850,19 @@
 					"include": "#attributes_context"
 				},
 				{
-					"name": "meta.bracket.square.array.cpp",
-					"begin": "(\\[)",
+					"begin": "\\[",
+					"end": "\\]|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.begin.bracket.square.array.type.cpp"
 						}
 					},
-					"end": "(\\])|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.end.bracket.square.array.type.cpp"
 						}
 					},
+					"name": "meta.bracket.square.array.cpp",
 					"patterns": [
 						{
 							"include": "#evaluation_context"
@@ -9345,7 +7877,7 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*)",
+					"match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
 					"captures": {
 						"0": {
 							"patterns": [
@@ -9354,12 +7886,12 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -9393,7 +7925,7 @@
 						"1": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9418,7 +7950,7 @@
 						"5": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -9447,537 +7979,23 @@
 				}
 			]
 		},
-		"parameter_struct": {
-			"match": "(struct)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?=,|\\)|\\n)",
-			"captures": {
-				"1": {
-					"name": "storage.type.struct.parameter.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": "entity.name.type.struct.parameter.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": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-				},
-				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			}
-		},
-		"parameter_union": {
-			"match": "(union)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?=,|\\)|\\n)",
-			"captures": {
-				"1": {
-					"name": "storage.type.union.parameter.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": "entity.name.type.union.parameter.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": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-				},
-				"15": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			}
-		},
 		"parentheses": {
-			"name": "meta.parens.cpp",
-			"begin": "(\\()",
+			"begin": "\\(",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.begin.bracket.round.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.end.bracket.round.cpp"
 				}
 			},
+			"name": "meta.parens.cpp",
 			"patterns": [
 				{
-					"include": "#over_qualified_types"
+					"include": "source.cpp#over_qualified_types"
 				},
 				{
 					"match": "(?<!:):(?!:)",
@@ -9988,60 +8006,27 @@
 				}
 			]
 		},
-		"posix_reserved_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\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"
-				}
-			}
-		},
 		"pragma": {
-			"name": "meta.preprocessor.pragma.cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*pragma\\b)",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b",
+			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.control.directive.pragma.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10053,11 +8038,12 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.definition.directive.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.pragma.cpp",
 			"patterns": [
 				{
 					"include": "#comments"
@@ -10073,63 +8059,7 @@
 					"include": "#preprocessor_number_literal"
 				},
 				{
-					"include": "#line_continuation_character"
-				}
-			]
-		},
-		"pragma_mark": {
-			"match": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*pragma\\s+mark)\\s+(.*)",
-			"captures": {
-				"1": {
-					"name": "keyword.control.directive.pragma.pragma-mark.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": "punctuation.definition.directive.cpp"
-				},
-				"7": {
-					"name": "entity.name.tag.pragma-mark.cpp"
-				}
-			},
-			"name": "meta.preprocessor.pragma.cpp"
-		},
-		"predefined_macros": {
-			"patterns": [
-				{
-					"match": "\\b(__cplusplus|__DATE__|__FILE__|__LINE__|__STDC__|__STDC_HOSTED__|__STDC_NO_COMPLEX__|__STDC_VERSION__|__STDCPP_THREADS__|__TIME__|NDEBUG|__OBJC__|__ASSEMBLER__|__ATOM__|__AVX__|__AVX2__|_CHAR_UNSIGNED|__CLR_VER|_CONTROL_FLOW_GUARD|__COUNTER__|__cplusplus_cli|__cplusplus_winrt|_CPPRTTI|_CPPUNWIND|_DEBUG|_DLL|__FUNCDNAME__|__FUNCSIG__|__FUNCTION__|_INTEGRAL_MAX_BITS|__INTELLISENSE__|_ISO_VOLATILE|_KERNEL_MODE|_M_AMD64|_M_ARM|_M_ARM_ARMV7VE|_M_ARM_FP|_M_ARM64|_M_CEE|_M_CEE_PURE|_M_CEE_SAFE|_M_FP_EXCEPT|_M_FP_FAST|_M_FP_PRECISE|_M_FP_STRICT|_M_IX86|_M_IX86_FP|_M_X64|_MANAGED|_MSC_BUILD|_MSC_EXTENSIONS|_MSC_FULL_VER|_MSC_VER|_MSVC_LANG|__MSVC_RUNTIME_CHECKS|_MT|_NATIVE_WCHAR_T_DEFINED|_OPENMP|_PREFAST|__TIMESTAMP__|_VC_NO_DEFAULTLIB|_WCHAR_T_DEFINED|_WIN32|_WIN64|_WINRT_DLL|_ATL_VER|_MFC_VER|__GFORTRAN__|__GNUC__|__GNUC_MINOR__|__GNUC_PATCHLEVEL__|__GNUG__|__STRICT_ANSI__|__BASE_FILE__|__INCLUDE_LEVEL__|__ELF__|__VERSION__|__OPTIMIZE__|__OPTIMIZE_SIZE__|__NO_INLINE__|__GNUC_STDC_INLINE__|__CHAR_UNSIGNED__|__WCHAR_UNSIGNED__|__REGISTER_PREFIX__|__REGISTER_PREFIX__|__SIZE_TYPE__|__PTRDIFF_TYPE__|__WCHAR_TYPE__|__WINT_TYPE__|__INTMAX_TYPE__|__UINTMAX_TYPE__|__SIG_ATOMIC_TYPE__|__INT8_TYPE__|__INT16_TYPE__|__INT32_TYPE__|__INT64_TYPE__|__UINT8_TYPE__|__UINT16_TYPE__|__UINT32_TYPE__|__UINT64_TYPE__|__INT_LEAST8_TYPE__|__INT_LEAST16_TYPE__|__INT_LEAST32_TYPE__|__INT_LEAST64_TYPE__|__UINT_LEAST8_TYPE__|__UINT_LEAST16_TYPE__|__UINT_LEAST32_TYPE__|__UINT_LEAST64_TYPE__|__INT_FAST8_TYPE__|__INT_FAST16_TYPE__|__INT_FAST32_TYPE__|__INT_FAST64_TYPE__|__UINT_FAST8_TYPE__|__UINT_FAST16_TYPE__|__UINT_FAST32_TYPE__|__UINT_FAST64_TYPE__|__INTPTR_TYPE__|__UINTPTR_TYPE__|__CHAR_BIT__|__SCHAR_MAX__|__WCHAR_MAX__|__SHRT_MAX__|__INT_MAX__|__LONG_MAX__|__LONG_LONG_MAX__|__WINT_MAX__|__SIZE_MAX__|__PTRDIFF_MAX__|__INTMAX_MAX__|__UINTMAX_MAX__|__SIG_ATOMIC_MAX__|__INT8_MAX__|__INT16_MAX__|__INT32_MAX__|__INT64_MAX__|__UINT8_MAX__|__UINT16_MAX__|__UINT32_MAX__|__UINT64_MAX__|__INT_LEAST8_MAX__|__INT_LEAST16_MAX__|__INT_LEAST32_MAX__|__INT_LEAST64_MAX__|__UINT_LEAST8_MAX__|__UINT_LEAST16_MAX__|__UINT_LEAST32_MAX__|__UINT_LEAST64_MAX__|__INT_FAST8_MAX__|__INT_FAST16_MAX__|__INT_FAST32_MAX__|__INT_FAST64_MAX__|__UINT_FAST8_MAX__|__UINT_FAST16_MAX__|__UINT_FAST32_MAX__|__UINT_FAST64_MAX__|__INTPTR_MAX__|__UINTPTR_MAX__|__WCHAR_MIN__|__WINT_MIN__|__SIG_ATOMIC_MIN__|__SCHAR_WIDTH__|__SHRT_WIDTH__|__INT_WIDTH__|__LONG_WIDTH__|__LONG_LONG_WIDTH__|__PTRDIFF_WIDTH__|__SIG_ATOMIC_WIDTH__|__SIZE_WIDTH__|__WCHAR_WIDTH__|__WINT_WIDTH__|__INT_LEAST8_WIDTH__|__INT_LEAST16_WIDTH__|__INT_LEAST32_WIDTH__|__INT_LEAST64_WIDTH__|__INT_FAST8_WIDTH__|__INT_FAST16_WIDTH__|__INT_FAST32_WIDTH__|__INT_FAST64_WIDTH__|__INTPTR_WIDTH__|__INTMAX_WIDTH__|__SIZEOF_INT__|__SIZEOF_LONG__|__SIZEOF_LONG_LONG__|__SIZEOF_SHORT__|__SIZEOF_POINTER__|__SIZEOF_FLOAT__|__SIZEOF_DOUBLE__|__SIZEOF_LONG_DOUBLE__|__SIZEOF_SIZE_T__|__SIZEOF_WCHAR_T__|__SIZEOF_WINT_T__|__SIZEOF_PTRDIFF_T__|__BYTE_ORDER__|__ORDER_LITTLE_ENDIAN__|__ORDER_BIG_ENDIAN__|__ORDER_PDP_ENDIAN__|__FLOAT_WORD_ORDER__|__DEPRECATED|__EXCEPTIONS|__GXX_RTTI|__USING_SJLJ_EXCEPTIONS__|__GXX_EXPERIMENTAL_CXX0X__|__GXX_WEAK__|__NEXT_RUNTIME__|__LP64__|_LP64|__SSP__|__SSP_ALL__|__SSP_STRONG__|__SSP_EXPLICIT__|__SANITIZE_ADDRESS__|__SANITIZE_THREAD__|__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1|__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2|__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4|__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8|__GCC_HAVE_SYNC_COMPARE_AND_SWAP_16|__HAVE_SPECULATION_SAFE_VALUE|__GCC_HAVE_DWARF2_CFI_ASM|__FP_FAST_FMA|__FP_FAST_FMAF|__FP_FAST_FMAL|__FP_FAST_FMAF16|__FP_FAST_FMAF32|__FP_FAST_FMAF64|__FP_FAST_FMAF128|__FP_FAST_FMAF32X|__FP_FAST_FMAF64X|__FP_FAST_FMAF128X|__GCC_IEC_559|__GCC_IEC_559_COMPLEX|__NO_MATH_ERRNO__|__has_builtin|__has_feature|__has_extension|__has_cpp_attribute|__has_c_attribute|__has_attribute|__has_declspec_attribute|__is_identifier|__has_include|__has_include_next|__has_warning|__BASE_FILE__|__FILE_NAME__|__clang__|__clang_major__|__clang_minor__|__clang_patchlevel__|__clang_version__|__fp16|_Float16)\\b",
-					"captures": {
-						"1": {
-							"name": "entity.name.other.preprocessor.macro.predefined.$1.cpp"
-						}
-					}
-				},
-				{
-					"match": "\\b__([A-Z_]+)__\\b",
-					"name": "entity.name.other.preprocessor.macro.predefined.probably.$1.cpp"
+					"include": "source.cpp#line_continuation_character"
 				}
 			]
 		},
@@ -10142,30 +8072,31 @@
 					"include": "#comments"
 				},
 				{
-					"include": "#language_constants"
+					"include": "source.cpp#language_constants"
 				},
 				{
-					"include": "#string_context_c"
+					"include": "#d9bc4796b0b_string_context_c"
 				},
 				{
-					"include": "#preprocessor_number_literal"
+					"include": "source.cpp#d9bc4796b0b_preprocessor_number_literal"
 				},
 				{
 					"include": "#operators"
 				},
 				{
-					"include": "#predefined_macros"
+					"include": "source.cpp#predefined_macros"
 				},
 				{
-					"include": "#macro_name"
+					"include": "source.cpp#macro_name"
 				},
 				{
-					"include": "#line_continuation_character"
+					"include": "source.cpp#line_continuation_character"
 				}
 			]
 		},
 		"preprocessor_conditional_defined": {
 			"begin": "((?<!\\w)defined(?!\\w))(\\()",
+			"end": "(?:\\)|(?<!\\\\)(?=\\n))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.conditional.defined.cpp"
@@ -10174,53 +8105,53 @@
 					"name": "punctuation.section.parens.control.defined.cpp"
 				}
 			},
-			"end": "((?:\\)|(?<!\\\\)(?=\\n)))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.control.defined.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"include": "#macro_name"
+					"include": "source.cpp#macro_name"
 				}
 			]
 		},
 		"preprocessor_conditional_parentheses": {
-			"name": "meta.parens.preprocessor.conditional.cpp",
-			"begin": "(\\()",
+			"begin": "\\(",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.begin.bracket.round.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.end.bracket.round.cpp"
 				}
-			}
+			},
+			"name": "meta.parens.preprocessor.conditional.cpp"
 		},
 		"preprocessor_conditional_range": {
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*((?:(?:ifndef|ifdef)|if)))",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:(?:ifndef|ifdef)|if))",
+			"end": "^(?!\\s*+#\\s*(?:else|endif))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.conditional.$7.cpp"
+				"0": {
+					"name": "keyword.control.directive.conditional.$6.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -10232,16 +8163,19 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.definition.directive.cpp"
-				}
+				},
+				"6": {}
 			},
-			"end": "(?:^)(?!\\s*+#\\s*(?:else|endif))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.preprocessor.conditional.cpp",
 					"begin": "\\G(?<=ifndef|ifdef|if)",
 					"end": "(?<!\\\\)(?=\\n)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
+					"name": "meta.preprocessor.conditional.cpp",
 					"patterns": [
 						{
 							"include": "#preprocessor_conditional_context"
@@ -10253,1472 +8187,46 @@
 				}
 			]
 		},
-		"preprocessor_conditional_standalone": {
-			"match": "(?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*((?<!\\w)(?:endif|else|elif)(?!\\w))",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+		"preprocessor_context": {
+			"patterns": [
+				{
+					"include": "source.cpp#pragma_mark"
 				},
-				"2": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				{
+					"include": "#pragma"
 				},
-				"3": {
-					"name": "comment.block.cpp"
+				{
+					"include": "source.cpp#include"
 				},
-				"4": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+				{
+					"include": "#line"
 				},
-				"5": {
-					"name": "punctuation.definition.directive.cpp"
+				{
+					"include": "#diagnostic"
+				},
+				{
+					"include": "source.cpp#undef"
+				},
+				{
+					"include": "#preprocessor_conditional_range"
+				},
+				{
+					"include": "source.cpp#single_line_macro"
+				},
+				{
+					"include": "#macro"
+				},
+				{
+					"include": "source.cpp#preprocessor_conditional_standalone"
+				},
+				{
+					"include": "source.cpp#macro_argument"
 				}
-			},
-			"name": "keyword.control.directive.$6.cpp"
-		},
-		"preprocessor_number_literal": {
-			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"begin": "(?=.)",
-							"end": "$|(?=(?<!\\\\)\n)",
-							"patterns": [
-								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.hexadecimal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "constant.numeric.hexadecimal.cpp"
-										},
-										"5": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"8": {
-											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
-										},
-										"9": {
-											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
-										},
-										"10": {
-											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
-										},
-										"11": {
-											"name": "constant.numeric.exponent.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"12": {
-											"name": "keyword.other.unit.suffix.floating-point.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$",
-									"captures": {
-										"2": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "constant.numeric.decimal.point.cpp"
-										},
-										"5": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"8": {
-											"name": "keyword.other.unit.exponent.decimal.cpp"
-										},
-										"9": {
-											"name": "keyword.operator.plus.exponent.decimal.cpp"
-										},
-										"10": {
-											"name": "keyword.operator.minus.exponent.decimal.cpp"
-										},
-										"11": {
-											"name": "constant.numeric.exponent.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"12": {
-											"name": "keyword.other.unit.suffix.floating-point.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.binary.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.binary.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.octal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.octal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.hexadecimal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
-										},
-										"6": {
-											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
-										},
-										"7": {
-											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
-										},
-										"8": {
-											"name": "constant.numeric.exponent.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"9": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"2": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.exponent.decimal.cpp"
-										},
-										"6": {
-											"name": "keyword.operator.plus.exponent.decimal.cpp"
-										},
-										"7": {
-											"name": "keyword.operator.minus.exponent.decimal.cpp"
-										},
-										"8": {
-											"name": "constant.numeric.exponent.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"9": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
-									"name": "invalid.illegal.constant.numeric.cpp"
-								}
-							]
-						}
-					]
-				}
-			}
-		},
-		"primitive_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\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"
-				}
-			}
-		},
-		"pthread_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\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"
-				}
-			}
-		},
-		"qualified_type": {
-			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<26>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<26>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<26>?)+)>)\\s*)?(?![\\w<:.])",
-			"captures": {
-				"0": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"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"
-						}
-					]
-				},
-				"1": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"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"
-						}
-					]
-				},
-				"11": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"12": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"14": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"16": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"17": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"19": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"20": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "entity.name.type.cpp"
-				},
-				"25": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"qualifiers_and_specifiers_post_parameters": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:override|volatile|noexcept|final|const)(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r])))",
-			"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.modifier.specifier.functional.post-parameters.$5.cpp"
-				}
-			}
-		},
-		"scope_resolution": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_function_call": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_function_call_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_function_call_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_function_call_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.function.call.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
-				}
-			}
-		},
-		"scope_resolution_function_definition": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_function_definition_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_function_definition_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_function_definition_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.function.definition.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
-				}
-			}
-		},
-		"scope_resolution_function_definition_operator_overload": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_function_definition_operator_overload_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_function_definition_operator_overload_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_function_definition_operator_overload_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.function.definition.operator-overload.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
-				}
-			}
-		},
-		"scope_resolution_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				}
-			}
-		},
-		"scope_resolution_namespace_alias": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_alias_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_namespace_alias_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_alias_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.namespace.alias.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
-				}
-			}
-		},
-		"scope_resolution_namespace_block": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_block_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_namespace_block_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_block_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.namespace.block.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
-				}
-			}
-		},
-		"scope_resolution_namespace_using": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_using_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_namespace_using_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_namespace_using_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.namespace.using.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
-				}
-			}
-		},
-		"scope_resolution_parameter": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_parameter_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_parameter_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_parameter_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.parameter.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
-				}
-			}
-		},
-		"scope_resolution_template_call": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_template_call_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_template_call_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_template_call_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.template.call.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
-				}
-			}
-		},
-		"scope_resolution_template_definition": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_template_definition_inner_generated"
-						}
-					]
-				},
-				"1": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
-				},
-				"3": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"scope_resolution_template_definition_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
-			"captures": {
-				"1": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_template_definition_inner_generated"
-						}
-					]
-				},
-				"2": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
-				},
-				"4": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"6": {
-					"name": "entity.name.scope-resolution.template.definition.cpp"
-				},
-				"7": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"9": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
-				}
-			}
-		},
-		"semicolon": {
-			"match": ";",
-			"name": "punctuation.terminator.statement.cpp"
-		},
-		"simple_type": {
-			"match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?",
-			"captures": {
-				"1": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"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": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"3": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"4": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"5": {
-					"name": "comment.block.cpp"
-				},
-				"6": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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"
-						}
-					]
-				},
-				"12": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"13": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"15": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"17": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"18": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-				},
-				"26": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				}
-			}
-		},
-		"single_line_macro": {
-			"match": "^((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))#define.*(?<![\\\\])(?:\\n|$)",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"include": "#macro"
-						},
-						{
-							"include": "#comments"
-						}
-					]
-				},
-				"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"
-						}
-					]
-				}
-			}
+			]
 		},
 		"sizeof_operator": {
-			"contentName": "meta.arguments.operator.sizeof.cpp",
-			"begin": "((?<!\\w)sizeof(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
@@ -11726,7 +8234,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -11752,12 +8260,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.sizeof",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -11765,8 +8273,8 @@
 			]
 		},
 		"sizeof_variadic_operator": {
-			"contentName": "meta.arguments.operator.sizeof.variadic.cpp",
-			"begin": "(\\bsizeof\\.\\.\\.)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
@@ -11774,7 +8282,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -11800,12 +8308,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.sizeof.variadic",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -11813,20 +8321,20 @@
 			]
 		},
 		"square_brackets": {
-			"name": "meta.bracket.square.access.cpp",
+			"name": "meta.bracket.square.access",
 			"begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
 			"beginCaptures": {
 				"1": {
-					"name": "variable.other.object.cpp"
+					"name": "variable.other.object"
 				},
 				"2": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
+					"name": "punctuation.definition.begin.bracket.square"
 				}
 			},
 			"end": "\\]|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
+					"name": "punctuation.definition.end.bracket.square"
 				}
 			},
 			"patterns": [
@@ -11835,29 +8343,14 @@
 				}
 			]
 		},
-		"standard_declares": {
-			"patterns": [
-				{
-					"include": "#struct_declare"
-				},
-				{
-					"include": "#union_declare"
-				},
-				{
-					"include": "#enum_declare"
-				},
-				{
-					"include": "#class_declare"
-				}
-			]
-		},
 		"static_assert": {
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -11885,7 +8378,7 @@
 				"6": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -11911,22 +8404,22 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.static_assert.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.static_assert.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"name": "meta.static_assert.message.cpp",
-					"begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+					"begin": "(,)(?:(?:\\s)+)?(?=(?:L|u8|u|U(?:(?:\\s)+)?\\\")?)",
+					"end": "(?=\\))|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.separator.delimiter.comma.cpp"
 						}
 					},
-					"end": "(?=\\))|(?=(?<!\\\\)\n)",
+					"endCaptures": {},
+					"name": "meta.static_assert.message.cpp",
 					"patterns": [
 						{
 							"include": "#string_context"
@@ -11938,83 +8431,50 @@
 				}
 			]
 		},
-		"storage_specifiers": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:volatile|register|restrict|static|extern|const)(?!\\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.modifier.specifier.$5.cpp"
-				}
-			}
-		},
 		"storage_types": {
 			"patterns": [
 				{
-					"include": "#storage_specifiers"
+					"include": "source.cpp#storage_specifiers"
 				},
 				{
-					"include": "#primitive_types"
+					"include": "source.cpp#primitive_types"
 				},
 				{
-					"include": "#non_primitive_types"
+					"include": "source.cpp#non_primitive_types"
 				},
 				{
-					"include": "#pthread_types"
+					"include": "source.cpp#pthread_types"
 				},
 				{
-					"include": "#posix_reserved_types"
+					"include": "source.cpp#posix_reserved_types"
 				},
 				{
 					"include": "#decltype"
 				},
 				{
-					"include": "#typename"
+					"include": "source.cpp#typename"
 				}
 			]
 		},
 		"string_context": {
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"begin": "(((?:u|u8|U|L)?)\")",
+					"begin": "((?:u|u8|U|L)?)\"",
+					"end": "\"|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
 						},
-						"2": {
+						"1": {
 							"name": "meta.encoding.cpp"
 						}
 					},
-					"end": "(\")|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
+					"name": "string.quoted.double.cpp",
 					"patterns": [
 						{
 							"match": "(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8})",
@@ -12029,218 +8489,199 @@
 							"name": "constant.character.escape.cpp"
 						},
 						{
-							"match": "\\\\x[0-9a-fA-F]{2,2}",
+							"match": "\\\\x[0-9a-fA-F]{2}",
 							"name": "constant.character.escape.cpp"
 						},
 						{
-							"include": "#string_escapes_context_c"
+							"include": "source.cpp#string_escapes_context_c"
 						}
 					]
 				},
 				{
-					"name": "string.quoted.single.cpp",
-					"begin": "((?<![0-9A-Fa-f])((?:u|u8|U|L)?)')",
+					"begin": "(?<![0-9A-Fa-f])((?:u|u8|U|L)?)'",
+					"end": "'|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
 						},
-						"2": {
+						"1": {
 							"name": "meta.encoding.cpp"
 						}
 					},
-					"end": "(')|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
+					"name": "string.quoted.single.cpp",
 					"patterns": [
 						{
-							"include": "#string_escapes_context_c"
+							"include": "source.cpp#string_escapes_context_c"
 						},
 						{
-							"include": "#line_continuation_character"
+							"include": "source.cpp#line_continuation_character"
 						}
 					]
 				},
 				{
+					"begin": "((?:[uUL]8?)?R)\\\"(?:(?:_r|re)|regex)\\(",
+					"end": "\\)(?:(?:_r|re)|regex)\\\"|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.double.raw.regex.cpp",
 					"patterns": [
 						{
-							"name": "string.quoted.double.raw.regex.cpp",
-							"begin": "(((?:[uUL]8?)?R)\\\"(?:(?:_r|re)|regex)\\()",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.begin.cpp"
-								},
-								"2": {
-									"name": "meta.encoding.cpp"
-								}
-							},
-							"end": "(\\)(?:(?:_r|re)|regex)\\\")|(?=(?<!\\\\)\n)",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.end.cpp"
-								}
-							},
-							"patterns": [
-								{
-									"include": "source.regexp.python"
-								}
-							]
-						},
-						{
-							"name": "string.quoted.double.raw.sql.cpp",
-							"begin": "(((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\()",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.begin.cpp"
-								},
-								"2": {
-									"name": "meta.encoding.cpp"
-								}
-							},
-							"end": "(\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\")|(?=(?<!\\\\)\n)",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.end.cpp"
-								}
-							},
-							"patterns": [
-								{
-									"include": "source.sql"
-								}
-							]
-						},
-						{
-							"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)\"|(?=(?<!\\\\)\n)",
-							"endCaptures": {
-								"0": {
-									"name": "punctuation.definition.string.end.cpp"
-								},
-								"1": {
-									"name": "invalid.illegal.delimiter-too-long.cpp"
-								}
-							},
-							"name": "string.quoted.double.raw.cpp"
+							"include": "source.regexp.python"
 						}
 					]
-				}
-			]
-		},
-		"string_escapes_context_c": {
-			"patterns": [
-				{
-					"include": "#backslash_escapes"
 				},
 				{
-					"match": "\\\\.",
-					"name": "invalid.illegal.unknown-escape.cpp"
+					"begin": "((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
+					"end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\"|(?=(?<!\\\\)\n)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.double.raw.sql.cpp",
+					"patterns": [
+						{
+							"include": "source.sql"
+						}
+					]
 				},
 				{
-					"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"
+					"begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin"
+						},
+						"1": {
+							"name": "meta.encoding"
+						},
+						"3": {
+							"name": "invalid.illegal.delimiter-too-long"
+						}
+					},
+					"end": "\\)\\2(\\3)\"|(?=(?<!\\\\)\n)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end"
+						},
+						"1": {
+							"name": "invalid.illegal.delimiter-too-long"
+						}
+					},
+					"name": "string.quoted.double.raw"
 				}
 			]
 		},
 		"struct_block": {
-			"name": "meta.block.struct.cpp",
-			"begin": "((((?<!\\w)struct(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+			"begin": "((?<!\\w)struct(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.struct.cpp"
 				},
-				"3": {
-					"name": "storage.type.$3.cpp"
+				"1": {
+					"name": "storage.type.$1.cpp"
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"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": "#attributes_context"
+						},
+						{
+							"include": "source.cpp#number_literal"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
 				"12": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"13": {
-					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-				},
-				"14": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"15": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -12252,111 +8693,111 @@
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"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.$1.cpp"
+				},
 				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"23": {
-					"name": "entity.name.type.$3.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"25": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"26": {
-					"name": "comment.block.cpp"
+					"name": "storage.type.modifier.final.cpp"
 				},
 				"27": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"28": {
-					"name": "storage.type.modifier.final.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"31": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"32": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"33": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -12368,18 +8809,10 @@
 						}
 					]
 				},
-				"37": {
+				"35": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inheritance_context"
-						}
-					]
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -12388,16 +8821,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.struct.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.struct.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
 						}
 					},
+					"name": "meta.head.struct.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -12411,14 +8846,15 @@
 					]
 				},
 				{
-					"name": "meta.body.struct.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
 						}
 					},
+					"name": "meta.body.struct.cpp",
 					"patterns": [
 						{
 							"include": "#function_pointer"
@@ -12438,9 +8874,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.struct.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -12449,196 +8887,14 @@
 				}
 			]
 		},
-		"struct_declare": {
-			"match": "((?<!\\w)struct(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
-			"captures": {
-				"1": {
-					"name": "storage.type.struct.declare.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": "entity.name.type.struct.cpp"
-				},
-				"7": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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": [
-						{
-							"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": {
-					"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": {
-					"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": "variable.other.object.declare.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"
-						}
-					]
-				}
-			}
-		},
 		"switch_conditional_parentheses": {
-			"name": "meta.conditional.switch.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -12664,12 +8920,12 @@
 					"name": "punctuation.section.parens.begin.bracket.round.conditional.switch.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.end.bracket.round.conditional.switch.cpp"
 				}
 			},
+			"name": "meta.conditional.switch.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -12680,26 +8936,26 @@
 			]
 		},
 		"switch_statement": {
-			"name": "meta.block.switch.cpp",
-			"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)switch(?!\\w))",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.switch.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -12711,21 +8967,23 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "keyword.control.switch.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
+			"name": "meta.block.switch.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.switch.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.switch.cpp"
 						}
 					},
+					"name": "meta.head.switch.cpp",
 					"patterns": [
 						{
 							"include": "#switch_conditional_parentheses"
@@ -12736,14 +8994,15 @@
 					]
 				},
 				{
-					"name": "meta.body.switch.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.switch.cpp"
 						}
 					},
+					"name": "meta.body.switch.cpp",
 					"patterns": [
 						{
 							"include": "#default_statement"
@@ -12760,9 +9019,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.switch.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -12771,20 +9032,6 @@
 				}
 			]
 		},
-		"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_call_context": {
 			"patterns": [
 				{
@@ -12797,55 +9044,42 @@
 					"include": "#storage_types"
 				},
 				{
-					"include": "#language_constants"
+					"include": "source.cpp#language_constants"
 				},
 				{
-					"include": "#scope_resolution_template_call_inner_generated"
+					"include": "source.cpp#scope_resolution_template_call_inner_generated"
 				},
 				{
 					"include": "#operators"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				},
 				{
 					"include": "#string_context"
 				},
 				{
-					"include": "#comma_in_template_argument"
+					"include": "source.cpp#comma_in_template_argument"
 				},
 				{
-					"include": "#qualified_type"
+					"include": "source.cpp#qualified_type"
 				}
 			]
 		},
-		"template_call_innards": {
-			"match": "((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<1>?)+)>)\\s*",
-			"captures": {
-				"0": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
 		"template_call_range": {
-			"name": "meta.template.call.cpp",
-			"begin": "(<)",
+			"begin": "<",
+			"end": ">|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
 				}
 			},
-			"end": "(>)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.angle-brackets.end.template.call.cpp"
 				}
 			},
+			"name": "meta.template.call.cpp",
 			"patterns": [
 				{
 					"include": "#template_call_context"
@@ -12853,8 +9087,8 @@
 			]
 		},
 		"template_definition": {
-			"name": "meta.template.definition.cpp",
-			"begin": "(?<!\\w)(template)\\s*(<)",
+			"begin": "(?<!\\w)(template)(?:(?:\\s)+)?(<)",
+			"end": ">|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.type.template.cpp"
@@ -12863,23 +9097,23 @@
 					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
 				}
 			},
-			"end": "(>)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
 				}
 			},
+			"name": "meta.template.definition.cpp",
 			"patterns": [
 				{
-					"begin": "((?<=\\w)\\s*<)",
+					"begin": "(?<=\\w)(?:(?:\\s)+)?<",
+					"end": ">|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
 						}
 					},
-					"end": "(>)|(?=(?<!\\\\)\n)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
 						}
 					},
@@ -12894,114 +9128,35 @@
 				}
 			]
 		},
-		"template_definition_argument": {
-			"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}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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": "#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.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": "punctuation.vararg-ellipses.template.definition.cpp"
-				},
-				"10": {
-					"name": "entity.name.type.template.cpp"
-				},
-				"11": {
-					"name": "punctuation.separator.delimiter.comma.template.argument.cpp"
-				}
-			}
-		},
 		"template_definition_context": {
 			"patterns": [
 				{
-					"include": "#scope_resolution_template_definition_inner_generated"
+					"include": "source.cpp#scope_resolution_template_definition_inner_generated"
 				},
 				{
-					"include": "#template_definition_argument"
+					"include": "source.cpp#template_definition_argument"
 				},
 				{
-					"include": "#template_argument_defaulted"
+					"include": "source.cpp#template_argument_defaulted"
 				},
 				{
-					"include": "#template_call_innards"
+					"include": "source.cpp#template_call_innards"
 				},
 				{
 					"include": "#evaluation_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": "#template_definition_context"
-						}
-					]
-				},
-				"4": {
-					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
-				}
-			}
-		},
 		"ternary_operator": {
-			"applyEndPatternLast": true,
-			"begin": "(\\?)",
+			"begin": "\\?",
+			"end": ":|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.operator.ternary.cpp"
 				}
 			},
-			"end": "(:)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.operator.ternary.cpp"
 				}
 			},
@@ -13013,49 +9168,49 @@
 					"include": "#string_context"
 				},
 				{
-					"include": "#number_literal"
+					"include": "source.cpp#number_literal"
 				},
 				{
 					"include": "#method_access"
 				},
 				{
-					"include": "#member_access"
+					"include": "source.cpp#member_access"
 				},
 				{
-					"include": "#predefined_macros"
+					"include": "source.cpp#predefined_macros"
 				},
 				{
 					"include": "#operators"
 				},
 				{
-					"include": "#memory_operators"
+					"include": "source.cpp#memory_operators"
 				},
 				{
-					"include": "#wordlike_operators"
+					"include": "source.cpp#wordlike_operators"
 				},
 				{
-					"include": "#type_casting_operators"
+					"include": "source.cpp#type_casting_operators"
 				},
 				{
-					"include": "#control_flow_keywords"
+					"include": "source.cpp#control_flow_keywords"
 				},
 				{
-					"include": "#exception_keywords"
+					"include": "source.cpp#exception_keywords"
 				},
 				{
-					"include": "#the_this_keyword"
+					"include": "source.cpp#the_this_keyword"
 				},
 				{
-					"include": "#language_constants"
+					"include": "source.cpp#language_constants"
 				},
 				{
 					"include": "#builtin_storage_type_initilizer"
 				},
 				{
-					"include": "#qualifiers_and_specifiers_post_parameters"
+					"include": "source.cpp#qualifiers_and_specifiers_post_parameters"
 				},
 				{
-					"include": "#functional_specifiers_pre_parameters"
+					"include": "source.cpp#functional_specifiers_pre_parameters"
 				},
 				{
 					"include": "#storage_types"
@@ -13076,678 +9231,116 @@
 					"include": "#function_call"
 				},
 				{
-					"include": "#scope_resolution_inner_generated"
+					"include": "source.cpp#scope_resolution_inner_generated"
 				},
 				{
 					"include": "#square_brackets"
 				},
 				{
-					"include": "#empty_square_brackets"
+					"include": "source.cpp#semicolon"
 				},
 				{
-					"include": "#semicolon"
-				},
-				{
-					"include": "#comma"
+					"include": "source.cpp#comma"
 				}
 			]
 		},
-		"the_this_keyword": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)this(?!\\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": "variable.language.this.cpp"
-				}
-			}
-		},
-		"type_alias": {
-			"match": "(using)\\s*(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(?![\\w<:.]))\\s*(\\=)\\s*((?:typename)?)\\s*((?:(?:(?>(?:(?:(?>(?<!\\s)\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?<!\\w)(?:volatile|register|restrict|static|extern|const)(?!\\w))\\s+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:(\\[)(\\w*)(\\])\\s*)?\\s*(?:(;)|\\n)",
-			"captures": {
-				"1": {
-					"name": "keyword.other.using.directive.cpp"
-				},
-				"2": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"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": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"16": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"18": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"19": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"21": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": {
-					"name": "entity.name.type.cpp"
-				},
-				"27": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"29": {
-					"name": "keyword.operator.assignment.cpp"
-				},
-				"30": {
-					"name": "keyword.other.typename.cpp"
-				},
-				"31": {
-					"patterns": [
-						{
-							"include": "#storage_specifiers"
-						}
-					]
-				},
-				"32": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"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"
-						}
-					]
-				},
-				"33": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"34": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"35": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"36": {
-					"name": "comment.block.cpp"
-				},
-				"37": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"39": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"40": {
-					"name": "comment.block.cpp"
-				},
-				"41": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"43": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"44": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"46": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"48": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"49": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"51": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"52": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"53": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"54": {
-					"name": "comment.block.cpp"
-				},
-				"55": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"56": {
-					"name": "entity.name.type.cpp"
-				},
-				"57": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"59": {
-					"name": "meta.declaration.type.alias.value.unknown.cpp",
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
-				},
-				"60": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-						}
-					]
-				},
-				"61": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"62": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"63": {
-					"name": "comment.block.cpp"
-				},
-				"64": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"65": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"66": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"67": {
-					"name": "comment.block.cpp"
-				},
-				"68": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"69": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"70": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"71": {
-					"name": "comment.block.cpp"
-				},
-				"72": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"73": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
-				},
-				"74": {
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
-				},
-				"75": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
-				},
-				"76": {
-					"name": "punctuation.terminator.statement.cpp"
-				}
-			},
-			"name": "meta.declaration.type.alias.cpp"
-		},
-		"type_casting_operators": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:reinterpret_cast|dynamic_cast|static_cast|const_cast)(?!\\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": "keyword.operator.wordlike.cpp keyword.operator.cast.$5.cpp"
-				}
-			}
-		},
 		"typedef_class": {
-			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)class(?!\\w))",
+			"begin": "((?<!\\w)typedef(?!\\w))(?:(?:\\s)+)?(?=(?<!\\w)class(?!\\w))",
+			"end": "(?<=;)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.block.class.cpp",
-					"begin": "((((?<!\\w)class(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+					"begin": "((?<!\\w)class(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.head.class.cpp"
 						},
-						"3": {
-							"name": "storage.type.$3.cpp"
+						"1": {
+							"name": "storage.type.$1.cpp"
 						},
-						"4": {
+						"2": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
-						"5": {
+						"3": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"6": {
+						"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": "#attributes_context"
+								},
+								{
+									"include": "source.cpp#number_literal"
+								}
+							]
+						},
 						"7": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"8": {
-							"patterns": [
-								{
-									"include": "#attributes_context"
-								},
-								{
-									"include": "#number_literal"
-								}
-							]
-						},
-						"9": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"10": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"11": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
+						"10": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"11": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
 						"12": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"13": {
-							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-						},
-						"14": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"15": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"16": {
+						"14": {
 							"name": "comment.block.cpp"
 						},
-						"17": {
+						"15": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -13759,111 +9352,111 @@
 								}
 							]
 						},
-						"18": {
+						"16": {
 							"patterns": [
 								{
 									"include": "#attributes_context"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								}
 							]
 						},
-						"19": {
+						"17": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
-						"20": {
+						"18": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"21": {
+						"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.$1.cpp"
+						},
 						"22": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"23": {
-							"name": "entity.name.type.$3.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"24": {
+							"name": "comment.block.cpp"
+						},
+						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
 								}
 							]
 						},
-						"25": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
 						"26": {
-							"name": "comment.block.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"27": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"28": {
-							"name": "storage.type.modifier.final.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"29": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"31": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"32": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"33": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"34": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"35": {
+						"33": {
 							"name": "comment.block.cpp"
 						},
-						"36": {
+						"34": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -13875,18 +9468,10 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
-						},
-						"38": {
-							"patterns": [
-								{
-									"include": "#inheritance_context"
-								}
-							]
 						}
 					},
-					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
@@ -13895,16 +9480,18 @@
 							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
+					"name": "meta.block.class.cpp",
 					"patterns": [
 						{
-							"name": "meta.head.class.cpp",
 							"begin": "\\G ?",
-							"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+							"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
 								}
 							},
+							"name": "meta.head.class.cpp",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -13918,14 +9505,15 @@
 							]
 						},
 						{
-							"name": "meta.body.class.cpp",
 							"begin": "(?<=\\{|<%|\\?\\?<)",
-							"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+							"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.end.bracket.curly.class.cpp"
 								}
 							},
+							"name": "meta.body.class.cpp",
 							"patterns": [
 								{
 									"include": "#function_pointer"
@@ -13945,12 +9533,14 @@
 							]
 						},
 						{
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+							"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"name": "meta.tail.class.cpp",
-							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-							"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 							"patterns": [
 								{
-									"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": {
 										"1": {
 											"patterns": [
@@ -13959,12 +9549,12 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
 																{
-																	"include": "#inline_comment"
+																	"include": "source.cpp#inline_comment"
 																}
 															]
 														},
@@ -13998,7 +9588,7 @@
 										"2": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14023,7 +9613,7 @@
 										"6": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14048,7 +9638,7 @@
 										"10": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14085,22 +9675,24 @@
 			]
 		},
 		"typedef_function_pointer": {
-			"begin": "((?<!\\w)typedef(?!\\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*\\))",
+			"begin": "((?<!\\w)typedef(?!\\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*\\))",
+			"end": "(?<=;)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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*(\\()",
+					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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)+)?(\\()",
+					"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
 							"patterns": [
 								{
-									"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+									"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 									"name": "storage.type.$0.cpp"
 								},
 								{
@@ -14113,19 +9705,36 @@
 									"include": "#storage_types"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								},
 								{
 									"include": "#string_context"
 								},
 								{
-									"include": "#comma"
+									"include": "source.cpp#comma"
 								},
 								{
-									"include": "#scope_resolution_inner_generated"
+									"include": "source.cpp#scope_resolution_inner_generated"
 								},
 								{
-									"include": "#template_call_range"
+									"begin": "<",
+									"end": ">|(?=(?<!\\\\)\n)",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_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}))*",
@@ -14139,14 +9748,14 @@
 									"include": "#attributes_context"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								}
 							]
 						},
 						"3": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -14171,7 +9780,7 @@
 						"7": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -14193,17 +9802,17 @@
 								}
 							]
 						},
-						"12": {
+						"11": {
 							"patterns": [
 								{
-									"include": "#scope_resolution_inner_generated"
+									"include": "source.cpp#scope_resolution_inner_generated"
 								}
 							]
 						},
-						"13": {
+						"12": {
 							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 						},
-						"15": {
+						"13": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -14211,10 +9820,11 @@
 								}
 							]
 						},
-						"17": {
+						"14": {},
+						"15": {
 							"name": "entity.name.scope-resolution.cpp"
 						},
-						"18": {
+						"16": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -14222,23 +9832,24 @@
 								}
 							]
 						},
+						"17": {},
+						"18": {
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+						},
+						"19": {
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
+						},
 						"20": {
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-						},
-						"21": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"22": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"23": {
+						"21": {
 							"name": "comment.block.cpp"
 						},
-						"24": {
+						"22": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14250,10 +9861,10 @@
 								}
 							]
 						},
-						"25": {
+						"23": {
 							"name": "entity.name.type.cpp"
 						},
-						"26": {
+						"24": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -14261,19 +9872,20 @@
 								}
 							]
 						},
-						"28": {
+						"25": {},
+						"26": {
 							"patterns": [
 								{
 									"match": "\\*",
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14304,70 +9916,70 @@
 								}
 							]
 						},
-						"29": {
+						"27": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
+						"28": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"29": {
+							"name": "comment.block.cpp"
+						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"31": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"32": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"33": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"34": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"35": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"36": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"37": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"38": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"39": {
+						"37": {
 							"name": "comment.block.cpp"
 						},
-						"40": {
+						"38": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14379,36 +9991,35 @@
 								}
 							]
 						},
-						"41": {
+						"39": {
 							"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
 						},
-						"42": {
+						"40": {
 							"name": "punctuation.definition.function.pointer.dereference.cpp"
 						},
-						"43": {
+						"41": {
 							"name": "entity.name.type.alias.cpp entity.name.type.pointer.function.cpp"
 						},
-						"44": {
+						"42": {
 							"name": "punctuation.definition.begin.bracket.square.cpp"
 						},
-						"45": {
+						"43": {
 							"patterns": [
 								{
 									"include": "#evaluation_context"
 								}
 							]
 						},
-						"46": {
+						"44": {
 							"name": "punctuation.definition.end.bracket.square.cpp"
 						},
-						"47": {
+						"45": {
 							"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
 						},
-						"48": {
+						"46": {
 							"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
 						}
 					},
-					"end": "(\\))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=[{=,);]|\\n)(?!\\()|(?=(?<!\\\\)\n)",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -14416,7 +10027,7 @@
 						"2": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
@@ -14447,135 +10058,103 @@
 				}
 			]
 		},
-		"typedef_keyword": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)typedef(?!\\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": "keyword.other.$5.cpp"
-				}
-			}
-		},
 		"typedef_struct": {
-			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)struct(?!\\w))",
+			"begin": "((?<!\\w)typedef(?!\\w))(?:(?:\\s)+)?(?=(?<!\\w)struct(?!\\w))",
+			"end": "(?<=;)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.block.struct.cpp",
-					"begin": "((((?<!\\w)struct(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+					"begin": "((?<!\\w)struct(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.head.struct.cpp"
 						},
-						"3": {
-							"name": "storage.type.$3.cpp"
+						"1": {
+							"name": "storage.type.$1.cpp"
 						},
-						"4": {
+						"2": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
-						"5": {
+						"3": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"6": {
+						"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": "#attributes_context"
+								},
+								{
+									"include": "source.cpp#number_literal"
+								}
+							]
+						},
 						"7": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"8": {
-							"patterns": [
-								{
-									"include": "#attributes_context"
-								},
-								{
-									"include": "#number_literal"
-								}
-							]
-						},
-						"9": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"10": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"11": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
+						"10": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"11": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
 						"12": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"13": {
-							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-						},
-						"14": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"15": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"16": {
+						"14": {
 							"name": "comment.block.cpp"
 						},
-						"17": {
+						"15": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14587,111 +10166,111 @@
 								}
 							]
 						},
-						"18": {
+						"16": {
 							"patterns": [
 								{
 									"include": "#attributes_context"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								}
 							]
 						},
-						"19": {
+						"17": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
-						"20": {
+						"18": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"21": {
+						"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.$1.cpp"
+						},
 						"22": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"23": {
-							"name": "entity.name.type.$3.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"24": {
+							"name": "comment.block.cpp"
+						},
+						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
 								}
 							]
 						},
-						"25": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
 						"26": {
-							"name": "comment.block.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"27": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"28": {
-							"name": "storage.type.modifier.final.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"29": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"31": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"32": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"33": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"34": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"35": {
+						"33": {
 							"name": "comment.block.cpp"
 						},
-						"36": {
+						"34": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14703,18 +10282,10 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
-						},
-						"38": {
-							"patterns": [
-								{
-									"include": "#inheritance_context"
-								}
-							]
 						}
 					},
-					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
@@ -14723,16 +10294,18 @@
 							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
+					"name": "meta.block.struct.cpp",
 					"patterns": [
 						{
-							"name": "meta.head.struct.cpp",
 							"begin": "\\G ?",
-							"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+							"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
 								}
 							},
+							"name": "meta.head.struct.cpp",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -14746,14 +10319,15 @@
 							]
 						},
 						{
-							"name": "meta.body.struct.cpp",
 							"begin": "(?<=\\{|<%|\\?\\?<)",
-							"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+							"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
 								}
 							},
+							"name": "meta.body.struct.cpp",
 							"patterns": [
 								{
 									"include": "#function_pointer"
@@ -14773,12 +10347,14 @@
 							]
 						},
 						{
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+							"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"name": "meta.tail.struct.cpp",
-							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-							"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 							"patterns": [
 								{
-									"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": {
 										"1": {
 											"patterns": [
@@ -14787,12 +10363,12 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
 																{
-																	"include": "#inline_comment"
+																	"include": "source.cpp#inline_comment"
 																}
 															]
 														},
@@ -14826,7 +10402,7 @@
 										"2": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14851,7 +10427,7 @@
 										"6": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14876,7 +10452,7 @@
 										"10": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -14913,101 +10489,102 @@
 			]
 		},
 		"typedef_union": {
-			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)union(?!\\w))",
+			"begin": "((?<!\\w)typedef(?!\\w))(?:(?:\\s)+)?(?=(?<!\\w)union(?!\\w))",
+			"end": "(?<=;)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)|(?=(?<!\\\\)\n)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.block.union.cpp",
-					"begin": "((((?<!\\w)union(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+					"begin": "((?<!\\w)union(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.head.union.cpp"
 						},
-						"3": {
-							"name": "storage.type.$3.cpp"
+						"1": {
+							"name": "storage.type.$1.cpp"
 						},
-						"4": {
+						"2": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
-						"5": {
+						"3": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"6": {
+						"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": "#attributes_context"
+								},
+								{
+									"include": "source.cpp#number_literal"
+								}
+							]
+						},
 						"7": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"8": {
-							"patterns": [
-								{
-									"include": "#attributes_context"
-								},
-								{
-									"include": "#number_literal"
-								}
-							]
-						},
-						"9": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"10": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"11": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
+						"10": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"11": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
 						"12": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"13": {
-							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-						},
-						"14": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"15": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"16": {
+						"14": {
 							"name": "comment.block.cpp"
 						},
-						"17": {
+						"15": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -15019,111 +10596,111 @@
 								}
 							]
 						},
-						"18": {
+						"16": {
 							"patterns": [
 								{
 									"include": "#attributes_context"
 								},
 								{
-									"include": "#number_literal"
+									"include": "source.cpp#number_literal"
 								}
 							]
 						},
-						"19": {
+						"17": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
-						"20": {
+						"18": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"21": {
+						"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.$1.cpp"
+						},
 						"22": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"23": {
-							"name": "entity.name.type.$3.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"24": {
+							"name": "comment.block.cpp"
+						},
+						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
 								}
 							]
 						},
-						"25": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
 						"26": {
-							"name": "comment.block.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"27": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "source.cpp#inline_comment"
 								}
 							]
 						},
 						"28": {
-							"name": "storage.type.modifier.final.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"29": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"31": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "source.cpp#inline_comment"
+								}
+							]
 						},
 						"32": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"33": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"34": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"35": {
+						"33": {
 							"name": "comment.block.cpp"
 						},
-						"36": {
+						"34": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -15135,18 +10712,10 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
-						},
-						"38": {
-							"patterns": [
-								{
-									"include": "#inheritance_context"
-								}
-							]
 						}
 					},
-					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
@@ -15155,16 +10724,18 @@
 							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
+					"name": "meta.block.union.cpp",
 					"patterns": [
 						{
-							"name": "meta.head.union.cpp",
 							"begin": "\\G ?",
-							"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+							"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
 								}
 							},
+							"name": "meta.head.union.cpp",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -15178,14 +10749,15 @@
 							]
 						},
 						{
-							"name": "meta.body.union.cpp",
 							"begin": "(?<=\\{|<%|\\?\\?<)",
-							"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+							"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.end.bracket.curly.union.cpp"
 								}
 							},
+							"name": "meta.body.union.cpp",
 							"patterns": [
 								{
 									"include": "#function_pointer"
@@ -15205,12 +10777,14 @@
 							]
 						},
 						{
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+							"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"name": "meta.tail.union.cpp",
-							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-							"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 							"patterns": [
 								{
-									"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": {
 										"1": {
 											"patterns": [
@@ -15219,12 +10793,12 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
 																{
-																	"include": "#inline_comment"
+																	"include": "source.cpp#inline_comment"
 																}
 															]
 														},
@@ -15258,7 +10832,7 @@
 										"2": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -15283,7 +10857,7 @@
 										"6": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -15308,7 +10882,7 @@
 										"10": {
 											"patterns": [
 												{
-													"include": "#inline_comment"
+													"include": "source.cpp#inline_comment"
 												}
 											]
 										},
@@ -15345,8 +10919,8 @@
 			]
 		},
 		"typeid_operator": {
-			"contentName": "meta.arguments.operator.typeid.cpp",
-			"begin": "((?<!\\w)typeid(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
@@ -15354,7 +10928,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
@@ -15380,393 +10954,105 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
 				}
 			},
-			"end": "(\\))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.typeid",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
 				}
 			]
 		},
-		"typename": {
-			"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?<!\\w)typename(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<36>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<36>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<36>?)+)>)\\s*)?(?![\\w<:.]))",
-			"captures": {
-				"1": {
-					"name": "storage.modifier.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": {
-					"name": "meta.qualified_type.cpp",
-					"patterns": [
-						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"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"
-						}
-					]
-				},
-				"11": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"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": {
-					"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"
-						}
-					]
-				},
-				"21": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"22": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"24": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"26": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"27": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"29": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-				},
-				"35": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				}
-			}
-		},
-		"undef": {
-			"match": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*undef\\b)((?>(?:(?:(?>(?<!\\s)\\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": {
-					"name": "keyword.control.directive.undef.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": "punctuation.definition.directive.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": "entity.name.function.preprocessor.cpp"
-				}
-			},
-			"name": "meta.preprocessor.undef.cpp"
-		},
 		"union_block": {
-			"name": "meta.block.union.cpp",
-			"begin": "((((?<!\\w)union(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+			"begin": "((?<!\\w)union(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.union.cpp"
 				},
-				"3": {
-					"name": "storage.type.$3.cpp"
+				"1": {
+					"name": "storage.type.$1.cpp"
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"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": "#attributes_context"
+						},
+						{
+							"include": "source.cpp#number_literal"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
 				"12": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"13": {
-					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-				},
-				"14": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"15": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -15778,30 +11064,30 @@
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
 						},
 						{
-							"include": "#number_literal"
+							"include": "source.cpp#number_literal"
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"19": {
 					"name": "comment.block.cpp"
 				},
-				"22": {
+				"20": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -15813,76 +11099,76 @@
 						}
 					]
 				},
+				"21": {
+					"name": "entity.name.type.$1.cpp"
+				},
+				"22": {
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
+				},
 				"23": {
-					"name": "entity.name.type.$3.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"25": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"26": {
-					"name": "comment.block.cpp"
+					"name": "storage.type.modifier.final.cpp"
 				},
 				"27": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "source.cpp#inline_comment"
 						}
 					]
 				},
 				"28": {
-					"name": "storage.type.modifier.final.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"31": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "source.cpp#inline_comment"
+						}
+					]
 				},
 				"32": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"33": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"34": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -15894,18 +11180,10 @@
 						}
 					]
 				},
-				"37": {
+				"35": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inheritance_context"
-						}
-					]
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))|(?=(?<!\\\\)\n)",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -15914,16 +11192,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.union.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.union.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))|(?=(?<!\\\\)\n)",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
 						}
 					},
+					"name": "meta.head.union.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -15937,14 +11217,15 @@
 					]
 				},
 				{
-					"name": "meta.body.union.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)|(?=(?<!\\\\)\n)",
+					"end": "\\}|%>|\\?\\?>|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.union.cpp"
 						}
 					},
+					"name": "meta.body.union.cpp",
 					"patterns": [
 						{
 							"include": "#function_pointer"
@@ -15964,9 +11245,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)|(?=(?<!\\\\)\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.union.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)|(?=(?<!\\\\)\n)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -15975,199 +11258,9 @@
 				}
 			]
 		},
-		"union_declare": {
-			"match": "((?<!\\w)union(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
-			"captures": {
-				"1": {
-					"name": "storage.type.union.declare.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": "entity.name.type.union.cpp"
-				},
-				"7": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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": [
-						{
-							"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": {
-					"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": {
-					"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": "variable.other.object.declare.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"
-						}
-					]
-				}
-			}
-		},
-		"using_name": {
-			"match": "(using)\\s+(?!namespace\\b)",
-			"captures": {
-				"1": {
-					"name": "keyword.other.using.directive.cpp"
-				}
-			}
-		},
 		"using_namespace": {
-			"name": "meta.using-namespace.cpp",
-			"begin": "(?<!\\w)(using)\\s+(namespace)\\s+((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<7>?)+)>)\\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)",
+			"begin": "(?<!\\w)(using)(?:\\s)+(namespace)(?:\\s)+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:(?:\\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)",
+			"end": ";|(?=(?<!\\\\)\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.using.directive.cpp"
@@ -16178,14 +11271,14 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#scope_resolution_namespace_using_inner_generated"
+							"include": "source.cpp#scope_resolution_namespace_using_inner_generated"
 						}
 					]
 				},
 				"4": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
 				},
-				"6": {
+				"5": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -16193,28 +11286,17 @@
 						}
 					]
 				},
-				"8": {
+				"6": {},
+				"7": {
 					"name": "entity.name.namespace.cpp"
 				}
 			},
-			"end": "(;)|(?=(?<!\\\\)\n)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.terminator.statement.cpp"
 				}
-			}
-		},
-		"vararg_ellipses": {
-			"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
-			"name": "punctuation.vararg-ellipses.cpp"
-		},
-		"wordlike_operators": {
-			"patterns": [
-				{
-					"match": "(?<!\\w)(?:noexcept|xor_eq|and_eq|delete|not_eq|bitand|bitor|compl|or_eq|not|xor|new|and|or)(?!\\w)",
-					"name": "keyword.operator.wordlike.cpp keyword.operator.$0.cpp"
-				}
-			]
+			},
+			"name": "meta.using-namespace.cpp"
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json
index f013cbb8732..52ee727cb4d 100644
--- a/extensions/cpp/syntaxes/cpp.tmLanguage.json
+++ b/extensions/cpp/syntaxes/cpp.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/666808cab3907fc91ed4d3901060ee6b045cca58",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/a20584ae37e3bd9894e9d513a1b0fecdde045af4",
 	"name": "C++",
 	"scopeName": "source.cpp",
 	"patterns": [
@@ -51,7 +51,7 @@
 			"include": "#typedef_union"
 		},
 		{
-			"include": "#typedef_keyword"
+			"include": "#misc_keywords"
 		},
 		{
 			"include": "#standard_declares"
@@ -95,7 +95,7 @@
 	],
 	"repository": {
 		"access_control_keywords": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(((?:protected|private|public))\\s*(:))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?:(?:protected)|(?:private)|(?:public)))(?:(?:\\s)+)?(:))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -105,45 +105,55 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
-					"name": "storage.type.modifier.access.control.$6.cpp"
+				"3": {
+					"name": "storage.type.modifier.access.control.$4.cpp"
 				},
-				"7": {
+				"4": {},
+				"5": {
 					"name": "punctuation.separator.colon.access.control.cpp"
 				}
 			}
 		},
 		"alignas_attribute": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(alignas\\()",
+			"begin": "alignas\\(",
+			"end": "\\)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -151,6 +161,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -161,7 +173,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -193,8 +205,8 @@
 			]
 		},
 		"alignas_operator": {
-			"contentName": "meta.arguments.operator.alignas.cpp",
-			"begin": "((?<!\\w)alignas(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
@@ -228,12 +240,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.alignas",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -241,8 +253,8 @@
 			]
 		},
 		"alignof_operator": {
-			"contentName": "meta.arguments.operator.alignof.cpp",
-			"begin": "((?<!\\w)alignof(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
@@ -276,12 +288,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.alignof",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -289,96 +301,221 @@
 			]
 		},
 		"assembly": {
-			"name": "meta.asm.cpp",
-			"begin": "(\\b(?:__asm__|asm)\\b)\\s*((?:volatile)?)\\s*(\\()",
+			"begin": "(\\b(?:__asm__|asm)\\b)(?:(?:\\s)+)?((?:volatile)?)",
+			"end": "(?!\\G)",
 			"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"
 				}
 			},
+			"endCaptures": {},
+			"name": "meta.asm.cpp",
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"contentName": "meta.embedded.assembly.cpp",
-					"begin": "(R?)(\")",
-					"beginCaptures": {
+					"match": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:\\n)|$)",
+					"captures": {
 						"1": {
-							"name": "meta.encoding.cpp"
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
 						},
 						"2": {
-							"name": "punctuation.definition.string.begin.assembly.cpp"
-						}
-					},
-					"end": "(\")",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.assembly.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "source.asm"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						{
-							"include": "source.x86"
+						"3": {
+							"name": "comment.block.cpp"
 						},
-						{
-							"include": "source.x86_64"
-						},
-						{
-							"include": "source.arm"
-						},
-						{
-							"include": "#backslash_escapes"
-						},
-						{
-							"include": "#string_escaped_char"
-						},
-						{
-							"match": "(?=not)possible"
+						"4": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						}
-					]
-				},
-				{
-					"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"
+				},
+				{
+					"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\(",
+					"end": "\\)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.begin.bracket.round.assembly.cpp"
+						},
+						"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"
+								}
+							]
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.parens.end.bracket.round.assembly.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"begin": "(R?)(\")",
+							"end": "\"",
+							"beginCaptures": {
+								"1": {
+									"name": "meta.encoding.cpp"
+								},
+								"2": {
+									"name": "punctuation.definition.string.begin.assembly.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.definition.string.end.assembly.cpp"
+								}
+							},
+							"name": "string.quoted.double.cpp",
+							"contentName": "meta.embedded.assembly",
+							"patterns": [
+								{
+									"include": "source.asm"
+								},
+								{
+									"include": "source.x86"
+								},
+								{
+									"include": "source.x86_64"
+								},
+								{
+									"include": "source.arm"
+								},
+								{
+									"include": "#backslash_escapes"
+								},
+								{
+									"include": "#string_escaped_char"
+								}
+							]
+						},
+						{
+							"begin": "\\(",
+							"end": "\\)",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.parens.begin.bracket.round.assembly.inner.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.parens.end.bracket.round.assembly.inner.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#evaluation_context"
+								}
+							]
+						},
+						{
+							"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}))*)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))\\]",
+							"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.other.asm.label.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"
+										}
+									]
+								}
+							}
+						},
+						{
+							"match": ":",
+							"name": "punctuation.separator.delimiter.colon.assembly.cpp"
+						},
+						{
+							"include": "#comments_context"
+						},
+						{
+							"include": "#comments"
+						}
+					]
 				}
 			]
 		},
@@ -403,23 +540,23 @@
 			]
 		},
 		"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"
+			"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?]   |\n[0-3][0-7]{,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"
 		},
 		"block": {
-			"name": "meta.block.cpp",
-			"begin": "({)",
+			"begin": "{",
+			"end": "}|(?=\\s*#\\s*(?:elif|else|endif)\\b)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.block.begin.bracket.curly.cpp"
 				}
 			},
-			"end": "(}|(?=\\s*#\\s*(?:elif|else|endif)\\b))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.block.end.bracket.curly.cpp"
 				}
 			},
+			"name": "meta.block.cpp",
 			"patterns": [
 				{
 					"include": "#function_body_context"
@@ -427,22 +564,23 @@
 			]
 		},
 		"block_comment": {
-			"name": "comment.block.cpp",
 			"begin": "\\s*+(\\/\\*)",
+			"end": "\\*\\/",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.begin.cpp"
 				}
 			},
-			"end": "(\\*\\/)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.definition.comment.end.cpp"
 				}
-			}
+			},
+			"name": "comment.block.cpp"
 		},
 		"builtin_storage_type_initilizer": {
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w)))|((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w)))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))|((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\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)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -610,9 +748,8 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.initializer.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.initializer.cpp"
 				}
 			},
@@ -623,8 +760,8 @@
 			]
 		},
 		"case_statement": {
-			"name": "meta.conditional.case.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)case(?!\\w))",
+			"end": ":",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -655,12 +792,12 @@
 					"name": "keyword.control.case.cpp"
 				}
 			},
-			"end": "(:)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.separator.colon.case.cpp"
 				}
 			},
+			"name": "meta.conditional.case.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -671,92 +808,92 @@
 			]
 		},
 		"class_block": {
-			"name": "meta.block.class.cpp",
-			"begin": "((((?<!\\w)class(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+			"begin": "((?<!\\w)class(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.class.cpp"
 				},
-				"3": {
-					"name": "storage.type.$3.cpp"
+				"1": {
+					"name": "storage.type.$1.cpp"
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"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": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
 				"12": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"13": {
-					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-				},
-				"14": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"15": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -768,7 +905,7 @@
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -778,76 +915,76 @@
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"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.$1.cpp"
+				},
 				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"23": {
-					"name": "entity.name.type.$3.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"25": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"26": {
-					"name": "comment.block.cpp"
+					"name": "storage.type.modifier.final.cpp"
 				},
 				"27": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"28": {
-					"name": "storage.type.modifier.final.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"31": {
-					"name": "comment.block.cpp"
-				},
-				"32": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -859,20 +996,20 @@
 						}
 					]
 				},
-				"33": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"34": {
+				"32": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -884,18 +1021,10 @@
 						}
 					]
 				},
-				"37": {
+				"35": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inheritance_context"
-						}
-					]
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -904,16 +1033,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.class.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.class.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
 						}
 					},
+					"name": "meta.head.class.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -927,14 +1058,15 @@
 					]
 				},
 				{
-					"name": "meta.body.class.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.class.cpp"
 						}
 					},
+					"name": "meta.body.class.cpp",
 					"patterns": [
 						{
 							"include": "#function_pointer"
@@ -954,9 +1086,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.class.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -966,7 +1100,7 @@
 			]
 		},
 		"class_declare": {
-			"match": "((?<!\\w)class(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
+			"match": "((?<!\\w)class(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
@@ -979,34 +1113,43 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.class.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -1042,6 +1185,40 @@
 						}
 					]
 				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"8": {
 					"patterns": [
 						{
@@ -1050,98 +1227,100 @@
 					]
 				},
 				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"10": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.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": {
-					"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": "variable.other.object.declare.cpp"
 				},
-				"21": {
+				"13": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
-					"name": "comment.block.cpp"
-				},
-				"24": {
+				"14": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
@@ -1158,14 +1337,15 @@
 		"comments": {
 			"patterns": [
 				{
-					"name": "comment.line.double-slash.documentation.cpp",
-					"begin": "(?:^)(?>\\s*)(\\/\\/[!\\/]+)",
+					"begin": "^(?:(?:\\s)+)?+(\\/\\/[!\\/]+)",
+					"end": "(?<=\\n)(?<!\\\\\\n)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.comment.documentation.cpp"
 						}
 					},
-					"end": "(?<=\\n)(?<!\\\\\\n)",
+					"endCaptures": {},
+					"name": "comment.line.double-slash.documentation.cpp",
 					"patterns": [
 						{
 							"include": "#line_continuation_character"
@@ -1175,7 +1355,7 @@
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1186,7 +1366,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]b)(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1197,7 +1377,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1216,12 +1396,20 @@
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:(?:\\s)+)?(?:in|out)(?:(?:\\s)+)?)+)\\])?(?:\\s)+(\\b\\w+\\b)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								"2": {
+									"patterns": [
+										{
+											"match": "in|out",
+											"name": "keyword.other.parameter.direction.$0.cpp"
+										}
+									]
+								},
+								"3": {
 									"name": "variable.parameter.cpp"
 								}
 							}
@@ -1253,7 +1441,7 @@
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+									"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))(?:\\s)+(\\S+)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
@@ -1264,7 +1452,7 @@
 									}
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+									"match": "((?<=[\\s*!\\/])[\\\\@]b)(?:\\s)+(\\S+)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
@@ -1275,7 +1463,7 @@
 									}
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+									"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))(?:\\s)+(\\S+)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
@@ -1294,12 +1482,20 @@
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								{
-									"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+									"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:(?:\\s)+)?(?:in|out)(?:(?:\\s)+)?)+)\\])?(?:\\s)+(\\b\\w+\\b)",
 									"captures": {
 										"1": {
 											"name": "storage.type.class.doxygen.cpp"
 										},
 										"2": {
+											"patterns": [
+												{
+													"match": "in|out",
+													"name": "keyword.other.parameter.direction.$0.cpp"
+												}
+											]
+										},
+										"3": {
 											"name": "variable.parameter.cpp"
 										}
 									}
@@ -1325,26 +1521,26 @@
 					"name": "comment.block.documentation.cpp"
 				},
 				{
-					"name": "comment.block.documentation.cpp",
-					"begin": "((?>\\s*)\\/\\*[!*]+(?:(?:\\n|$)|(?=\\s)))",
+					"begin": "(?:(?:\\s)+)?+\\/\\*[!*]+(?:(?:(?:\\n)|$)|(?=\\s))",
+					"end": "[!*]*\\*\\/",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.comment.begin.documentation.cpp"
 						}
 					},
-					"end": "([!*]*\\*\\/)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.comment.end.documentation.cpp"
 						}
 					},
+					"name": "comment.block.documentation.cpp",
 					"patterns": [
 						{
 							"match": "(?<=[\\s*!\\/])[\\\\@](?:callergraph|callgraph|else|endif|f\\$|f\\[|f\\]|hidecallergraph|hidecallgraph|hiderefby|hiderefs|hideinitializer|htmlinclude|n|nosubgrouping|private|privatesection|protected|protectedsection|public|publicsection|pure|showinitializer|showrefby|showrefs|tableofcontents|\\$|\\#|<|>|%|\"|\\.|=|::|\\||\\-\\-|\\-\\-\\-)\\b(?:\\{[^}]*\\})?",
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:a|em|e))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1355,7 +1551,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]b)\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]b)(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1366,7 +1562,7 @@
 							}
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))\\s+(\\S+)",
+							"match": "((?<=[\\s*!\\/])[\\\\@](?:c|p))(?:\\s)+(\\S+)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
@@ -1385,12 +1581,20 @@
 							"name": "storage.type.class.doxygen.cpp"
 						},
 						{
-							"match": "((?<=[\\s*!\\/])[\\\\@]param)\\s+(\\b\\w+\\b)",
+							"match": "((?<=[\\s*!\\/])[\\\\@]param)(?:\\s*\\[((?:,?(?:(?:\\s)+)?(?:in|out)(?:(?:\\s)+)?)+)\\])?(?:\\s)+(\\b\\w+\\b)",
 							"captures": {
 								"1": {
 									"name": "storage.type.class.doxygen.cpp"
 								},
 								"2": {
+									"patterns": [
+										{
+											"match": "in|out",
+											"name": "keyword.other.parameter.direction.$0.cpp"
+										}
+									]
+								},
+								"3": {
 									"name": "variable.parameter.cpp"
 								}
 							}
@@ -1424,26 +1628,26 @@
 			]
 		},
 		"constructor_inline": {
-			"name": "meta.function.definition.special.constructor.cpp",
-			"begin": "(^((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:(?:constexpr|explicit|mutable|virtual|inline|friend)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\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)(?=\\()))",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\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)(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.constructor.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -1455,52 +1659,52 @@
 						}
 					]
 				},
+				"5": {
+					"patterns": [
+						{
+							"include": "#functional_specifiers_pre_parameters"
+						}
+					]
+				},
 				"6": {
 					"patterns": [
 						{
-							"include": "#functional_specifiers_pre_parameters"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"7": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"8": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"10": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"11": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"12": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"13": {
 					"name": "comment.block.cpp"
 				},
-				"14": {
+				"13": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1512,23 +1716,23 @@
 						}
 					]
 				},
-				"15": {
+				"14": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"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": "\\*\\/",
@@ -1540,83 +1744,82 @@
 						}
 					]
 				},
-				"20": {
+				"19": {
 					"name": "entity.name.function.constructor.cpp entity.name.function.definition.special.constructor.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.constructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.constructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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"
+							"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": "(:)",
+							"begin": ":",
+							"end": "(?=\\{)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.separator.initializers.cpp"
 								}
 							},
-							"end": "(?=\\{)",
+							"endCaptures": {},
 							"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))(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<3>?)+)>)\\s*)?(\\()",
+									"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))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?(\\()",
+									"end": "\\)",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -1629,16 +1832,17 @@
 												}
 											]
 										},
+										"3": {},
 										"4": {
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\))",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -1646,8 +1850,8 @@
 									]
 								},
 								{
-									"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))(\\{)",
+									"end": "\\}",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -1656,12 +1860,12 @@
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\})",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -1669,7 +1873,8 @@
 									]
 								},
 								{
-									"include": "#comma"
+									"match": ",",
+									"name": "punctuation.separator.delimiter.comma.cpp"
 								},
 								{
 									"include": "#comments"
@@ -1677,19 +1882,19 @@
 							]
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
 								}
 							},
-							"end": "(\\))",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters.special.constructor",
 							"patterns": [
 								{
 									"include": "#function_parameter_context"
@@ -1705,14 +1910,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.constructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -1720,9 +1926,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.constructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -1732,26 +1940,26 @@
 			]
 		},
 		"constructor_root": {
-			"name": "meta.function.definition.special.constructor.cpp",
-			"begin": "(\\s*+((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<14>?)+)>)\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))::((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\16((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\()))",
+			"begin": "\\s*+((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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)))\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.constructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"4": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1763,23 +1971,23 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"7": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1791,7 +1999,7 @@
 						}
 					]
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"match": "::",
@@ -1806,7 +2014,7 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -1814,7 +2022,8 @@
 						}
 					]
 				},
-				"15": {
+				"12": {},
+				"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}))*(?=:)",
@@ -1830,45 +2039,46 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
+				"16": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"17": {
+					"name": "comment.block.cpp"
+				},
 				"18": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"19": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"20": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1880,20 +2090,20 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"26": {
+				"24": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"27": {
+				"25": {
 					"name": "comment.block.cpp"
 				},
-				"28": {
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -1906,79 +2116,78 @@
 					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.constructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.constructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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"
+							"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": "(:)",
+							"begin": ":",
+							"end": "(?=\\{)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.separator.initializers.cpp"
 								}
 							},
-							"end": "(?=\\{)",
+							"endCaptures": {},
 							"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))(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<3>?)+)>)\\s*)?(\\()",
+									"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))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?(\\()",
+									"end": "\\)",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -1991,16 +2200,17 @@
 												}
 											]
 										},
+										"3": {},
 										"4": {
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\))",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -2008,8 +2218,8 @@
 									]
 								},
 								{
-									"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))(\\{)",
+									"end": "\\}",
 									"beginCaptures": {
 										"1": {
 											"name": "entity.name.function.call.initializer.cpp"
@@ -2018,12 +2228,12 @@
 											"name": "punctuation.section.arguments.begin.bracket.round.function.call.initializer.cpp"
 										}
 									},
-									"end": "(\\})",
 									"endCaptures": {
-										"1": {
+										"0": {
 											"name": "punctuation.section.arguments.end.bracket.round.function.call.initializer.cpp"
 										}
 									},
+									"contentName": "meta.parameter.initialization",
 									"patterns": [
 										{
 											"include": "#evaluation_context"
@@ -2031,7 +2241,8 @@
 									]
 								},
 								{
-									"include": "#comma"
+									"match": ",",
+									"name": "punctuation.separator.delimiter.comma.cpp"
 								},
 								{
 									"include": "#comments"
@@ -2039,19 +2250,19 @@
 							]
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.constructor.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.constructor.cpp"
 								}
 							},
-							"end": "(\\))",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.constructor.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters.special.constructor",
 							"patterns": [
 								{
 									"include": "#function_parameter_context"
@@ -2067,14 +2278,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.constructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.constructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.constructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -2082,9 +2294,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.constructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -2094,7 +2308,7 @@
 			]
 		},
 		"control_flow_keywords": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:continue|default|switch|return|throw|break|catch|while|case|goto|else|try|for|do|if)(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:co_return)|(?:co_yield)|(?:co_await)|(?:continue)|(?:default)|(?:switch)|(?:return)|(?:catch)|(?:while)|(?:throw)|(?:break)|(?:case)|(?:goto)|(?:else)|(?:for)|(?:try)|(?:if)|(?:do))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -2104,42 +2318,51 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
-					"name": "keyword.control.$5.cpp"
+				"3": {
+					"name": "keyword.control.$3.cpp"
 				}
 			}
 		},
 		"cpp_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(\\[\\[)",
+			"begin": "\\[\\[",
+			"end": "\\]\\]",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\]\\])",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -2147,6 +2370,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -2157,7 +2382,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -2189,14 +2414,14 @@
 			]
 		},
 		"curly_initializer": {
-			"name": "meta.initialization.cpp",
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\{)",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\{)",
+			"end": "\\}",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -2221,7 +2446,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -2289,17 +2531,17 @@
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"13": {
+				"12": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"15": {
+				"13": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2307,10 +2549,11 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"18": {
+				"16": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2318,23 +2561,24 @@
 						}
 					]
 				},
+				"17": {},
+				"18": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
 				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"23": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2346,10 +2590,10 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"name": "entity.name.type.cpp"
 				},
-				"26": {
+				"24": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2357,20 +2601,21 @@
 						}
 					]
 				},
-				"28": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"29": {
+				"27": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"30": {
+				"28": {
 					"name": "comment.block.cpp"
 				},
-				"31": {
+				"29": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2382,16 +2627,16 @@
 						}
 					]
 				},
-				"32": {
+				"30": {
 					"name": "punctuation.section.arguments.begin.bracket.curly.initializer.cpp"
 				}
 			},
-			"end": "(\\})",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.curly.initializer.cpp"
 				}
 			},
+			"name": "meta.initialization.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2401,9 +2646,501 @@
 				}
 			]
 		},
+		"d9bc4796b0b_module_import": {
+			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((import))(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:(?>(?:\\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)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))(?:(?:\\s)+)?(;?)",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"3": {
+					"name": "keyword.control.directive.import.cpp"
+				},
+				"5": {
+					"name": "string.quoted.other.lt-gt.include.cpp"
+				},
+				"6": {
+					"name": "punctuation.definition.string.begin.cpp"
+				},
+				"7": {
+					"name": "punctuation.definition.string.end.cpp"
+				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"10": {
+					"name": "string.quoted.double.include.cpp"
+				},
+				"11": {
+					"name": "punctuation.definition.string.begin.cpp"
+				},
+				"12": {
+					"name": "punctuation.definition.string.end.cpp"
+				},
+				"13": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"14": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"15": {
+					"name": "entity.name.other.preprocessor.macro.include.cpp"
+				},
+				"16": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"17": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"19": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"20": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"21": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"22": {
+					"name": "punctuation.terminator.statement.cpp"
+				}
+			},
+			"name": "meta.preprocessor.import.cpp"
+		},
+		"d9bc4796b0b_preprocessor_number_literal": {
+			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"begin": "(?=.)",
+							"end": "$",
+							"beginCaptures": {},
+							"endCaptures": {},
+							"patterns": [
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.hexadecimal.cpp"
+										},
+										"2": {
+											"name": "constant.numeric.hexadecimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"4": {
+											"name": "constant.numeric.hexadecimal.cpp"
+										},
+										"5": {
+											"name": "constant.numeric.hexadecimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"6": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"7": {
+											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
+										},
+										"8": {
+											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
+										},
+										"9": {
+											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
+										},
+										"10": {
+											"name": "constant.numeric.exponent.hexadecimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"11": {
+											"name": "keyword.other.unit.suffix.floating-point.cpp"
+										}
+									}
+								},
+								{
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.decimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"3": {
+											"name": "constant.numeric.decimal.point.cpp"
+										},
+										"4": {
+											"name": "constant.numeric.decimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"5": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"6": {
+											"name": "keyword.other.unit.exponent.decimal.cpp"
+										},
+										"7": {
+											"name": "keyword.operator.plus.exponent.decimal.cpp"
+										},
+										"8": {
+											"name": "keyword.operator.minus.exponent.decimal.cpp"
+										},
+										"9": {
+											"name": "constant.numeric.exponent.decimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"10": {
+											"name": "keyword.other.unit.suffix.floating-point.cpp"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.binary.cpp"
+										},
+										"2": {
+											"name": "constant.numeric.binary.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"4": {
+											"name": "keyword.other.unit.suffix.integer.cpp"
+										}
+									}
+								},
+								{
+									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.octal.cpp"
+										},
+										"2": {
+											"name": "constant.numeric.octal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"4": {
+											"name": "keyword.other.unit.suffix.integer.cpp"
+										}
+									}
+								},
+								{
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "keyword.other.unit.hexadecimal.cpp"
+										},
+										"2": {
+											"name": "constant.numeric.hexadecimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"3": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"4": {
+											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
+										},
+										"5": {
+											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
+										},
+										"6": {
+											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
+										},
+										"7": {
+											"name": "constant.numeric.exponent.hexadecimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"8": {
+											"name": "keyword.other.unit.suffix.integer.cpp"
+										}
+									}
+								},
+								{
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?$",
+									"captures": {
+										"1": {
+											"name": "constant.numeric.decimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
+										"3": {
+											"name": "keyword.other.unit.exponent.decimal.cpp"
+										},
+										"4": {
+											"name": "keyword.operator.plus.exponent.decimal.cpp"
+										},
+										"5": {
+											"name": "keyword.operator.minus.exponent.decimal.cpp"
+										},
+										"6": {
+											"name": "constant.numeric.exponent.decimal.cpp",
+											"patterns": [
+												{
+													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
+													"name": "punctuation.separator.constant.numeric.cpp"
+												}
+											]
+										},
+										"7": {
+											"name": "keyword.other.unit.suffix.integer.cpp"
+										}
+									}
+								},
+								{
+									"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+									"name": "invalid.illegal.constant.numeric.cpp"
+								}
+							]
+						}
+					]
+				}
+			}
+		},
 		"decltype": {
-			"contentName": "meta.arguments.decltype.cpp",
-			"begin": "((?<!\\w)decltype(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2437,12 +3174,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
 				}
 			},
+			"contentName": "meta.arguments.decltype",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2450,8 +3187,8 @@
 			]
 		},
 		"decltype_specifier": {
-			"contentName": "meta.arguments.decltype.cpp",
-			"begin": "((?<!\\w)decltype(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
@@ -2485,12 +3222,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp"
 				}
 			},
+			"contentName": "meta.arguments.decltype",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2498,8 +3235,8 @@
 			]
 		},
 		"default_statement": {
-			"name": "meta.conditional.case.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)default(?!\\w))",
+			"end": ":",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -2530,12 +3267,12 @@
 					"name": "keyword.control.default.cpp"
 				}
 			},
-			"end": "(:)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.separator.colon.case.default.cpp"
 				}
 			},
+			"name": "meta.conditional.case.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -2546,51 +3283,51 @@
 			]
 		},
 		"destructor_inline": {
-			"name": "meta.function.definition.special.member.destructor.cpp",
-			"begin": "(^((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:(?:constexpr|explicit|mutable|virtual|inline|friend)((?>(?:(?:(?>(?<!\\s)\\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)(?=\\()))",
+			"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)))((?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))((?:(?:(?:(?>(?:\\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)(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.member.destructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "comment.block.cpp"
 				},
+				"4": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"5": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"6": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"7": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"8": {
 					"name": "comment.block.cpp"
 				},
-				"9": {
+				"8": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2602,23 +3339,23 @@
 						}
 					]
 				},
-				"10": {
+				"9": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"12": {
+				"11": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"13": {
+				"12": {
 					"name": "comment.block.cpp"
 				},
-				"14": {
+				"13": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2630,27 +3367,27 @@
 						}
 					]
 				},
-				"15": {
+				"14": {
 					"patterns": [
 						{
 							"include": "#functional_specifiers_pre_parameters"
 						}
 					]
 				},
-				"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": "\\*\\/",
@@ -2662,82 +3399,81 @@
 						}
 					]
 				},
-				"20": {
+				"19": {
 					"name": "entity.name.function.destructor.cpp entity.name.function.definition.special.member.destructor.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.member.destructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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"
+							"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": "(\\()",
+							"begin": "\\(",
+							"end": "\\)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
 								}
 							},
-							"end": "(\\))",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
 								}
-							}
+							},
+							"contentName": "meta.function.definition.parameters.special.member.destructor",
+							"patterns": []
 						},
 						{
 							"include": "$self"
@@ -2745,14 +3481,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -2760,9 +3497,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.member.destructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -2772,26 +3511,26 @@
 			]
 		},
 		"destructor_root": {
-			"name": "meta.function.definition.special.member.destructor.cpp",
-			"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<14>?)+)>)\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))::((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))~\\16((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\()))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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)))~\\14((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\())",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.member.destructor.cpp"
 				},
-				"2": {
+				"1": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
+				"2": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"3": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"4": {
 					"name": "comment.block.cpp"
 				},
-				"5": {
+				"4": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2803,23 +3542,23 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"7": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2831,7 +3570,7 @@
 						}
 					]
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"match": "::",
@@ -2846,7 +3585,7 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -2854,7 +3593,8 @@
 						}
 					]
 				},
-				"15": {
+				"12": {},
+				"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}))*(?=:)",
@@ -2870,45 +3610,46 @@
 						}
 					]
 				},
-				"17": {
+				"14": {},
+				"15": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
+				"16": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"17": {
+					"name": "comment.block.cpp"
+				},
 				"18": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
 				},
 				"19": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"20": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"21": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
 					"name": "comment.block.cpp"
 				},
-				"24": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2920,20 +3661,20 @@
 						}
 					]
 				},
-				"25": {
+				"23": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"26": {
+				"24": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"27": {
+				"25": {
 					"name": "comment.block.cpp"
 				},
-				"28": {
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -2946,78 +3687,77 @@
 					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.member.destructor.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"patterns": [
-								{
-									"match": "(\\=)((?>(?:(?:(?>(?<!\\s)\\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"
+							"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": "(\\()",
+							"begin": "\\(",
+							"end": "\\)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.member.destructor.cpp"
 								}
 							},
-							"end": "(\\))",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.member.destructor.cpp"
 								}
-							}
+							},
+							"contentName": "meta.function.definition.parameters.special.member.destructor",
+							"patterns": []
 						},
 						{
 							"include": "$self"
@@ -3025,14 +3765,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.member.destructor.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.member.destructor.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -3040,9 +3781,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.member.destructor.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3052,8 +3795,8 @@
 			]
 		},
 		"diagnostic": {
-			"name": "meta.preprocessor.diagnostic.$reference(directive).cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*((?:error|warning)))\\b\\s*",
+			"begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:error|warning)))\\b(?:(?:\\s)+)?",
+			"end": "(?<!\\\\)(?=\\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.diagnostic.$7.cpp"
@@ -3085,44 +3828,46 @@
 				},
 				"6": {
 					"name": "punctuation.definition.directive.cpp"
-				}
+				},
+				"7": {}
 			},
-			"end": "(?<!\\\\)(?=\\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.diagnostic.$reference(directive).cpp",
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"begin": "(\")",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.begin.cpp"
-						}
-					},
+					"begin": "\"",
 					"end": "(?:(\")|(?<!\\\\)(?=\\n))",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.definition.string.end.cpp"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#line_continuation_character"
-						}
-					]
-				},
-				{
-					"name": "string.quoted.single.cpp",
-					"begin": "(')",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
 						}
 					},
-					"end": "(?:(')|(?<!\\\\)(?=\\n))",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
+					"name": "string.quoted.double.cpp",
+					"patterns": [
+						{
+							"include": "#line_continuation_character"
+						}
+					]
+				},
+				{
+					"begin": "'",
+					"end": "(?:(')|(?<!\\\\)(?=\\n))",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						}
+					},
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.single.cpp",
 					"patterns": [
 						{
 							"include": "#line_continuation_character"
@@ -3130,9 +3875,11 @@
 					]
 				},
 				{
-					"name": "string.unquoted.cpp",
 					"begin": "[^'\"]",
 					"end": "(?<!\\\\)(?=\\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
+					"name": "string.unquoted.cpp",
 					"patterns": [
 						{
 							"include": "#line_continuation_character"
@@ -3145,7 +3892,7 @@
 			]
 		},
 		"emacs_file_banner": {
-			"match": "(?:(^\\s*((\\/\\/)\\s*((?>[#;\\/=*C~]+)(?![#;\\/=*C~]))\\s*.+\\s*\\8\\s*(?:\\n|$)))|(^\\s*((\\/\\*)\\s*?((?>[#;\\/=*C~]+)(?![#;\\/=*C~]))\\s*.+\\s*\\8\\s*\\*\\/)))",
+			"match": "(?:(^(?:(?:\\s)+)?((\\/\\/)(?:(?:\\s)+)?((?:[#;\\/=*C~]+)++(?![#;\\/=*C~]))(?:(?:\\s)+)?.+(?:(?:\\s)+)?\\4(?:(?:\\s)+)?(?:\\n|$)))|(^(?:(?:\\s)+)?((\\/\\*)(?:(?:\\s)+)?((?:[#;\\/=*C~]+)++(?![#;\\/=*C~]))(?:(?:\\s)+)?.+(?:(?:\\s)+)?\\8(?:(?:\\s)+)?\\*\\/)))",
 			"captures": {
 				"1": {
 					"name": "meta.toc-list.banner.double-slash.cpp"
@@ -3174,23 +3921,23 @@
 			}
 		},
 		"empty_square_brackets": {
-			"name": "storage.modifier.array.bracket.square.cpp",
-			"match": "(?-mix:(?-mix:(?<!delete))\\\\[\\\\s*\\\\])"
+			"name": "storage.modifier.array.bracket.square",
+			"match": "(?<!delete)\\[(?:(?:\\s)+)?\\]"
 		},
 		"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*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<15>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<15>?)+)>)\\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)))?)",
+			"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)+)?(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<12>?)+>)(?:(?:\\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)))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.enum.cpp"
 				},
-				"2": {
+				"1": {
 					"name": "storage.type.enum.cpp"
 				},
-				"3": {
-					"name": "storage.type.enum.enum-key.$3.cpp"
+				"2": {
+					"name": "storage.type.enum.enum-key.$2.cpp"
 				},
-				"4": {
+				"3": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -3200,22 +3947,34 @@
 						}
 					]
 				},
-				"5": {
+				"4": {
 					"name": "entity.name.type.enum.cpp"
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.separator.colon.type-specifier.cpp"
 				},
-				"8": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"9": {
+				"7": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
+				"8": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"9": {},
+				"10": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
 				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
@@ -3224,25 +3983,14 @@
 						}
 					]
 				},
+				"12": {},
 				"13": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"14": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"16": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"17": {
-					"name": "storage.type.integral.$17.cpp"
+				"14": {
+					"name": "storage.type.integral.$14.cpp"
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -3251,16 +3999,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.enum.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.enum.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.enum.cpp"
 						}
 					},
+					"name": "meta.head.enum.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3268,14 +4018,15 @@
 					]
 				},
 				{
-					"name": "meta.body.enum.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.enum.cpp"
 						}
 					},
+					"name": "meta.body.enum.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -3295,9 +4046,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.enum.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3307,7 +4060,7 @@
 			]
 		},
 		"enum_declare": {
-			"match": "((?<!\\w)enum(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
+			"match": "((?<!\\w)enum(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
@@ -3320,34 +4073,43 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.enum.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -3383,6 +4145,40 @@
 						}
 					]
 				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"8": {
 					"patterns": [
 						{
@@ -3391,105 +4187,107 @@
 					]
 				},
 				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"10": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.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": {
-					"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": "variable.other.object.declare.cpp"
 				},
-				"21": {
+				"13": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
-					"name": "comment.block.cpp"
-				},
-				"24": {
+				"14": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"enumerator_list": {
-			"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))\\s*((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?\\s*(?:(\\=)\\s*(.+?)\\s*)?(?:(?:((?:[,;](?!')|\\n))|(?=\\}[^']))|(?=(?:\\/\\/|\\/\\*)))",
+			"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))(?:(?:\\s)+)?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?(?:(?:\\s)+)?(?:(\\=)(?:(?:\\s)+)?(.+?)(?:(?:\\s)+)?)?(?:(?:((?:[,;](?!')|\\n))|(?=\\}[^']))|(?=(?:\\/\\/|\\/\\*)))",
 			"captures": {
 				"1": {
 					"name": "variable.other.enummember.cpp"
@@ -3604,9 +4402,6 @@
 				{
 					"include": "#square_brackets"
 				},
-				{
-					"include": "#empty_square_brackets"
-				},
 				{
 					"include": "#semicolon"
 				},
@@ -3626,9 +4421,6 @@
 				{
 					"include": "#include"
 				},
-				{
-					"include": "#module_import"
-				},
 				{
 					"include": "#line"
 				},
@@ -3662,7 +4454,7 @@
 			]
 		},
 		"exception_keywords": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:throw|catch|try)(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:throw)|(?:catch)|(?:try))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -3672,49 +4464,58 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
-					"name": "keyword.control.exception.$5.cpp"
+				"3": {
+					"name": "keyword.control.exception.$3.cpp"
 				}
 			}
 		},
 		"extern_block": {
-			"name": "meta.block.extern.cpp",
-			"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(extern)(?=\\s*\\\"))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(extern)(?=\\s*\\\")",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.extern.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -3726,11 +4527,10 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "storage.type.extern.cpp"
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -3739,16 +4539,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.extern.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.extern.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.extern.cpp"
 						}
 					},
+					"name": "meta.head.extern.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3756,14 +4558,15 @@
 					]
 				},
 				{
-					"name": "meta.body.extern.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.extern.cpp"
 						}
 					},
+					"name": "meta.body.extern.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3771,9 +4574,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.extern.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -3812,7 +4617,7 @@
 					"include": "#typedef_union"
 				},
 				{
-					"include": "#typedef_keyword"
+					"include": "#misc_keywords"
 				},
 				{
 					"include": "#standard_declares"
@@ -3859,7 +4664,8 @@
 			]
 		},
 		"function_call": {
-			"begin": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<12>?)+)>)\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least16_t|^int_least16_t|\\Watomic_commit|^atomic_commit|\\Watomic_cancel|^atomic_cancel|\\Wuint_fast64_t|^uint_fast64_t|\\Wuint_least8_t|^uint_least8_t|\\Wint_least64_t|^int_least64_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_fast64_t|^int_fast64_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast16_t|^int_fast16_t|\\Wsynchronized|^synchronized|\\Wint_least8_t|^int_least8_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wco_return|^co_return|\\Wuint16_t|^uint16_t|\\Wdecltype|^decltype|\\Wu_quad_t|^u_quad_t|\\Wreflexpr|^reflexpr|\\Wregister|^register|\\Wco_await|^co_await|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wuint64_t|^uint64_t|\\Wrestrict|^restrict|\\Wtypename|^typename|\\Wexplicit|^explicit|\\Wuint32_t|^uint32_t|\\Wunsigned|^unsigned|\\Woperator|^operator|\\Wvolatile|^volatile|\\Wblkcnt_t|^blkcnt_t|\\Wcontinue|^continue|\\Wtemplate|^template|\\Wmutable|^mutable|\\Walignas|^alignas|\\Walignof|^alignof|\\Wnullptr|^nullptr|\\Wconcept|^concept|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wtypedef|^typedef|\\Wfixpt_t|^fixpt_t|\\W__asm__|^__asm__|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wmutable|^mutable|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wclock_t|^clock_t|\\Wu_short|^u_short|\\Wssize_t|^ssize_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wstruct|^struct|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wexport|^export|\\Wnot_eq|^not_eq|\\Wdelete|^delete|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wtime_t|^time_t|\\Wint8_t|^int8_t|\\Wtypeid|^typeid|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wbitand|^bitand|\\Wsizeof|^sizeof|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wimport|^import|\\Wmodule|^module|\\Wpublic|^public|\\Wswitch|^switch|\\Wreturn|^return|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wwhile|^while|\\Wcatch|^catch|\\Wcompl|^compl|\\Wbreak|^break|\\Wuid_t|^uid_t|\\Wconst|^const|\\Woff_t|^off_t|\\Wpid_t|^pid_t|\\Wkey_t|^key_t|\\Wino_t|^ino_t|\\Wshort|^short|\\Wgid_t|^gid_t|\\Wusing|^using|\\Wdev_t|^dev_t|\\Wdiv_t|^div_t|\\Wu_int|^u_int|\\Wfloat|^float|\\Wbitor|^bitor|\\Wfalse|^false|\\Wthrow|^throw|\\Welse|^else|\\Wtrue|^true|\\Wauto|^auto|\\Wvoid|^void|\\Wuint|^uint|\\Wid_t|^id_t|\\Wbool|^bool|\\WNULL|^NULL|\\Wlong|^long|\\Wid_t|^id_t|\\Wcase|^case|\\Wgoto|^goto|\\Wthis|^this|\\Wchar|^char|\\Wenum|^enum|\\Wxor|^xor|\\Wint|^int|\\Wasm|^asm|\\Wnew|^new|\\Wtry|^try|\\Wand|^and|\\Wfor|^for|\\Wnot|^not|\\Wdo|^do|\\Wor|^or|\\Wif|^if)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<12>?)+)>)\\s*)?(\\()",
+			"begin": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:(?:\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least64_t|^uint_least64_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Watomic_commit|^atomic_commit|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Watomic_cancel|^atomic_cancel|\\Wuint_least8_t|^uint_least8_t|\\Wint_least16_t|^int_least16_t|\\Wsynchronized|^synchronized|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_least8_t|^int_least8_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wuseconds_t|^useconds_t|\\Wconst_cast|^const_cast|\\Win_port_t|^in_port_t|\\Wco_return|^co_return|\\Wuintptr_t|^uintptr_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wnamespace|^namespace|\\Wuintmax_t|^uintmax_t|\\Wprotected|^protected|\\Wconstexpr|^constexpr|\\Wuintmax_t|^uintmax_t|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Wconstexpr|^constexpr|\\Wregister|^register|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wtypename|^typename|\\Wdecltype|^decltype|\\Woperator|^operator|\\Wco_await|^co_await|\\Wtemplate|^template|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wreflexpr|^reflexpr|\\Wexplicit|^explicit|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wrestrict|^restrict|\\Wuint32_t|^uint32_t|\\Wvolatile|^volatile|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wuint16_t|^uint16_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wmutable|^mutable|\\Wconcept|^concept|\\Wuint8_t|^uint8_t|\\Walignas|^alignas|\\Wnlink_t|^nlink_t|\\Wnullptr|^nullptr|\\Wprivate|^private|\\Wdefault|^default|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wclock_t|^clock_t|\\Wint64_t|^int64_t|\\Wssize_t|^ssize_t|\\Walignof|^alignof|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wmutable|^mutable|\\Wvirtual|^virtual|\\Wfixpt_t|^fixpt_t|\\Wtypedef|^typedef|\\W__asm__|^__asm__|\\Wtime_t|^time_t|\\Wsizeof|^sizeof|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wtypeid|^typeid|\\Wswitch|^switch|\\Wreturn|^return|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wint8_t|^int8_t|\\Wstruct|^struct|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wpublic|^public|\\Wexport|^export|\\Wimport|^import|\\Wmodule|^module|\\Wkey_t|^key_t|\\Wuid_t|^uid_t|\\Wgid_t|^gid_t|\\Wfalse|^false|\\Wbreak|^break|\\Wusing|^using|\\Wcatch|^catch|\\Wor_eq|^or_eq|\\Wbitor|^bitor|\\Wdev_t|^dev_t|\\Wwhile|^while|\\Wcompl|^compl|\\Wdiv_t|^div_t|\\Wpid_t|^pid_t|\\Wunion|^union|\\Wu_int|^u_int|\\Wthrow|^throw|\\Wconst|^const|\\Wfloat|^float|\\Wconst|^const|\\Woff_t|^off_t|\\Wshort|^short|\\Wclass|^class|\\Wino_t|^ino_t|\\Wid_t|^id_t|\\Wenum|^enum|\\Wuint|^uint|\\Wbool|^bool|\\Wlong|^long|\\Wchar|^char|\\Wvoid|^void|\\Wauto|^auto|\\Wthis|^this|\\Wcase|^case|\\Wgoto|^goto|\\Welse|^else|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wasm|^asm|\\Wtry|^try|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wfor|^for|\\Wnew|^new|\\Wint|^int|\\Wor|^or|\\Wdo|^do|\\Wif|^if)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<11>?)+>)(?:(?:\\s)+)?)?(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -3871,7 +4677,7 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
 				},
-				"4": {
+				"3": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -3879,23 +4685,24 @@
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.function.call.cpp"
 				},
-				"7": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
-				"10": {
+				"9": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -3907,7 +4714,7 @@
 						}
 					]
 				},
-				"11": {
+				"10": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -3915,13 +4722,13 @@
 						}
 					]
 				},
-				"13": {
+				"11": {},
+				"12": {
 					"name": "punctuation.section.arguments.begin.bracket.round.function.call.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.function.call.cpp"
 				}
 			},
@@ -3932,26 +4739,26 @@
 			]
 		},
 		"function_definition": {
-			"name": "meta.function.definition.cpp",
-			"begin": "((?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:((?<!\\w)template(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:((?<!\\w)(?:(?:constexpr|explicit|mutable|virtual|inline|friend)|(?:volatile|register|restrict|static|extern|const))(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<70>?)+)>)\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Wuint_least64_t|^uint_least64_t|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least16_t|^int_least16_t|\\Watomic_commit|^atomic_commit|\\Watomic_cancel|^atomic_cancel|\\Wuint_fast64_t|^uint_fast64_t|\\Wuint_least8_t|^uint_least8_t|\\Wint_least64_t|^int_least64_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_fast64_t|^int_fast64_t|\\Wint_fast32_t|^int_fast32_t|\\Wint_fast16_t|^int_fast16_t|\\Wsynchronized|^synchronized|\\Wint_least8_t|^int_least8_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wconst_cast|^const_cast|\\Wuseconds_t|^useconds_t|\\Wnamespace|^namespace|\\Wblksize_t|^blksize_t|\\Win_addr_t|^in_addr_t|\\Win_port_t|^in_port_t|\\Wuintptr_t|^uintptr_t|\\Wuintmax_t|^uintmax_t|\\Wuintmax_t|^uintmax_t|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wprotected|^protected|\\Wco_return|^co_return|\\Wuint16_t|^uint16_t|\\Wdecltype|^decltype|\\Wu_quad_t|^u_quad_t|\\Wreflexpr|^reflexpr|\\Wregister|^register|\\Wco_await|^co_await|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wuint64_t|^uint64_t|\\Wrestrict|^restrict|\\Wtypename|^typename|\\Wexplicit|^explicit|\\Wuint32_t|^uint32_t|\\Wunsigned|^unsigned|\\Woperator|^operator|\\Wvolatile|^volatile|\\Wblkcnt_t|^blkcnt_t|\\Wcontinue|^continue|\\Wtemplate|^template|\\Wmutable|^mutable|\\Walignas|^alignas|\\Walignof|^alignof|\\Wnullptr|^nullptr|\\Wconcept|^concept|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wtypedef|^typedef|\\Wfixpt_t|^fixpt_t|\\W__asm__|^__asm__|\\Wwchar_t|^wchar_t|\\Wprivate|^private|\\Wdefault|^default|\\Wnlink_t|^nlink_t|\\Wmutable|^mutable|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wvirtual|^virtual|\\Wclock_t|^clock_t|\\Wu_short|^u_short|\\Wssize_t|^ssize_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wint64_t|^int64_t|\\Wuint8_t|^uint8_t|\\Wstruct|^struct|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wexport|^export|\\Wnot_eq|^not_eq|\\Wdelete|^delete|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wtime_t|^time_t|\\Wint8_t|^int8_t|\\Wtypeid|^typeid|\\Wxor_eq|^xor_eq|\\Wand_eq|^and_eq|\\Wbitand|^bitand|\\Wsizeof|^sizeof|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wimport|^import|\\Wmodule|^module|\\Wpublic|^public|\\Wswitch|^switch|\\Wreturn|^return|\\Wclass|^class|\\Wunion|^union|\\Wconst|^const|\\Wor_eq|^or_eq|\\Wwhile|^while|\\Wcatch|^catch|\\Wcompl|^compl|\\Wbreak|^break|\\Wuid_t|^uid_t|\\Wconst|^const|\\Woff_t|^off_t|\\Wpid_t|^pid_t|\\Wkey_t|^key_t|\\Wino_t|^ino_t|\\Wshort|^short|\\Wgid_t|^gid_t|\\Wusing|^using|\\Wdev_t|^dev_t|\\Wdiv_t|^div_t|\\Wu_int|^u_int|\\Wfloat|^float|\\Wbitor|^bitor|\\Wfalse|^false|\\Wthrow|^throw|\\Welse|^else|\\Wtrue|^true|\\Wauto|^auto|\\Wvoid|^void|\\Wuint|^uint|\\Wid_t|^id_t|\\Wbool|^bool|\\WNULL|^NULL|\\Wlong|^long|\\Wid_t|^id_t|\\Wcase|^case|\\Wgoto|^goto|\\Wthis|^this|\\Wchar|^char|\\Wenum|^enum|\\Wxor|^xor|\\Wint|^int|\\Wasm|^asm|\\Wnew|^new|\\Wtry|^try|\\Wand|^and|\\Wfor|^for|\\Wnot|^not|\\Wdo|^do|\\Wor|^or|\\Wif|^if)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\())",
+			"begin": "(?:(?:^|\\G|(?<=;|\\}))|(?<=>))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:((?<!\\w)template(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:((?<!\\w)(?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\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)))((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<66>?)+>)(?:(?:\\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(?<!\\Wreinterpret_cast|^reinterpret_cast|\\Watomic_noexcept|^atomic_noexcept|\\Wuint_least64_t|^uint_least64_t|\\Wuint_least16_t|^uint_least16_t|\\Wuint_least32_t|^uint_least32_t|\\Watomic_commit|^atomic_commit|\\Wuint_fast16_t|^uint_fast16_t|\\Wint_least32_t|^int_least32_t|\\Wuint_fast32_t|^uint_fast32_t|\\Wint_least64_t|^int_least64_t|\\Wuint_fast64_t|^uint_fast64_t|\\Watomic_cancel|^atomic_cancel|\\Wuint_least8_t|^uint_least8_t|\\Wint_least16_t|^int_least16_t|\\Wsynchronized|^synchronized|\\Wint_fast64_t|^int_fast64_t|\\Wuint_fast8_t|^uint_fast8_t|\\Wint_least8_t|^int_least8_t|\\Wdynamic_cast|^dynamic_cast|\\Wthread_local|^thread_local|\\Wint_fast16_t|^int_fast16_t|\\Wint_fast32_t|^int_fast32_t|\\Wsuseconds_t|^suseconds_t|\\Wint_fast8_t|^int_fast8_t|\\Wstatic_cast|^static_cast|\\Wuseconds_t|^useconds_t|\\Wconst_cast|^const_cast|\\Win_port_t|^in_port_t|\\Wco_return|^co_return|\\Wuintptr_t|^uintptr_t|\\Wconstexpr|^constexpr|\\Wconsteval|^consteval|\\Wnamespace|^namespace|\\Wuintmax_t|^uintmax_t|\\Wprotected|^protected|\\Wconstexpr|^constexpr|\\Wuintmax_t|^uintmax_t|\\Wblksize_t|^blksize_t|\\Wco_return|^co_return|\\Win_addr_t|^in_addr_t|\\Wconstexpr|^constexpr|\\Wregister|^register|\\Wuint64_t|^uint64_t|\\Wintptr_t|^intptr_t|\\Wnoexcept|^noexcept|\\Wrequires|^requires|\\Wtypename|^typename|\\Wdecltype|^decltype|\\Woperator|^operator|\\Wco_await|^co_await|\\Wtemplate|^template|\\Wcontinue|^continue|\\Wco_await|^co_await|\\Wco_yield|^co_yield|\\Wunsigned|^unsigned|\\Wnoexcept|^noexcept|\\Wvolatile|^volatile|\\Wreflexpr|^reflexpr|\\Wexplicit|^explicit|\\Wu_quad_t|^u_quad_t|\\Wblkcnt_t|^blkcnt_t|\\Wrestrict|^restrict|\\Wuint32_t|^uint32_t|\\Wvolatile|^volatile|\\Wintmax_t|^intmax_t|\\Wintmax_t|^intmax_t|\\Wco_yield|^co_yield|\\Wnoexcept|^noexcept|\\Wuint16_t|^uint16_t|\\Wu_short|^u_short|\\Wwchar_t|^wchar_t|\\Wmutable|^mutable|\\Wconcept|^concept|\\Wuint8_t|^uint8_t|\\Walignas|^alignas|\\Wnlink_t|^nlink_t|\\Wnullptr|^nullptr|\\Wprivate|^private|\\Wdefault|^default|\\Wsegsz_t|^segsz_t|\\Wswblk_t|^swblk_t|\\Wint16_t|^int16_t|\\Wint32_t|^int32_t|\\Wclock_t|^clock_t|\\Wint64_t|^int64_t|\\Wssize_t|^ssize_t|\\Walignof|^alignof|\\Wqaddr_t|^qaddr_t|\\Wcaddr_t|^caddr_t|\\Wdaddr_t|^daddr_t|\\Wmutable|^mutable|\\Wvirtual|^virtual|\\Wfixpt_t|^fixpt_t|\\Wtypedef|^typedef|\\W__asm__|^__asm__|\\Wtime_t|^time_t|\\Wsizeof|^sizeof|\\Wdelete|^delete|\\Wnot_eq|^not_eq|\\Wbitand|^bitand|\\Wand_eq|^and_eq|\\Wxor_eq|^xor_eq|\\Wtypeid|^typeid|\\Wswitch|^switch|\\Wreturn|^return|\\Wsigned|^signed|\\Wdouble|^double|\\Wu_char|^u_char|\\Wu_long|^u_long|\\Wushort|^ushort|\\Wquad_t|^quad_t|\\Wmode_t|^mode_t|\\Wsize_t|^size_t|\\Wint8_t|^int8_t|\\Wstruct|^struct|\\Wstatic|^static|\\Wextern|^extern|\\Winline|^inline|\\Wfriend|^friend|\\Wpublic|^public|\\Wexport|^export|\\Wimport|^import|\\Wmodule|^module|\\Wkey_t|^key_t|\\Wuid_t|^uid_t|\\Wgid_t|^gid_t|\\Wfalse|^false|\\Wbreak|^break|\\Wusing|^using|\\Wcatch|^catch|\\Wor_eq|^or_eq|\\Wbitor|^bitor|\\Wdev_t|^dev_t|\\Wwhile|^while|\\Wcompl|^compl|\\Wdiv_t|^div_t|\\Wpid_t|^pid_t|\\Wunion|^union|\\Wu_int|^u_int|\\Wthrow|^throw|\\Wconst|^const|\\Wfloat|^float|\\Wconst|^const|\\Woff_t|^off_t|\\Wshort|^short|\\Wclass|^class|\\Wino_t|^ino_t|\\Wid_t|^id_t|\\Wenum|^enum|\\Wuint|^uint|\\Wbool|^bool|\\Wlong|^long|\\Wchar|^char|\\Wvoid|^void|\\Wauto|^auto|\\Wthis|^this|\\Wcase|^case|\\Wgoto|^goto|\\Welse|^else|\\Wid_t|^id_t|\\WNULL|^NULL|\\Wtrue|^true|\\Wasm|^asm|\\Wtry|^try|\\Wnot|^not|\\Wxor|^xor|\\Wand|^and|\\Wfor|^for|\\Wnew|^new|\\Wint|^int|\\Wor|^or|\\Wdo|^do|\\Wif|^if)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\()",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -3963,38 +4770,38 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "storage.type.template.cpp"
 				},
-				"7": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
+				"7": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"9": {
+				"8": {
 					"name": "comment.block.cpp"
 				},
+				"9": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"10": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"11": {
-					"patterns": [
-						{
-							"match": "((?<!\\w)(?:(?:constexpr|explicit|mutable|virtual|inline|friend)|(?:volatile|register|restrict|static|extern|const))(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))",
+							"match": "((?<!\\w)(?:(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))|(?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))",
 							"captures": {
 								"1": {
 									"name": "storage.modifier.$1.cpp"
@@ -4028,23 +4835,23 @@
 						}
 					]
 				},
-				"12": {
-					"name": "storage.modifier.$1.cpp"
+				"11": {
+					"name": "storage.modifier.$11.cpp"
 				},
-				"13": {
+				"12": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"14": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"15": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"16": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4056,11 +4863,11 @@
 						}
 					]
 				},
-				"17": {
+				"16": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -4085,7 +4892,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -4093,7 +4917,7 @@
 						}
 					]
 				},
-				"18": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -4103,45 +4927,45 @@
 						}
 					]
 				},
-				"19": {
+				"18": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"19": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"20": {
 					"name": "comment.block.cpp"
 				},
+				"21": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"22": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"23": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"24": {
+				"23": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"25": {
+				"24": {
 					"name": "comment.block.cpp"
 				},
-				"26": {
+				"25": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4153,16 +4977,28 @@
 						}
 					]
 				},
-				"28": {
+				"26": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"29": {
+				"27": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
+				"28": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"29": {},
+				"30": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
 				"31": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
@@ -4171,34 +5007,24 @@
 						}
 					]
 				},
+				"32": {},
 				"33": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"34": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"36": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"37": {
+				"34": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"38": {
+				"35": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"39": {
+				"36": {
 					"name": "comment.block.cpp"
 				},
-				"40": {
+				"37": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4210,10 +5036,10 @@
 						}
 					]
 				},
-				"41": {
+				"38": {
 					"name": "entity.name.type.cpp"
 				},
-				"42": {
+				"39": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4221,14 +5047,15 @@
 						}
 					]
 				},
-				"44": {
+				"40": {},
+				"41": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -4264,123 +5091,123 @@
 						}
 					]
 				},
-				"45": {
+				"42": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
+				"43": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"44": {
+					"name": "comment.block.cpp"
+				},
+				"45": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"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"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"47": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"48": {
+					"name": "comment.block.cpp"
+				},
 				"49": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"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"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"51": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"52": {
+					"name": "comment.block.cpp"
+				},
 				"53": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"54": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"55": {
-					"name": "comment.block.cpp"
-				},
-				"56": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"55": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"56": {
+					"name": "comment.block.cpp"
+				},
 				"57": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"58": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"59": {
-					"name": "comment.block.cpp"
-				},
-				"60": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"61": {
 					"name": "storage.type.modifier.calling-convention.cpp"
 				},
-				"62": {
+				"59": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"63": {
+				"60": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"64": {
+				"61": {
 					"name": "comment.block.cpp"
 				},
-				"65": {
+				"62": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4392,17 +5219,17 @@
 						}
 					]
 				},
-				"66": {
+				"63": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_function_definition_inner_generated"
 						}
 					]
 				},
-				"67": {
+				"64": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				},
-				"69": {
+				"65": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -4410,23 +5237,24 @@
 						}
 					]
 				},
-				"71": {
+				"66": {},
+				"67": {
 					"name": "entity.name.function.definition.cpp"
 				},
-				"72": {
+				"68": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"73": {
+				"69": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"74": {
+				"70": {
 					"name": "comment.block.cpp"
 				},
-				"75": {
+				"71": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -4439,35 +5267,37 @@
 					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.function.definition.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
 						},
 						{
-							"contentName": "meta.function.definition.parameters.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.cpp"
 								}
 							},
-							"end": "(\\))",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -4489,14 +5319,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -4504,9 +5335,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -4529,13 +5362,14 @@
 			]
 		},
 		"function_pointer": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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*(\\()",
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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)+)?(\\()",
+			"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -4560,7 +5394,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -4628,803 +5479,54 @@
 						}
 					]
 				},
-				"12": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"13": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"15": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"17": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"18": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-				},
-				"26": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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": {
-					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
-				},
-				"42": {
-					"name": "punctuation.definition.function.pointer.dereference.cpp"
-				},
-				"43": {
-					"name": "variable.other.definition.pointer.function.cpp"
-				},
-				"44": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
-				},
-				"45": {
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
-				},
-				"46": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
-				},
-				"47": {
-					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
-				},
-				"48": {
-					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
-				}
-			},
-			"end": "(\\))((?>(?:(?:(?>(?<!\\s)\\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"
-				}
-			]
-		},
-		"function_pointer_parameter": {
-			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": [
-						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
-							"name": "storage.type.$0.cpp"
-						},
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#function_type"
-						},
-						{
-							"include": "#storage_types"
-						},
-						{
-							"include": "#number_literal"
-						},
-						{
-							"include": "#string_context"
-						},
-						{
-							"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": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"3": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"4": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"5": {
-					"name": "comment.block.cpp"
-				},
-				"6": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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"
-						}
-					]
-				},
-				"12": {
-					"patterns": [
-						{
-							"include": "#scope_resolution_inner_generated"
-						}
-					]
-				},
-				"13": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"15": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"17": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"18": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-				},
-				"26": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*",
-							"name": "storage.modifier.pointer.cpp"
-						},
-						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\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"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.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": {
-					"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
-				},
-				"42": {
-					"name": "punctuation.definition.function.pointer.dereference.cpp"
-				},
-				"43": {
-					"name": "variable.parameter.pointer.function.cpp"
-				},
-				"44": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
-				},
-				"45": {
-					"patterns": [
-						{
-							"include": "#evaluation_context"
-						}
-					]
-				},
-				"46": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
-				},
-				"47": {
-					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
-				},
-				"48": {
-					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
-				}
-			},
-			"end": "(\\))((?>(?:(?:(?>(?<!\\s)\\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"
-				}
-			]
-		},
-		"functional_specifiers_pre_parameters": {
-			"match": "(?<!\\w)(?:constexpr|explicit|mutable|virtual|inline|friend)(?!\\w)",
-			"name": "storage.modifier.specifier.functional.pre-parameters.$0.cpp"
-		},
-		"gcc_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(__attribute(?:__)?\\(\\()",
-			"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": "#attributes_context"
-						},
-						{
-							"include": "#string_context"
-						}
-					]
-				},
-				{
-					"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"
-				}
-			]
-		},
-		"goto_statement": {
-			"match": "((?<!\\w)goto(?!\\w))((?>(?:(?:(?>(?<!\\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}))*)",
-			"captures": {
-				"1": {
-					"name": "keyword.control.goto.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": "entity.name.label.call.cpp"
-				}
-			}
-		},
-		"include": {
-			"match": "(?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((#)\\s*((?:include|include_next))\\b)\\s*(?:(?:(?:((<)[^>]*(>?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/))))|(((?>(?:(?:(?>(?<!\\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}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))",
-			"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": "keyword.control.directive.$7.cpp"
-				},
-				"6": {
-					"name": "punctuation.definition.directive.cpp"
-				},
-				"8": {
-					"name": "string.quoted.other.lt-gt.include.cpp"
-				},
-				"9": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"10": {
-					"name": "punctuation.definition.string.end.cpp"
-				},
 				"11": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
 				"12": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
 				"13": {
-					"name": "comment.block.cpp"
-				},
-				"14": {
+					"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"
 						}
 					]
 				},
+				"14": {},
 				"15": {
-					"name": "string.quoted.double.include.cpp"
+					"name": "entity.name.scope-resolution.cpp"
 				},
 				"16": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"17": {
-					"name": "punctuation.definition.string.end.cpp"
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
 				},
+				"17": {},
 				"18": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"19": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"19": {
+				"20": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"20": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"21": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -5436,31 +5538,58 @@
 						}
 					]
 				},
-				"22": {
-					"name": "entity.name.other.preprocessor.macro.include.cpp"
-				},
 				"23": {
+					"name": "entity.name.type.cpp"
+				},
+				"24": {
+					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"include": "#template_call_range"
 						}
 					]
 				},
-				"24": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"25": {
-					"name": "comment.block.cpp"
-				},
+				"25": {},
 				"26": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+							"match": "\\*",
+							"name": "storage.modifier.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": "storage.modifier.reference.cpp"
 						}
 					]
 				},
@@ -5513,6 +5642,818 @@
 							"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": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
+				},
+				"40": {
+					"name": "punctuation.definition.function.pointer.dereference.cpp"
+				},
+				"41": {
+					"name": "variable.other.definition.pointer.function.cpp"
+				},
+				"42": {
+					"name": "punctuation.definition.begin.bracket.square.cpp"
+				},
+				"43": {
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
+				},
+				"44": {
+					"name": "punctuation.definition.end.bracket.square.cpp"
+				},
+				"45": {
+					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
+				},
+				"46": {
+					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
+				}
+			},
+			"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"
+				}
+			]
+		},
+		"function_pointer_parameter": {
+			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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)+)?(\\()",
+			"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "meta.qualified_type.cpp",
+					"patterns": [
+						{
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
+							"name": "storage.type.$0.cpp"
+						},
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#function_type"
+						},
+						{
+							"include": "#storage_types"
+						},
+						{
+							"include": "#number_literal"
+						},
+						{
+							"include": "#string_context"
+						},
+						{
+							"include": "#comma"
+						},
+						{
+							"include": "#scope_resolution_inner_generated"
+						},
+						{
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
+							"name": "entity.name.type.cpp"
+						}
+					]
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
+				"3": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"4": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"5": {
+					"name": "comment.block.cpp"
+				},
+				"6": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.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": [
+						{
+							"include": "#scope_resolution_inner_generated"
+						}
+					]
+				},
+				"12": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"13": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"14": {},
+				"15": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"16": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"17": {},
+				"18": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"19": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"20": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"21": {
+					"name": "comment.block.cpp"
+				},
+				"22": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"23": {
+					"name": "entity.name.type.cpp"
+				},
+				"24": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"25": {},
+				"26": {
+					"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"
+						}
+					]
+				},
+				"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": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
+				},
+				"40": {
+					"name": "punctuation.definition.function.pointer.dereference.cpp"
+				},
+				"41": {
+					"name": "variable.parameter.pointer.function.cpp"
+				},
+				"42": {
+					"name": "punctuation.definition.begin.bracket.square.cpp"
+				},
+				"43": {
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
+				},
+				"44": {
+					"name": "punctuation.definition.end.bracket.square.cpp"
+				},
+				"45": {
+					"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
+				},
+				"46": {
+					"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
+				}
+			},
+			"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"
+				}
+			]
+		},
+		"functional_specifiers_pre_parameters": {
+			"match": "(?<!\\w)(?:(?:constexpr)|(?:explicit)|(?:mutable)|(?:virtual)|(?:inline)|(?:friend))(?!\\w)",
+			"name": "storage.modifier.specifier.functional.pre-parameters.$0.cpp"
+		},
+		"gcc_attributes": {
+			"begin": "__attribute(?:__)?\\(\\(",
+			"end": "\\)\\)",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.attribute.begin.cpp"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.attribute.end.cpp"
+				}
+			},
+			"name": "support.other.attribute.cpp",
+			"patterns": [
+				{
+					"include": "#attributes_context"
+				},
+				{
+					"begin": "\\(",
+					"end": "\\)",
+					"beginCaptures": {},
+					"endCaptures": {},
+					"patterns": [
+						{
+							"include": "#attributes_context"
+						},
+						{
+							"include": "#string_context"
+						}
+					]
+				},
+				{
+					"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"
+				}
+			]
+		},
+		"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"
+				},
+				"2": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"3": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"4": {
+					"name": "entity.name.label.call.cpp"
+				}
+			}
+		},
+		"identifier": {
+			"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}))*"
+		},
+		"include": {
+			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((#)(?:(?:\\s)+)?((?:include|include_next))\\b)(?:(?:\\s)+)?(?:(?:(?:((<)[^>]*(>?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/)))|((\\\")[^\\\"]*((?:\\\")?)((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=\\/\\/))))|(((?:((?:(?>(?:\\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)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;)))))|((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:\\n)|$)|(?=(?:\\/\\/|;))))",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"2": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"3": {
+					"name": "keyword.control.directive.$5.cpp"
+				},
+				"4": {
+					"name": "punctuation.definition.directive.cpp"
+				},
+				"6": {
+					"name": "string.quoted.other.lt-gt.include.cpp"
+				},
+				"7": {
+					"name": "punctuation.definition.string.begin.cpp"
+				},
+				"8": {
+					"name": "punctuation.definition.string.end.cpp"
+				},
+				"9": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"10": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"11": {
+					"name": "string.quoted.double.include.cpp"
+				},
+				"12": {
+					"name": "punctuation.definition.string.begin.cpp"
+				},
+				"13": {
+					"name": "punctuation.definition.string.end.cpp"
+				},
+				"14": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"15": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"16": {
+					"name": "entity.name.other.preprocessor.macro.include.cpp"
+				},
+				"17": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"18": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"19": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"20": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"21": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"22": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				}
 			},
 			"name": "meta.preprocessor.include.cpp"
@@ -5527,7 +6468,7 @@
 					"name": "punctuation.separator.delimiter.comma.inheritance.cpp"
 				},
 				{
-					"match": "(?<!\\w)(?:protected|private|public)(?!\\w)",
+					"match": "(?<!\\w)(?:(?:protected)|(?:private)|(?:public))(?!\\w)",
 					"name": "storage.type.modifier.access.$0.cpp"
 				},
 				{
@@ -5535,13 +6476,13 @@
 					"name": "storage.type.modifier.virtual.cpp"
 				},
 				{
-					"match": "(?<=protected|virtual|private|public|,|:)\\s*(?!(?:(?:protected|private|public)|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))",
+					"match": "(?<=protected|virtual|private|public|,|:)(?:(?:\\s)+)?(?!(?:(?:(?:protected)|(?:private)|(?:public))|virtual))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))",
 					"captures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
 							"patterns": [
 								{
-									"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+									"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 									"name": "storage.type.$0.cpp"
 								},
 								{
@@ -5566,7 +6507,24 @@
 									"include": "#scope_resolution_inner_generated"
 								},
 								{
-									"include": "#template_call_range"
+									"begin": "<",
+									"end": ">",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_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}))*",
@@ -5592,59 +6550,99 @@
 							]
 						},
 						"4": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"5": {
-							"name": "comment.block.cpp"
-						},
-						"6": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
 								}
 							]
 						},
-						"7": {
+						"5": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"8": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"9": {
-							"name": "comment.block.cpp"
-						},
-						"10": {
+						"6": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
 								}
 							]
 						},
-						"12": {
+						"7": {
 							"patterns": [
 								{
 									"include": "#scope_resolution_inner_generated"
 								}
 							]
 						},
-						"13": {
+						"8": {
 							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 						},
-						"15": {
+						"9": {
+							"patterns": [
+								{
+									"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+									"captures": {
+										"1": {
+											"name": "meta.template.call.cpp",
+											"patterns": [
+												{
+													"include": "#template_call_range"
+												}
+											]
+										},
+										"2": {}
+									}
+								}
+							]
+						},
+						"10": {},
+						"11": {
+							"name": "entity.name.scope-resolution.cpp"
+						},
+						"12": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -5652,8 +6650,46 @@
 								}
 							]
 						},
+						"13": {},
+						"14": {
+							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+						},
+						"15": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
 						"17": {
-							"name": "entity.name.scope-resolution.cpp"
+							"name": "entity.name.type.cpp"
 						},
 						"18": {
 							"name": "meta.template.call.cpp",
@@ -5663,51 +6699,13 @@
 								}
 							]
 						},
-						"20": {
-							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-						},
-						"26": {
-							"name": "meta.template.call.cpp",
-							"patterns": [
-								{
-									"include": "#template_call_range"
-								}
-							]
-						}
+						"19": {}
 					}
 				}
 			]
 		},
 		"inline_comment": {
-			"match": "(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/))",
+			"match": "(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/))",
 			"captures": {
 				"1": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
@@ -5734,7 +6732,7 @@
 			"name": "invalid.illegal.unexpected.punctuation.definition.comment.end.cpp"
 		},
 		"label": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)",
+			"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": {
 					"patterns": [
@@ -5744,70 +6742,89 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "entity.name.label.cpp"
 				},
-				"6": {
+				"4": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"7": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"8": {
-					"name": "comment.block.cpp"
-				},
-				"9": {
+				"5": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"10": {
+				"6": {
 					"name": "punctuation.separator.label.cpp"
 				}
 			}
 		},
 		"lambdas": {
-			"begin": "((?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))\\s*(\\[(?!\\[| *+\"| *+\\d))((?>(?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?>(?:(?>[^\\[\\]]*)\\g<4>?)+)\\]))*))(\\](?!\\[)))",
+			"begin": "(?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[\\*&\">])|(?<=\\Wreturn|^return))(?:(?:\\s)+)?(\\[(?!\\[| *+\"| *+\\d))((?:[^\\[\\]]|((?<!\\[)\\[(?!\\[)(?:[^\\[\\]]*+\\g<3>?)++\\]))*+)(\\](?!((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))[\\[\\];]))",
+			"end": "(?<=[;}])",
 			"beginCaptures": {
-				"2": {
+				"1": {
 					"name": "punctuation.definition.capture.begin.lambda.cpp"
 				},
-				"3": {
+				"2": {
 					"name": "meta.lambda.capture.cpp",
 					"patterns": [
 						{
 							"include": "#the_this_keyword"
 						},
 						{
-							"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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))",
+							"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)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?=\\]|\\z|$)|(,))|(\\=))",
 							"captures": {
 								"1": {
 									"name": "variable.parameter.capture.cpp"
@@ -5850,26 +6867,52 @@
 						}
 					]
 				},
-				"5": {
+				"3": {},
+				"4": {
 					"name": "punctuation.definition.capture.end.lambda.cpp"
+				},
+				"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"
+						}
+					]
 				}
 			},
-			"end": "(?<=})",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.function.definition.parameters.lambda.cpp",
-					"begin": "(\\()",
+					"begin": "\\(",
+					"end": "\\)",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.parameters.begin.lambda.cpp"
 						}
 					},
-					"end": "(\\))",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.parameters.end.lambda.cpp"
 						}
 					},
+					"name": "meta.function.definition.parameters.lambda.cpp",
 					"patterns": [
 						{
 							"include": "#function_parameter_context"
@@ -5877,7 +6920,7 @@
 					]
 				},
 				{
-					"match": "(?<!\\w)(?:constexpr|consteval|mutable)(?!\\w)",
+					"match": "(?<!\\w)(?:(?:constexpr)|(?:consteval)|(?:mutable))(?!\\w)",
 					"name": "storage.modifier.lambda.$0.cpp"
 				},
 				{
@@ -5892,19 +6935,19 @@
 					}
 				},
 				{
-					"name": "meta.function.definition.body.lambda.cpp",
-					"begin": "(\\{)",
+					"begin": "\\{",
+					"end": "\\}",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.lambda.cpp"
 						}
 					},
-					"end": "(\\})",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.lambda.cpp"
 						}
 					},
+					"name": "meta.function.definition.body.lambda.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -5914,30 +6957,30 @@
 			]
 		},
 		"language_constants": {
-			"match": "(?<!\\w)(?:nullptr|false|NULL|true)(?!\\w)",
+			"match": "(?<!\\w)(?:(?:nullptr)|(?:false)|(?:NULL)|(?:true))(?!\\w)",
 			"name": "constant.language.$0.cpp"
 		},
 		"line": {
-			"name": "meta.preprocessor.line.cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*line\\b)",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?line\\b",
+			"end": "(?<!\\\\)(?=\\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.control.directive.line.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -5949,11 +6992,12 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.definition.directive.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.line.cpp",
 			"patterns": [
 				{
 					"include": "#string_context_c"
@@ -5967,14 +7011,15 @@
 			]
 		},
 		"line_comment": {
-			"name": "comment.line.double-slash.cpp",
 			"begin": "\\s*+(\\/\\/)",
+			"end": "(?<=\\n)(?<!\\\\\\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "punctuation.definition.comment.cpp"
 				}
 			},
-			"end": "(?<=\\n)(?<!\\\\\\n)",
+			"endCaptures": {},
+			"name": "comment.line.double-slash.cpp",
 			"patterns": [
 				{
 					"include": "#line_continuation_character"
@@ -5986,8 +7031,8 @@
 			"name": "constant.character.escape.line-continuation.cpp"
 		},
 		"macro": {
-			"name": "meta.preprocessor.macro.cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*define\\b)\\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))",
+			"begin": "(^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?define\\b)(?:(?:\\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))",
+			"end": "(?<!\\\\)(?=\\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.define.cpp"
@@ -6024,24 +7069,25 @@
 					"name": "entity.name.function.preprocessor.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.macro.cpp",
 			"patterns": [
 				{
-					"begin": "\\G\\s*(\\()",
+					"begin": "\\G(?:(?:\\s)+)?(\\()",
+					"end": "\\)",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.parameters.begin.preprocessor.cpp"
 						}
 					},
-					"end": "(\\))",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.parameters.end.preprocessor.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"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*",
+							"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)+)?",
 							"captures": {
 								"1": {
 									"name": "variable.parameter.preprocessor.cpp"
@@ -6082,7 +7128,7 @@
 			"name": "entity.name.function.preprocessor.cpp"
 		},
 		"member_access": {
-			"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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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(?!uint_least64_t[^(?-mix:\\w)]|uint_least16_t[^(?-mix:\\w)]|uint_least32_t[^(?-mix:\\w)]|int_least16_t[^(?-mix:\\w)]|uint_fast64_t[^(?-mix:\\w)]|uint_fast32_t[^(?-mix:\\w)]|uint_fast16_t[^(?-mix:\\w)]|uint_least8_t[^(?-mix:\\w)]|int_least64_t[^(?-mix:\\w)]|int_least32_t[^(?-mix:\\w)]|int_fast32_t[^(?-mix:\\w)]|int_fast16_t[^(?-mix:\\w)]|int_least8_t[^(?-mix:\\w)]|uint_fast8_t[^(?-mix:\\w)]|int_fast64_t[^(?-mix:\\w)]|int_fast8_t[^(?-mix:\\w)]|suseconds_t[^(?-mix:\\w)]|useconds_t[^(?-mix:\\w)]|in_addr_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintptr_t[^(?-mix:\\w)]|blksize_t[^(?-mix:\\w)]|in_port_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|unsigned[^(?-mix:\\w)]|blkcnt_t[^(?-mix:\\w)]|uint32_t[^(?-mix:\\w)]|u_quad_t[^(?-mix:\\w)]|uint16_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|uint64_t[^(?-mix:\\w)]|intptr_t[^(?-mix:\\w)]|swblk_t[^(?-mix:\\w)]|wchar_t[^(?-mix:\\w)]|u_short[^(?-mix:\\w)]|qaddr_t[^(?-mix:\\w)]|caddr_t[^(?-mix:\\w)]|daddr_t[^(?-mix:\\w)]|fixpt_t[^(?-mix:\\w)]|nlink_t[^(?-mix:\\w)]|segsz_t[^(?-mix:\\w)]|clock_t[^(?-mix:\\w)]|ssize_t[^(?-mix:\\w)]|int16_t[^(?-mix:\\w)]|int32_t[^(?-mix:\\w)]|int64_t[^(?-mix:\\w)]|uint8_t[^(?-mix:\\w)]|int8_t[^(?-mix:\\w)]|mode_t[^(?-mix:\\w)]|quad_t[^(?-mix:\\w)]|ushort[^(?-mix:\\w)]|u_long[^(?-mix:\\w)]|u_char[^(?-mix:\\w)]|double[^(?-mix:\\w)]|size_t[^(?-mix:\\w)]|signed[^(?-mix:\\w)]|time_t[^(?-mix:\\w)]|key_t[^(?-mix:\\w)]|ino_t[^(?-mix:\\w)]|gid_t[^(?-mix:\\w)]|dev_t[^(?-mix:\\w)]|div_t[^(?-mix:\\w)]|float[^(?-mix:\\w)]|u_int[^(?-mix:\\w)]|uid_t[^(?-mix:\\w)]|short[^(?-mix:\\w)]|off_t[^(?-mix:\\w)]|pid_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|bool[^(?-mix:\\w)]|char[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|uint[^(?-mix:\\w)]|void[^(?-mix:\\w)]|long[^(?-mix:\\w)]|auto[^(?-mix:\\w)]|int[^(?-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(?!uint_least64_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_least16_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_least32_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_least16_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_fast64_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_fast32_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_fast16_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_least8_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_least64_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_least32_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_fast32_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_fast16_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_least8_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint_fast8_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_fast64_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int_fast8_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|suseconds_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|useconds_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|in_addr_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uintmax_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uintptr_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|blksize_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|in_port_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|intmax_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|unsigned[^Pattern.new(\n  match: \\/\\w\\/,\n)]|blkcnt_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint32_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|u_quad_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint16_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|intmax_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint64_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|intptr_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|swblk_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|wchar_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|u_short[^Pattern.new(\n  match: \\/\\w\\/,\n)]|qaddr_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|caddr_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|daddr_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|fixpt_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|nlink_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|segsz_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|clock_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|ssize_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int16_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int32_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int64_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint8_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int8_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|mode_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|quad_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|ushort[^Pattern.new(\n  match: \\/\\w\\/,\n)]|u_long[^Pattern.new(\n  match: \\/\\w\\/,\n)]|u_char[^Pattern.new(\n  match: \\/\\w\\/,\n)]|double[^Pattern.new(\n  match: \\/\\w\\/,\n)]|size_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|signed[^Pattern.new(\n  match: \\/\\w\\/,\n)]|time_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|key_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|ino_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|gid_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|dev_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|div_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|float[^Pattern.new(\n  match: \\/\\w\\/,\n)]|u_int[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uid_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|short[^Pattern.new(\n  match: \\/\\w\\/,\n)]|off_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|pid_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|id_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|bool[^Pattern.new(\n  match: \\/\\w\\/,\n)]|char[^Pattern.new(\n  match: \\/\\w\\/,\n)]|id_t[^Pattern.new(\n  match: \\/\\w\\/,\n)]|uint[^Pattern.new(\n  match: \\/\\w\\/,\n)]|void[^Pattern.new(\n  match: \\/\\w\\/,\n)]|long[^Pattern.new(\n  match: \\/\\w\\/,\n)]|auto[^Pattern.new(\n  match: \\/\\w\\/,\n)]|int[^Pattern.new(\n  match: \\/\\w\\/,\n)])(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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": {
 					"patterns": [
@@ -6092,39 +7138,48 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "variable.language.this.cpp"
 				},
-				"6": {
+				"4": {
 					"name": "variable.other.object.access.cpp"
 				},
-				"7": {
+				"5": {
 					"name": "punctuation.separator.dot-access.cpp"
 				},
-				"8": {
+				"6": {
 					"name": "punctuation.separator.pointer-access.cpp"
 				},
-				"9": {
+				"7": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?>(?:(?:(?>(?<!\\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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"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": [
@@ -6166,7 +7221,7 @@
 							}
 						},
 						{
-							"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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"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": {
 									"patterns": [
@@ -6215,13 +7270,13 @@
 						}
 					]
 				},
-				"10": {
+				"8": {
 					"name": "variable.other.property.cpp"
 				}
 			}
 		},
 		"memory_operators": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?:(delete)(?:(?:\\s)+)?(\\[\\])|(delete))|(new))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6231,42 +7286,52 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "keyword.operator.wordlike.cpp"
 				},
-				"6": {
+				"4": {
 					"name": "keyword.operator.delete.array.cpp"
 				},
-				"7": {
+				"5": {
 					"name": "keyword.operator.delete.array.bracket.cpp"
 				},
-				"8": {
+				"6": {
 					"name": "keyword.operator.delete.cpp"
 				},
-				"9": {
+				"7": {
 					"name": "keyword.operator.new.cpp"
 				}
 			}
 		},
 		"method_access": {
-			"begin": "(?:((?>(?:(?:(?>(?<!\\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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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)+)?(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -6308,7 +7373,7 @@
 				"9": {
 					"patterns": [
 						{
-							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?:((?>(?:(?:(?>(?<!\\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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"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": [
@@ -6350,7 +7415,7 @@
 							}
 						},
 						{
-							"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*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"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": {
 									"patterns": [
@@ -6406,9 +7471,8 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.function.member.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.function.member.cpp"
 				}
 			},
@@ -6418,12 +7482,8 @@
 				}
 			]
 		},
-		"misc_storage_modifiers": {
-			"match": "\\b(?:export|mutable|typename|thread_local|register|restrict|static|volatile|inline)\\b",
-			"name": "storage.modifier.$0.cpp"
-		},
-		"module_import": {
-			"match": "(?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((import))\\s*(?:(?:(?:((<)[^>]*(>?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/)))|((\\\")[^\\\"]*(\\\"?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=\\/\\/))))|(((?>(?:(?:(?>(?<!\\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}))*(?:\\.(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;)))))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:\\n|$)|(?=(?:\\/\\/|;))))\\s*(;?)",
+		"misc_keywords": {
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:requires)|(?:typedef)|(?:concept)|(?:export)|(?:module))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6433,192 +7493,51 @@
 					]
 				},
 				"2": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.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.directive.import.cpp"
-				},
-				"7": {
-					"name": "string.quoted.other.lt-gt.include.cpp"
-				},
-				"8": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"9": {
-					"name": "punctuation.definition.string.end.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": "string.quoted.double.include.cpp"
-				},
-				"15": {
-					"name": "punctuation.definition.string.begin.cpp"
-				},
-				"16": {
-					"name": "punctuation.definition.string.end.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.other.preprocessor.macro.include.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.terminator.statement.cpp"
+					"name": "keyword.other.$3.cpp"
 				}
-			},
-			"name": "meta.preprocessor.import.cpp"
+			}
 		},
 		"ms_attributes": {
-			"name": "support.other.attribute.cpp",
-			"begin": "(__declspec\\()",
+			"begin": "__declspec\\(",
+			"end": "\\)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.begin.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.attribute.end.cpp"
 				}
 			},
+			"name": "support.other.attribute.cpp",
 			"patterns": [
 				{
 					"include": "#attributes_context"
@@ -6626,6 +7545,8 @@
 				{
 					"begin": "\\(",
 					"end": "\\)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -6636,7 +7557,7 @@
 					]
 				},
 				{
-					"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))",
+					"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"
@@ -6668,7 +7589,7 @@
 			]
 		},
 		"namespace_alias": {
-			"match": "(?<!\\w)(namespace)\\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*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<9>?)+)>)\\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*(?:(;)|\\n))",
+			"match": "(?<!\\w)(namespace)(?:\\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)+)?(((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<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))(?:(?:\\s)+)?(?:(;)|\\n))",
 			"captures": {
 				"1": {
 					"name": "keyword.other.namespace.alias.cpp storage.type.namespace.alias.cpp"
@@ -6692,45 +7613,57 @@
 				"6": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
 				},
-				"8": {
-					"name": "meta.template.call.cpp",
+				"7": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"10": {
+				"9": {
 					"name": "entity.name.namespace.cpp"
 				},
-				"11": {
+				"10": {
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
 			"name": "meta.declaration.namespace.alias.cpp"
 		},
 		"namespace_block": {
-			"name": "meta.block.namespace.cpp",
-			"begin": "(((?<!\\w)namespace(?!\\w)))",
+			"begin": "((?<!\\w)namespace(?!\\w))",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.namespace.cpp"
 				},
-				"2": {
+				"1": {
 					"name": "keyword.other.namespace.definition.cpp storage.type.namespace.definition.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.block.namespace.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.namespace.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.namespace.cpp"
 						}
 					},
+					"name": "meta.head.namespace.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -6739,7 +7672,7 @@
 							"include": "#attributes_context"
 						},
 						{
-							"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<5>?)+)>)\\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))?",
+							"match": "((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<4>?)+>)(?:(?:\\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": [
@@ -6751,7 +7684,7 @@
 								"2": {
 									"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
 								},
-								"4": {
+								"3": {
 									"name": "meta.template.call.cpp",
 									"patterns": [
 										{
@@ -6759,13 +7692,14 @@
 										}
 									]
 								},
-								"6": {
+								"4": {},
+								"5": {
 									"name": "entity.name.namespace.cpp"
 								},
-								"7": {
+								"6": {
 									"name": "punctuation.separator.scope-resolution.namespace.block.cpp"
 								},
-								"8": {
+								"7": {
 									"name": "storage.modifier.inline.cpp"
 								}
 							}
@@ -6773,14 +7707,15 @@
 					]
 				},
 				{
-					"name": "meta.body.namespace.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.namespace.cpp"
 						}
 					},
+					"name": "meta.body.namespace.cpp",
 					"patterns": [
 						{
 							"include": "$self"
@@ -6788,9 +7723,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.namespace.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -6800,8 +7737,8 @@
 			]
 		},
 		"noexcept_operator": {
-			"contentName": "meta.arguments.operator.noexcept.cpp",
-			"begin": "((?<!\\w)noexcept(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.cpp"
@@ -6835,12 +7772,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.noexcept",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -6848,7 +7785,7 @@
 			]
 		},
 		"non_primitive_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6858,24 +7795,33 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "storage.type.cpp storage.type.built-in.cpp"
 				}
 			}
@@ -6888,9 +7834,11 @@
 						{
 							"begin": "(?=.)",
 							"end": "$",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"patterns": [
 								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)",
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)",
 									"captures": {
 										"1": {
 											"name": "keyword.other.unit.hexadecimal.cpp"
@@ -6922,16 +7870,16 @@
 										"6": {
 											"name": "punctuation.separator.constant.numeric.cpp"
 										},
-										"8": {
+										"7": {
 											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
 										},
-										"9": {
+										"8": {
 											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
 										},
-										"10": {
+										"9": {
 											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
 										},
-										"11": {
+										"10": {
 											"name": "constant.numeric.exponent.hexadecimal.cpp",
 											"patterns": [
 												{
@@ -6940,18 +7888,18 @@
 												}
 											]
 										},
-										"12": {
+										"11": {
 											"name": "keyword.other.unit.suffix.floating-point.cpp"
 										},
-										"13": {
+										"12": {
 											"name": "keyword.other.unit.user-defined.cpp"
 										}
 									}
 								},
 								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)",
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?([lLfF](?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)",
 									"captures": {
-										"2": {
+										"1": {
 											"name": "constant.numeric.decimal.cpp",
 											"patterns": [
 												{
@@ -6960,13 +7908,13 @@
 												}
 											]
 										},
+										"2": {
+											"name": "punctuation.separator.constant.numeric.cpp"
+										},
 										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
 											"name": "constant.numeric.decimal.point.cpp"
 										},
-										"5": {
+										"4": {
 											"name": "constant.numeric.decimal.cpp",
 											"patterns": [
 												{
@@ -6975,19 +7923,19 @@
 												}
 											]
 										},
-										"6": {
+										"5": {
 											"name": "punctuation.separator.constant.numeric.cpp"
 										},
-										"8": {
+										"6": {
 											"name": "keyword.other.unit.exponent.decimal.cpp"
 										},
-										"9": {
+										"7": {
 											"name": "keyword.operator.plus.exponent.decimal.cpp"
 										},
-										"10": {
+										"8": {
 											"name": "keyword.operator.minus.exponent.decimal.cpp"
 										},
-										"11": {
+										"9": {
 											"name": "constant.numeric.exponent.decimal.cpp",
 											"patterns": [
 												{
@@ -6996,16 +7944,16 @@
 												}
 											]
 										},
-										"12": {
+										"10": {
 											"name": "keyword.other.unit.suffix.floating-point.cpp"
 										},
-										"13": {
+										"11": {
 											"name": "keyword.other.unit.user-defined.cpp"
 										}
 									}
 								},
 								{
-									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)",
+									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)",
 									"captures": {
 										"1": {
 											"name": "keyword.other.unit.binary.cpp"
@@ -7031,7 +7979,7 @@
 									}
 								},
 								{
-									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)",
+									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9])\\w*)?$)",
 									"captures": {
 										"1": {
 											"name": "keyword.other.unit.octal.cpp"
@@ -7057,7 +8005,7 @@
 									}
 								},
 								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)",
+									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([pP])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9a-fA-FpP])\\w*)?$)",
 									"captures": {
 										"1": {
 											"name": "keyword.other.unit.hexadecimal.cpp"
@@ -7074,16 +8022,16 @@
 										"3": {
 											"name": "punctuation.separator.constant.numeric.cpp"
 										},
-										"5": {
+										"4": {
 											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
 										},
-										"6": {
+										"5": {
 											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
 										},
-										"7": {
+										"6": {
 											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
 										},
-										"8": {
+										"7": {
 											"name": "constant.numeric.exponent.hexadecimal.cpp",
 											"patterns": [
 												{
@@ -7092,18 +8040,18 @@
 												}
 											]
 										},
-										"9": {
+										"8": {
 											"name": "keyword.other.unit.suffix.integer.cpp"
 										},
-										"10": {
+										"9": {
 											"name": "keyword.other.unit.user-defined.cpp"
 										}
 									}
 								},
 								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)",
+									"match": "\\G(?=[0-9.])(?!0[xXbB])([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)(?:(?<!')([eE])((?:\\+)?)((?:\\-)?)([0-9](?:[0-9]|(?<=[0-9a-fA-F])'(?=[0-9a-fA-F]))*))?((?:[uU]|(?:[uU]ll?)|(?:[uU]LL?)|(?:ll?[uU]?)|(?:LL?[uU]?)|[fF])(?!\\w))?((?:\\w(?<![0-9eE])\\w*)?$)",
 									"captures": {
-										"2": {
+										"1": {
 											"name": "constant.numeric.decimal.cpp",
 											"patterns": [
 												{
@@ -7112,19 +8060,19 @@
 												}
 											]
 										},
-										"3": {
+										"2": {
 											"name": "punctuation.separator.constant.numeric.cpp"
 										},
-										"5": {
+										"3": {
 											"name": "keyword.other.unit.exponent.decimal.cpp"
 										},
-										"6": {
+										"4": {
 											"name": "keyword.operator.plus.exponent.decimal.cpp"
 										},
-										"7": {
+										"5": {
 											"name": "keyword.operator.minus.exponent.decimal.cpp"
 										},
-										"8": {
+										"6": {
 											"name": "constant.numeric.exponent.decimal.cpp",
 											"patterns": [
 												{
@@ -7133,10 +8081,10 @@
 												}
 											]
 										},
-										"9": {
+										"7": {
 											"name": "keyword.other.unit.suffix.integer.cpp"
 										},
-										"10": {
+										"8": {
 											"name": "keyword.other.unit.user-defined.cpp"
 										}
 									}
@@ -7152,17 +8100,17 @@
 			}
 		},
 		"operator_overload": {
-			"name": "meta.function.definition.special.operator-overload.cpp",
-			"begin": "((?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:__cdecl|__clrcall|__stdcall|__fastcall|__thiscall|__vectorcall)?)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?::)*)(operator)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<67>?)+)>)\\s*)?::)*)(?:(?:((?:delete\\[\\]|delete|new\\[\\]|<=>|<<=|new|>>=|\\->\\*|\\/=|%=|&=|>=|\\|=|\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|<<|>>|\\-\\-|<=|\\^=|==|!=|&&|\\|\\||\\+=|\\-=|\\*=|,|\\+|\\-|!|~|\\*|&|\\*|\\/|%|\\+|\\-|<|>|&|\\^|\\||=))|((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?:\\[\\])?)))|(\"\")((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\<|\\())",
+			"begin": "(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\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)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\s)+)?)?::)*)(operator)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<62>?)+>)(?:(?:\\s)+)?)?::)*)(?:(?:((?:(?:delete\\[\\])|(?:delete)|(?:new\\[\\])|(?:<=>)|(?:<<=)|(?:new)|(?:>>=)|(?:\\->\\*)|(?:\\/=)|(?:%=)|(?:&=)|(?:>=)|(?:\\|=)|(?:\\+\\+)|(?:\\-\\-)|(?:\\(\\))|(?:\\[\\])|(?:\\->)|(?:\\+\\+)|(?:<<)|(?:>>)|(?:\\-\\-)|(?:<=)|(?:\\^=)|(?:==)|(?:!=)|(?:&&)|(?:\\|\\|)|(?:\\+=)|(?:\\-=)|(?:\\*=)|,|(?:\\+)|(?:\\-)|!|~|(?:\\*)|&|(?:\\*)|(?:\\/)|%|(?:\\+)|(?:\\-)|<|>|&|(?:\\^)|(?:\\|)|=))|((?<!\\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)))(?=\\<|\\()",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.function.definition.special.operator-overload.cpp"
 				},
-				"2": {
+				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -7187,7 +8135,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -7195,7 +8160,7 @@
 						}
 					]
 				},
-				"3": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -7205,45 +8170,45 @@
 						}
 					]
 				},
-				"4": {
+				"3": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"4": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"5": {
 					"name": "comment.block.cpp"
 				},
+				"6": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"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": {
+				"8": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"10": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
-				"11": {
+				"10": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7255,16 +8220,28 @@
 						}
 					]
 				},
-				"13": {
+				"11": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"14": {
+				"12": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
+				"13": {
+					"name": "meta.template.call.cpp",
+					"patterns": [
+						{
+							"include": "#template_call_range"
+						}
+					]
+				},
+				"14": {},
+				"15": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
 				"16": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
@@ -7273,34 +8250,24 @@
 						}
 					]
 				},
+				"17": {},
 				"18": {
-					"name": "entity.name.scope-resolution.cpp"
-				},
-				"19": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"21": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"22": {
+				"19": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"23": {
+				"20": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"24": {
+				"21": {
 					"name": "comment.block.cpp"
 				},
-				"25": {
+				"22": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7312,10 +8279,10 @@
 						}
 					]
 				},
-				"26": {
+				"23": {
 					"name": "entity.name.type.cpp"
 				},
-				"27": {
+				"24": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -7323,14 +8290,15 @@
 						}
 					]
 				},
-				"29": {
+				"25": {},
+				"26": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7366,148 +8334,148 @@
 						}
 					]
 				},
-				"30": {
+				"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": {
-					"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"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"32": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"33": {
+					"name": "comment.block.cpp"
+				},
 				"34": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"35": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"36": {
-					"name": "comment.block.cpp"
-				},
-				"37": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"36": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"37": {
+					"name": "comment.block.cpp"
+				},
 				"38": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"39": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"40": {
-					"name": "comment.block.cpp"
-				},
-				"41": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"40": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"41": {
+					"name": "comment.block.cpp"
+				},
 				"42": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"43": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"name": "storage.type.modifier.calling-convention.cpp"
 				},
 				"44": {
-					"name": "comment.block.cpp"
-				},
-				"45": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
+				"45": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
 				"46": {
-					"name": "storage.type.modifier.calling-convention.cpp"
+					"name": "comment.block.cpp"
 				},
 				"47": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
 				"48": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"49": {
-					"name": "comment.block.cpp"
-				},
-				"50": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"51": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"52": {
+				"49": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"53": {
+				"50": {
 					"name": "comment.block.cpp"
 				},
-				"54": {
+				"51": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7519,7 +8487,7 @@
 						}
 					]
 				},
-				"55": {
+				"52": {
 					"patterns": [
 						{
 							"match": "::",
@@ -7534,7 +8502,7 @@
 						}
 					]
 				},
-				"57": {
+				"53": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -7542,23 +8510,24 @@
 						}
 					]
 				},
-				"59": {
+				"54": {},
+				"55": {
 					"name": "keyword.other.operator.overload.cpp"
 				},
-				"60": {
+				"56": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"61": {
+				"57": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"62": {
+				"58": {
 					"name": "comment.block.cpp"
 				},
-				"63": {
+				"59": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7570,7 +8539,7 @@
 						}
 					]
 				},
-				"64": {
+				"60": {
 					"patterns": [
 						{
 							"match": "::",
@@ -7585,7 +8554,7 @@
 						}
 					]
 				},
-				"66": {
+				"61": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -7593,20 +8562,21 @@
 						}
 					]
 				},
-				"68": {
+				"62": {},
+				"63": {
 					"name": "entity.name.operator.cpp"
 				},
-				"69": {
+				"64": {
 					"name": "entity.name.operator.type.cpp"
 				},
-				"70": {
+				"65": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "entity.name.operator.type.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -7642,45 +8612,70 @@
 						}
 					]
 				},
-				"71": {
+				"66": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"72": {
+				"67": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"73": {
+				"68": {
 					"name": "comment.block.cpp"
 				},
+				"69": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"70": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"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"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
 				"74": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"75": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"76": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"77": {
 					"name": "comment.block.cpp"
 				},
-				"78": {
+				"77": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7692,20 +8687,26 @@
 						}
 					]
 				},
+				"78": {
+					"name": "entity.name.operator.type.array.cpp"
+				},
 				"79": {
+					"name": "entity.name.operator.custom-literal.cpp"
+				},
+				"80": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"80": {
+				"81": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"81": {
+				"82": {
 					"name": "comment.block.cpp"
 				},
-				"82": {
+				"83": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -7717,9 +8718,6 @@
 						}
 					]
 				},
-				"83": {
-					"name": "entity.name.operator.type.array.cpp"
-				},
 				"84": {
 					"name": "entity.name.operator.custom-literal.cpp"
 				},
@@ -7747,47 +8745,21 @@
 							"name": "comment.block.cpp"
 						}
 					]
-				},
-				"89": {
-					"name": "entity.name.operator.custom-literal.cpp"
-				},
-				"90": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"91": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"92": {
-					"name": "comment.block.cpp"
-				},
-				"93": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.function.definition.special.operator-overload.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.function.definition.special.operator-overload.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.function.definition.special.operator-overload.cpp"
 						}
 					},
+					"name": "meta.head.function.definition.special.operator-overload.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -7796,19 +8768,19 @@
 							"include": "#template_call_range"
 						},
 						{
-							"contentName": "meta.function.definition.parameters.special.operator-overload.cpp",
-							"begin": "(\\()",
+							"begin": "\\(",
+							"end": "\\)",
 							"beginCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.begin.bracket.round.special.operator-overload.cpp"
 								}
 							},
-							"end": "(\\))",
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.parameters.end.bracket.round.special.operator-overload.cpp"
 								}
 							},
+							"contentName": "meta.function.definition.parameters.special.operator-overload",
 							"patterns": [
 								{
 									"include": "#function_parameter_context"
@@ -7827,14 +8799,15 @@
 					]
 				},
 				{
-					"name": "meta.body.function.definition.special.operator-overload.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.function.definition.special.operator-overload.cpp"
 						}
 					},
+					"name": "meta.body.function.definition.special.operator-overload.cpp",
 					"patterns": [
 						{
 							"include": "#function_body_context"
@@ -7842,9 +8815,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.function.definition.special.operator-overload.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -7856,22 +8831,292 @@
 		"operators": {
 			"patterns": [
 				{
-					"include": "#sizeof_operator"
+					"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.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": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.sizeof",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#alignof_operator"
+					"begin": "((?<!\\w)alignof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.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": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.alignof",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#alignas_operator"
+					"begin": "((?<!\\w)alignas(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.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": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.alignas",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#typeid_operator"
+					"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.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": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.typeid",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#noexcept_operator"
+					"begin": "((?<!\\w)noexcept(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.noexcept.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": "punctuation.section.arguments.begin.bracket.round.operator.noexcept.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.noexcept.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.noexcept",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
-					"include": "#sizeof_variadic_operator"
+					"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+					"end": "\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.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": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp"
+						}
+					},
+					"contentName": "meta.arguments.operator.sizeof.variadic",
+					"patterns": [
+						{
+							"include": "#evaluation_context"
+						}
+					]
 				},
 				{
 					"match": "--",
@@ -7920,22 +9165,1326 @@
 		"over_qualified_types": {
 			"patterns": [
 				{
-					"include": "#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))))?((?:(?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.struct.parameter.cpp"
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.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": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"14": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"15": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"17": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"18": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"19": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"20": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				},
 				{
-					"include": "#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))))?((?:(?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.enum.parameter.cpp"
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.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": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"14": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"15": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"17": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"18": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"19": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"20": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				},
 				{
-					"include": "#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))))?((?:(?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.union.parameter.cpp"
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.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": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"14": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"15": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"17": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"18": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"19": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"20": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				},
 				{
-					"include": "#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))))?((?:(?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.class.parameter.cpp"
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.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": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"13": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"14": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"15": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"16": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"17": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"18": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"19": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"20": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				}
 			]
 		},
 		"parameter": {
-			"name": "meta.parameter.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\w)",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\w)",
+			"end": "(?:(?=\\))|(,))",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -7963,12 +10512,12 @@
 					]
 				}
 			},
-			"end": "(?:(?=\\))|(,))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.separator.delimiter.comma.cpp"
 				}
 			},
+			"name": "meta.parameter.cpp",
 			"patterns": [
 				{
 					"include": "#ever_present_context"
@@ -7983,7 +10532,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:volatile|register|restrict|static|extern|const))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))+)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w)))|((?>(?:(?:(?>(?<!\\s)\\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)\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=,|\\)|=)",
+					"match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\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)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))|((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -8219,12 +10768,13 @@
 					"include": "#scope_resolution_parameter_inner_generated"
 				},
 				{
-					"match": "(?:struct|class|union|enum)",
+					"match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
 					"name": "storage.type.$0.cpp"
 				},
 				{
 					"begin": "(?<==)",
 					"end": "(?:(?=\\))|(,))",
+					"beginCaptures": {},
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.separator.delimiter.comma.cpp"
@@ -8237,10 +10787,11 @@
 					]
 				},
 				{
-					"include": "#assignment_operator"
+					"match": "\\=",
+					"name": "keyword.operator.assignment.cpp"
 				},
 				{
-					"match": "(?<!\\s|\\(|,|:)((?>(?:(?:(?>(?<!\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\)|,|\\[|=|\\n)",
+					"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": [
@@ -8301,19 +10852,19 @@
 					"include": "#attributes_context"
 				},
 				{
-					"name": "meta.bracket.square.array.cpp",
-					"begin": "(\\[)",
+					"begin": "\\[",
+					"end": "\\]",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.begin.bracket.square.array.type.cpp"
 						}
 					},
-					"end": "(\\])",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.end.bracket.square.array.type.cpp"
 						}
 					},
+					"name": "meta.bracket.square.array.cpp",
 					"patterns": [
 						{
 							"include": "#evaluation_context"
@@ -8328,7 +10879,7 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*)",
+					"match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
 					"captures": {
 						"0": {
 							"patterns": [
@@ -8337,7 +10888,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -8428,7 +10979,7 @@
 			]
 		},
 		"parameter_class": {
-			"match": "(class)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\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"
@@ -8441,59 +10992,77 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.class.parameter.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"9": {
-					"name": "comment.block.cpp"
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -8529,6 +11098,74 @@
 						}
 					]
 				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"12": {
 					"patterns": [
 						{
@@ -8537,155 +11174,141 @@
 					]
 				},
 				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"14": {
-					"name": "comment.block.cpp"
+					"name": "variable.other.object.declare.cpp"
 				},
 				"15": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"16": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
 				"17": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"18": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"19": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"20": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"parameter_enum": {
-			"match": "(enum)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\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"
@@ -8698,59 +11321,77 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.enum.parameter.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"9": {
-					"name": "comment.block.cpp"
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -8786,6 +11427,74 @@
 						}
 					]
 				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"12": {
 					"patterns": [
 						{
@@ -8794,156 +11503,142 @@
 					]
 				},
 				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"14": {
-					"name": "comment.block.cpp"
+					"name": "variable.other.object.declare.cpp"
 				},
 				"15": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"16": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
 				"17": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"18": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"19": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"20": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"parameter_or_maybe_value": {
-			"name": "meta.parameter.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\w)",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=\\w)",
+			"end": "(?:(?=\\))|(,))",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -8971,12 +11666,12 @@
 					]
 				}
 			},
-			"end": "(?:(?=\\))|(,))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.separator.delimiter.comma.cpp"
 				}
 			},
+			"name": "meta.parameter.cpp",
 			"patterns": [
 				{
 					"include": "#ever_present_context"
@@ -9000,7 +11695,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"match": "((?:((?:volatile|register|restrict|static|extern|const))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))+)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))|((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:uint_least32_t|uint_least64_t|uint_least16_t|int_least16_t|int_least64_t|int_least32_t|uint_fast32_t|uint_fast16_t|uint_fast64_t|uint_least8_t|int_fast64_t|int_fast16_t|uint_fast8_t|int_fast32_t|int_least8_t|int_fast8_t|suseconds_t|useconds_t|uintmax_t|uintptr_t|in_addr_t|uintmax_t|blksize_t|in_port_t|blkcnt_t|intptr_t|intmax_t|uint64_t|u_quad_t|uint16_t|uint32_t|intmax_t|segsz_t|fixpt_t|caddr_t|daddr_t|u_short|int16_t|int32_t|int64_t|uint8_t|nlink_t|qaddr_t|swblk_t|clock_t|ssize_t|time_t|u_long|ushort|quad_t|mode_t|size_t|u_char|int8_t|u_int|uid_t|off_t|pid_t|gid_t|dev_t|div_t|key_t|ino_t|id_t|id_t|uint)(?!\\w)))|((?>(?:(?:(?>(?<!\\s)\\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)\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=,|\\)|=)",
+					"match": "((?:((?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const)))((?:(?:(?:(?>(?:\\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)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))|((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:uint_least32_t)|(?:uint_least64_t)|(?:uint_least16_t)|(?:int_least16_t)|(?:int_least64_t)|(?:int_least32_t)|(?:uint_fast32_t)|(?:uint_fast16_t)|(?:uint_fast64_t)|(?:uint_least8_t)|(?:int_fast64_t)|(?:int_fast16_t)|(?:uint_fast8_t)|(?:int_fast32_t)|(?:int_least8_t)|(?:int_fast8_t)|(?:suseconds_t)|(?:useconds_t)|(?:uintmax_t)|(?:uintptr_t)|(?:in_addr_t)|(?:uintmax_t)|(?:blksize_t)|(?:in_port_t)|(?:blkcnt_t)|(?:intptr_t)|(?:intmax_t)|(?:uint64_t)|(?:u_quad_t)|(?:uint16_t)|(?:uint32_t)|(?:intmax_t)|(?:segsz_t)|(?:fixpt_t)|(?:caddr_t)|(?:daddr_t)|(?:u_short)|(?:int16_t)|(?:int32_t)|(?:int64_t)|(?:uint8_t)|(?:nlink_t)|(?:qaddr_t)|(?:swblk_t)|(?:clock_t)|(?:ssize_t)|(?:time_t)|(?:u_long)|(?:ushort)|(?:quad_t)|(?:mode_t)|(?:size_t)|(?:u_char)|(?:int8_t)|(?:u_int)|(?:uid_t)|(?:off_t)|(?:pid_t)|(?:gid_t)|(?:dev_t)|(?:div_t)|(?:key_t)|(?:ino_t)|(?:id_t)|(?:id_t)|(?:uint))(?!\\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(?<!\\Wvolatile|^volatile|\\Wregister|^register|\\Wrestrict|^restrict|\\Wstatic|^static|\\Wextern|^extern|\\Wconst|^const)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=,|\\)|=)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -9239,12 +11934,13 @@
 					"include": "#scope_resolution_parameter_inner_generated"
 				},
 				{
-					"match": "(?:struct|class|union|enum)",
+					"match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
 					"name": "storage.type.$0.cpp"
 				},
 				{
 					"begin": "(?<==)",
 					"end": "(?:(?=\\))|(,))",
+					"beginCaptures": {},
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.separator.delimiter.comma.cpp"
@@ -9257,7 +11953,7 @@
 					]
 				},
 				{
-					"match": "(?<!\\s|\\(|,|:)((?>(?:(?:(?>(?<!\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=(?:\\)|,|\\[|=|\\/\\/|(?:\\n|$)))",
+					"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": [
@@ -9318,19 +12014,19 @@
 					"include": "#attributes_context"
 				},
 				{
-					"name": "meta.bracket.square.array.cpp",
-					"begin": "(\\[)",
+					"begin": "\\[",
+					"end": "\\]",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.begin.bracket.square.array.type.cpp"
 						}
 					},
-					"end": "(\\])",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.end.bracket.square.array.type.cpp"
 						}
 					},
+					"name": "meta.bracket.square.array.cpp",
 					"patterns": [
 						{
 							"include": "#evaluation_context"
@@ -9345,7 +12041,7 @@
 					"include": "#template_call_range"
 				},
 				{
-					"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*)",
+					"match": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*))",
 					"captures": {
 						"0": {
 							"patterns": [
@@ -9354,7 +12050,7 @@
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -9448,7 +12144,7 @@
 			]
 		},
 		"parameter_struct": {
-			"match": "(struct)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\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"
@@ -9461,59 +12157,77 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.struct.parameter.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"9": {
-					"name": "comment.block.cpp"
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -9549,6 +12263,74 @@
 						}
 					]
 				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"12": {
 					"patterns": [
 						{
@@ -9557,155 +12339,141 @@
 					]
 				},
 				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"14": {
-					"name": "comment.block.cpp"
+					"name": "variable.other.object.declare.cpp"
 				},
 				"15": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"16": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
 				"17": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"18": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"19": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"20": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"parameter_union": {
-			"match": "(union)((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:\\[((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\]((?>(?:(?:(?>(?<!\\s)\\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"
@@ -9718,59 +12486,77 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.union.parameter.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"9": {
-					"name": "comment.block.cpp"
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -9806,6 +12592,74 @@
 						}
 					]
 				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"12": {
 					"patterns": [
 						{
@@ -9814,167 +12668,153 @@
 					]
 				},
 				"13": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"14": {
-					"name": "comment.block.cpp"
+					"name": "variable.other.object.declare.cpp"
 				},
 				"15": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"16": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
 				"17": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"18": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"19": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"20": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "variable.other.object.declare.cpp"
-				},
-				"25": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"26": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"27": {
-					"name": "comment.block.cpp"
-				},
-				"28": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"30": {
-					"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"
-						}
-					]
-				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"parentheses": {
-			"name": "meta.parens.cpp",
-			"begin": "(\\()",
+			"begin": "\\(",
+			"end": "\\)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.begin.bracket.round.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.end.bracket.round.cpp"
 				}
 			},
+			"name": "meta.parens.cpp",
 			"patterns": [
 				{
 					"include": "#over_qualified_types"
@@ -9989,7 +12829,7 @@
 			]
 		},
 		"posix_reserved_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)[a-zA-Z_]\\w*_t(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)[a-zA-Z_](?:\\w)*_t(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -9999,49 +12839,58 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "support.type.posix-reserved.cpp support.type.built-in.posix-reserved.cpp"
 				}
 			}
 		},
 		"pragma": {
-			"name": "meta.preprocessor.pragma.cpp",
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*pragma\\b)",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma\\b",
+			"end": "(?<!\\\\)(?=\\n)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.control.directive.pragma.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -10053,11 +12902,12 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.definition.directive.cpp"
 				}
 			},
-			"end": "(?<!\\\\)(?=\\n)",
+			"endCaptures": {},
+			"name": "meta.preprocessor.pragma.cpp",
 			"patterns": [
 				{
 					"include": "#comments"
@@ -10078,7 +12928,7 @@
 			]
 		},
 		"pragma_mark": {
-			"match": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*pragma\\s+mark)\\s+(.*)",
+			"match": "(^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?pragma(?:\\s)+mark)(?:\\s)+(.*)",
 			"captures": {
 				"1": {
 					"name": "keyword.control.directive.pragma.pragma-mark.cpp"
@@ -10091,27 +12941,36 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "punctuation.definition.directive.cpp"
 				},
-				"7": {
+				"5": {
 					"name": "entity.name.tag.pragma-mark.cpp"
 				}
 			},
@@ -10145,10 +13004,10 @@
 					"include": "#language_constants"
 				},
 				{
-					"include": "#string_context_c"
+					"include": "#d9bc4796b0b_string_context_c"
 				},
 				{
-					"include": "#preprocessor_number_literal"
+					"include": "#d9bc4796b0b_preprocessor_number_literal"
 				},
 				{
 					"include": "#operators"
@@ -10166,6 +13025,7 @@
 		},
 		"preprocessor_conditional_defined": {
 			"begin": "((?<!\\w)defined(?!\\w))(\\()",
+			"end": "(?:\\)|(?<!\\\\)(?=\\n))",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.directive.conditional.defined.cpp"
@@ -10174,9 +13034,8 @@
 					"name": "punctuation.section.parens.control.defined.cpp"
 				}
 			},
-			"end": "((?:\\)|(?<!\\\\)(?=\\n)))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.control.defined.cpp"
 				}
 			},
@@ -10187,40 +13046,41 @@
 			]
 		},
 		"preprocessor_conditional_parentheses": {
-			"name": "meta.parens.preprocessor.conditional.cpp",
-			"begin": "(\\()",
+			"begin": "\\(",
+			"end": "\\)",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.begin.bracket.round.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.end.bracket.round.cpp"
 				}
-			}
+			},
+			"name": "meta.parens.preprocessor.conditional.cpp"
 		},
 		"preprocessor_conditional_range": {
-			"begin": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*((?:(?:ifndef|ifdef)|if)))",
+			"begin": "^((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?:(?:ifndef|ifdef)|if))",
+			"end": "^(?!\\s*+#\\s*(?:else|endif))",
 			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.directive.conditional.$7.cpp"
+				"0": {
+					"name": "keyword.control.directive.conditional.$6.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -10232,16 +13092,19 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "punctuation.definition.directive.cpp"
-				}
+				},
+				"6": {}
 			},
-			"end": "(?:^)(?!\\s*+#\\s*(?:else|endif))",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.preprocessor.conditional.cpp",
 					"begin": "\\G(?<=ifndef|ifdef|if)",
 					"end": "(?<!\\\\)(?=\\n)",
+					"beginCaptures": {},
+					"endCaptures": {},
+					"name": "meta.preprocessor.conditional.cpp",
 					"patterns": [
 						{
 							"include": "#preprocessor_conditional_context"
@@ -10254,7 +13117,7 @@
 			]
 		},
 		"preprocessor_conditional_standalone": {
-			"match": "(?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*((?<!\\w)(?:endif|else|elif)(?!\\w))",
+			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(#)(?:(?:\\s)+)?((?<!\\w)(?:endif|else|elif)(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -10264,284 +13127,77 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "punctuation.definition.directive.cpp"
 				}
 			},
-			"name": "keyword.control.directive.$6.cpp"
+			"name": "keyword.control.directive.$4.cpp"
 		},
-		"preprocessor_number_literal": {
-			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"begin": "(?=.)",
-							"end": "$",
-							"patterns": [
-								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9a-fA-F])\\.|\\.(?=[0-9a-fA-F])))([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.hexadecimal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "constant.numeric.hexadecimal.cpp"
-										},
-										"5": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"8": {
-											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
-										},
-										"9": {
-											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
-										},
-										"10": {
-											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
-										},
-										"11": {
-											"name": "constant.numeric.exponent.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"12": {
-											"name": "keyword.other.unit.suffix.floating-point.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?:(?<=[0-9])\\.|\\.(?=[0-9])))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)?((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?([lLfF](?!\\w))?$",
-									"captures": {
-										"2": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "constant.numeric.decimal.point.cpp"
-										},
-										"5": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"6": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"8": {
-											"name": "keyword.other.unit.exponent.decimal.cpp"
-										},
-										"9": {
-											"name": "keyword.operator.plus.exponent.decimal.cpp"
-										},
-										"10": {
-											"name": "keyword.operator.minus.exponent.decimal.cpp"
-										},
-										"11": {
-											"name": "constant.numeric.exponent.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"12": {
-											"name": "keyword.other.unit.suffix.floating-point.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0[bB])([01](?:[01]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.binary.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.binary.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0)((?:[0-7]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))+)((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.octal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.octal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"4": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G0[xX])([0-9a-fA-F](?:[0-9a-fA-F]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([pP])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"1": {
-											"name": "keyword.other.unit.hexadecimal.cpp"
-										},
-										"2": {
-											"name": "constant.numeric.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.exponent.hexadecimal.cpp"
-										},
-										"6": {
-											"name": "keyword.operator.plus.exponent.hexadecimal.cpp"
-										},
-										"7": {
-											"name": "keyword.operator.minus.exponent.hexadecimal.cpp"
-										},
-										"8": {
-											"name": "constant.numeric.exponent.hexadecimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"9": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(\\G(?=[0-9.])(?!0[xXbB]))([0-9](?:[0-9]|((?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)((?<!')([eE])(\\+?)(\\-?)((?:[0-9](?:[0-9]|(?:(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])))*)))?((?:(?:(?:(?:(?:[uU]|[uU]ll?)|[uU]LL?)|ll?[uU]?)|LL?[uU]?)|[fF])(?!\\w))?$",
-									"captures": {
-										"2": {
-											"name": "constant.numeric.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"3": {
-											"name": "punctuation.separator.constant.numeric.cpp"
-										},
-										"5": {
-											"name": "keyword.other.unit.exponent.decimal.cpp"
-										},
-										"6": {
-											"name": "keyword.operator.plus.exponent.decimal.cpp"
-										},
-										"7": {
-											"name": "keyword.operator.minus.exponent.decimal.cpp"
-										},
-										"8": {
-											"name": "constant.numeric.exponent.decimal.cpp",
-											"patterns": [
-												{
-													"match": "(?<=[0-9a-fA-F])'(?=[0-9a-fA-F])",
-													"name": "punctuation.separator.constant.numeric.cpp"
-												}
-											]
-										},
-										"9": {
-											"name": "keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
-									"name": "invalid.illegal.constant.numeric.cpp"
-								}
-							]
-						}
-					]
+		"preprocessor_context": {
+			"patterns": [
+				{
+					"include": "#pragma_mark"
+				},
+				{
+					"include": "#pragma"
+				},
+				{
+					"include": "#include"
+				},
+				{
+					"include": "#line"
+				},
+				{
+					"include": "#diagnostic"
+				},
+				{
+					"include": "#undef"
+				},
+				{
+					"include": "#preprocessor_conditional_range"
+				},
+				{
+					"include": "#single_line_macro"
+				},
+				{
+					"include": "#macro"
+				},
+				{
+					"include": "#preprocessor_conditional_standalone"
+				},
+				{
+					"include": "#macro_argument"
 				}
-			}
+			]
 		},
 		"primitive_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:unsigned|wchar_t|double|signed|short|float|auto|void|long|char|bool|int)(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:unsigned)|(?:wchar_t)|(?:double)|(?:signed)|(?:short)|(?:float)|(?:auto)|(?:void)|(?:long)|(?:char)|(?:bool)|(?:int))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -10551,30 +13207,39 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "storage.type.primitive.cpp storage.type.built-in.primitive.cpp"
 				}
 			}
 		},
 		"pthread_types": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\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))",
+			"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": [
@@ -10584,36 +13249,44 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "support.type.posix-reserved.pthread.cpp support.type.built-in.posix-reserved.pthread.cpp"
 				}
 			}
 		},
 		"qualified_type": {
-			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<26>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<26>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<26>?)+)>)\\s*)?(?![\\w<:.])",
+			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<18>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.])",
 			"captures": {
 				"0": {
-					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -10638,7 +13311,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -10664,59 +13354,98 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"7": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"8": {
-					"name": "comment.block.cpp"
-				},
-				"9": {
+				"5": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"11": {
+				"6": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"12": {
+				"7": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"14": {
+				"8": {
+					"patterns": [
+						{
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
+						}
+					]
+				},
+				"10": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"11": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -10724,8 +13453,45 @@
 						}
 					]
 				},
+				"13": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"14": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"15": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"16": {
-					"name": "entity.name.scope-resolution.cpp"
+					"name": "entity.name.type.cpp"
 				},
 				"17": {
 					"name": "meta.template.call.cpp",
@@ -10734,50 +13500,12 @@
 							"include": "#template_call_range"
 						}
 					]
-				},
-				"19": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
-				},
-				"20": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"21": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"22": {
-					"name": "comment.block.cpp"
-				},
-				"23": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"24": {
-					"name": "entity.name.type.cpp"
-				},
-				"25": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
 				}
-			}
+			},
+			"name": "meta.qualified_type.cpp"
 		},
 		"qualifiers_and_specifiers_post_parameters": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:override|volatile|noexcept|final|const)(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r])))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w)(?=\\s*(?:(?:\\{|;)|[\\n\\r])))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -10787,30 +13515,39 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"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"
+				"3": {
+					"name": "storage.modifier.specifier.functional.post-parameters.$3.cpp"
 				}
 			}
 		},
 		"scope_resolution": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -10822,18 +13559,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_function_call": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -10845,18 +13592,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_function_call_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -10868,18 +13625,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.function.call.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -10887,13 +13655,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.call.cpp"
 				}
 			}
 		},
 		"scope_resolution_function_definition": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -10905,18 +13674,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_function_definition_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -10928,18 +13707,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.function.definition.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -10947,13 +13737,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.cpp"
 				}
 			}
 		},
 		"scope_resolution_function_definition_operator_overload": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -10965,18 +13756,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_function_definition_operator_overload_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -10988,18 +13789,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.function.definition.operator-overload.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11007,13 +13819,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.function.definition.operator-overload.cpp"
 				}
 			}
 		},
 		"scope_resolution_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11025,18 +13838,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11044,13 +13868,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				}
 			}
 		},
 		"scope_resolution_namespace_alias": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11062,18 +13887,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_namespace_alias_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11085,18 +13920,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.namespace.alias.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11104,13 +13950,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.alias.cpp"
 				}
 			}
 		},
 		"scope_resolution_namespace_block": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11122,18 +13969,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_namespace_block_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11145,18 +14002,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.namespace.block.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11164,13 +14032,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.block.cpp"
 				}
 			}
 		},
 		"scope_resolution_namespace_using": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11182,18 +14051,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_namespace_using_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11205,18 +14084,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.namespace.using.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11224,13 +14114,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
 				}
 			}
 		},
 		"scope_resolution_parameter": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11242,18 +14133,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_parameter_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11265,18 +14166,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.parameter.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11284,13 +14196,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.parameter.cpp"
 				}
 			}
 		},
 		"scope_resolution_template_call": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11302,18 +14215,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_template_call_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11325,18 +14248,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.template.call.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11344,13 +14278,14 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.call.cpp"
 				}
 			}
 		},
 		"scope_resolution_template_definition": {
-			"match": "(::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<4>?)+)>)\\s*)?::)*\\s*+",
+			"match": "(::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<3>?)+>)(?:(?:\\s)+)?)?::)*)\\s*+",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11362,18 +14297,28 @@
 				"1": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
 				},
-				"3": {
-					"name": "meta.template.call.cpp",
+				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				}
 			}
 		},
 		"scope_resolution_template_definition_inner_generated": {
-			"match": "((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<8>?)+)>)\\s*)?(::)",
+			"match": "((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<7>?)+>)(?:(?:\\s)+)?)?(::)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11385,18 +14330,29 @@
 				"2": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
 				},
-				"4": {
-					"name": "meta.template.call.cpp",
+				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {},
+				"5": {
 					"name": "entity.name.scope-resolution.template.definition.cpp"
 				},
-				"7": {
+				"6": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11404,7 +14360,8 @@
 						}
 					]
 				},
-				"9": {
+				"7": {},
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.template.definition.cpp"
 				}
 			}
@@ -11414,13 +14371,13 @@
 			"name": "punctuation.terminator.statement.cpp"
 		},
 		"simple_type": {
-			"match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?",
+			"match": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<19>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))(((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))?(?:(?:&|(?:\\*))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:&|(?:\\*)))?",
 			"captures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -11445,7 +14402,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -11471,59 +14445,99 @@
 					]
 				},
 				"4": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"5": {
-					"name": "comment.block.cpp"
-				},
-				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"9": {
-					"name": "comment.block.cpp"
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"12": {
+				"7": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"13": {
+				"8": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"15": {
+				"9": {
+					"patterns": [
+						{
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
+						}
+					]
+				},
+				"10": {},
+				"11": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"12": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -11531,8 +14545,46 @@
 						}
 					]
 				},
+				"13": {},
+				"14": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"15": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"16": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"17": {
-					"name": "entity.name.scope-resolution.cpp"
+					"name": "entity.name.type.cpp"
 				},
 				"18": {
 					"name": "meta.template.call.cpp",
@@ -11542,53 +14594,15 @@
 						}
 					]
 				},
+				"19": {},
 				"20": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": "entity.name.type.cpp"
-				},
-				"26": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"28": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -11624,60 +14638,78 @@
 						}
 					]
 				},
-				"29": {
+				"21": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"31": {
-					"name": "comment.block.cpp"
-				},
-				"32": {
+				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"33": {
+				"23": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"34": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"35": {
-					"name": "comment.block.cpp"
-				},
-				"36": {
+				"24": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"single_line_macro": {
-			"match": "^((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))#define.*(?<![\\\\])(?:\\n|$)",
+			"match": "^((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))#define.*(?<![\\\\])(?:(?:\\n)|$)",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -11697,28 +14729,37 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"sizeof_operator": {
-			"contentName": "meta.arguments.operator.sizeof.cpp",
-			"begin": "((?<!\\w)sizeof(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)sizeof(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
@@ -11752,12 +14793,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.sizeof",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -11765,8 +14806,8 @@
 			]
 		},
 		"sizeof_variadic_operator": {
-			"contentName": "meta.arguments.operator.sizeof.variadic.cpp",
-			"begin": "(\\bsizeof\\.\\.\\.)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "(\\bsizeof\\.\\.\\.)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.variadic.cpp"
@@ -11800,12 +14841,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.variadic.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.variadic.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.sizeof.variadic",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -11813,20 +14854,20 @@
 			]
 		},
 		"square_brackets": {
-			"name": "meta.bracket.square.access.cpp",
+			"name": "meta.bracket.square.access",
 			"begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))?(\\[)(?!\\])",
 			"beginCaptures": {
 				"1": {
-					"name": "variable.other.object.cpp"
+					"name": "variable.other.object"
 				},
 				"2": {
-					"name": "punctuation.definition.begin.bracket.square.cpp"
+					"name": "punctuation.definition.begin.bracket.square"
 				}
 			},
 			"end": "\\]",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.end.bracket.square.cpp"
+					"name": "punctuation.definition.end.bracket.square"
 				}
 			},
 			"patterns": [
@@ -11838,21 +14879,918 @@
 		"standard_declares": {
 			"patterns": [
 				{
-					"include": "#struct_declare"
+					"match": "((?<!\\w)struct(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.struct.cpp"
+						},
+						"5": {
+							"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"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"7": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"8": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				},
 				{
-					"include": "#union_declare"
+					"match": "((?<!\\w)union(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.union.cpp"
+						},
+						"5": {
+							"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"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"7": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"8": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				},
 				{
-					"include": "#enum_declare"
+					"match": "((?<!\\w)enum(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.enum.cpp"
+						},
+						"5": {
+							"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"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"7": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"8": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				},
 				{
-					"include": "#class_declare"
+					"match": "((?<!\\w)class(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.type.class.cpp"
+						},
+						"5": {
+							"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"
+								}
+							]
+						},
+						"6": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"7": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"8": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"9": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"10": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"11": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						},
+						"12": {
+							"name": "variable.other.object.declare.cpp"
+						},
+						"13": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"14": {
+							"patterns": [
+								{
+									"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"patterns": [
+												{
+													"match": "\\*\\/",
+													"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+												},
+												{
+													"match": "\\*",
+													"name": "comment.block.cpp"
+												}
+											]
+										}
+									}
+								}
+							]
+						}
+					}
 				}
 			]
 		},
 		"static_assert": {
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -11911,22 +15849,22 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.static_assert.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.static_assert.cpp"
 				}
 			},
 			"patterns": [
 				{
-					"name": "meta.static_assert.message.cpp",
-					"begin": "(,)\\s*(?=(?:L|u8|u|U\\s*\\\")?)",
+					"begin": "(,)(?:(?:\\s)+)?(?=(?:L|u8|u|U(?:(?:\\s)+)?\\\")?)",
+					"end": "(?=\\))",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.separator.delimiter.comma.cpp"
 						}
 					},
-					"end": "(?=\\))",
+					"endCaptures": {},
+					"name": "meta.static_assert.message.cpp",
 					"patterns": [
 						{
 							"include": "#string_context"
@@ -11938,8 +15876,47 @@
 				}
 			]
 		},
+		"std_space": {
+			"match": "(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"1": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				}
+			}
+		},
 		"storage_specifiers": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:volatile|register|restrict|static|extern|const)(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -11949,25 +15926,34 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
-					"name": "storage.modifier.specifier.$5.cpp"
+				"3": {
+					"name": "storage.modifier.specifier.$3.cpp"
 				}
 			}
 		},
@@ -11999,22 +15985,22 @@
 		"string_context": {
 			"patterns": [
 				{
-					"name": "string.quoted.double.cpp",
-					"begin": "(((?:u|u8|U|L)?)\")",
+					"begin": "((?:u|u8|U|L)?)\"",
+					"end": "\"",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
 						},
-						"2": {
+						"1": {
 							"name": "meta.encoding.cpp"
 						}
 					},
-					"end": "(\")",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
+					"name": "string.quoted.double.cpp",
 					"patterns": [
 						{
 							"match": "(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8})",
@@ -12029,7 +16015,7 @@
 							"name": "constant.character.escape.cpp"
 						},
 						{
-							"match": "\\\\x[0-9a-fA-F]{2,2}",
+							"match": "\\\\x[0-9a-fA-F]{2}",
 							"name": "constant.character.escape.cpp"
 						},
 						{
@@ -12038,22 +16024,22 @@
 					]
 				},
 				{
-					"name": "string.quoted.single.cpp",
-					"begin": "((?<![0-9A-Fa-f])((?:u|u8|U|L)?)')",
+					"begin": "(?<![0-9A-Fa-f])((?:u|u8|U|L)?)'",
+					"end": "'",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
 						},
-						"2": {
+						"1": {
 							"name": "meta.encoding.cpp"
 						}
 					},
-					"end": "(')",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
+					"name": "string.quoted.single.cpp",
 					"patterns": [
 						{
 							"include": "#string_escapes_context_c"
@@ -12064,183 +16050,180 @@
 					]
 				},
 				{
+					"begin": "((?:[uUL]8?)?R)\\\"(?:(?:_r|re)|regex)\\(",
+					"end": "\\)(?:(?:_r|re)|regex)\\\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.double.raw.regex.cpp",
 					"patterns": [
 						{
-							"name": "string.quoted.double.raw.regex.cpp",
-							"begin": "(((?:[uUL]8?)?R)\\\"(?:(?:_r|re)|regex)\\()",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.begin.cpp"
-								},
-								"2": {
-									"name": "meta.encoding.cpp"
-								}
-							},
-							"end": "(\\)(?:(?:_r|re)|regex)\\\")",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.end.cpp"
-								}
-							},
-							"patterns": [
-								{
-									"include": "source.regexp.python"
-								}
-							]
-						},
-						{
-							"name": "string.quoted.double.raw.sql.cpp",
-							"begin": "(((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\()",
-							"beginCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.begin.cpp"
-								},
-								"2": {
-									"name": "meta.encoding.cpp"
-								}
-							},
-							"end": "(\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\")",
-							"endCaptures": {
-								"1": {
-									"name": "punctuation.definition.string.end.cpp"
-								}
-							},
-							"patterns": [
-								{
-									"include": "source.sql"
-								}
-							]
-						},
-						{
-							"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"
+							"include": "source.regexp.python"
 						}
 					]
+				},
+				{
+					"begin": "((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
+					"end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\"",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.cpp"
+						},
+						"1": {
+							"name": "meta.encoding.cpp"
+						}
+					},
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.cpp"
+						}
+					},
+					"name": "string.quoted.double.raw.sql.cpp",
+					"patterns": [
+						{
+							"include": "source.sql"
+						}
+					]
+				},
+				{
+					"begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin"
+						},
+						"1": {
+							"name": "meta.encoding"
+						},
+						"3": {
+							"name": "invalid.illegal.delimiter-too-long"
+						}
+					},
+					"end": "\\)\\2(\\3)\"",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end"
+						},
+						"1": {
+							"name": "invalid.illegal.delimiter-too-long"
+						}
+					},
+					"name": "string.quoted.double.raw"
 				}
 			]
 		},
 		"string_escapes_context_c": {
 			"patterns": [
 				{
-					"include": "#backslash_escapes"
+					"match": "(?x)\\\\ (\n\\\\\t\t\t |\n[abefnprtv'\"?]   |\n[0-3][0-7]{,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"
 				},
 				{
 					"match": "\\\\.",
-					"name": "invalid.illegal.unknown-escape.cpp"
+					"name": "invalid.illegal.unknown-escape"
 				},
 				{
-					"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"
+					"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"
 				}
 			]
 		},
 		"struct_block": {
-			"name": "meta.block.struct.cpp",
-			"begin": "((((?<!\\w)struct(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+			"begin": "((?<!\\w)struct(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.struct.cpp"
 				},
-				"3": {
-					"name": "storage.type.$3.cpp"
+				"1": {
+					"name": "storage.type.$1.cpp"
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"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": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
 				"12": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"13": {
-					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-				},
-				"14": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"15": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -12252,7 +16235,7 @@
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -12262,76 +16245,76 @@
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"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.$1.cpp"
+				},
 				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"23": {
-					"name": "entity.name.type.$3.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"25": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"26": {
-					"name": "comment.block.cpp"
+					"name": "storage.type.modifier.final.cpp"
 				},
 				"27": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"28": {
-					"name": "storage.type.modifier.final.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"31": {
-					"name": "comment.block.cpp"
-				},
-				"32": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -12343,20 +16326,20 @@
 						}
 					]
 				},
-				"33": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"34": {
+				"32": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -12368,18 +16351,10 @@
 						}
 					]
 				},
-				"37": {
+				"35": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inheritance_context"
-						}
-					]
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -12388,16 +16363,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.struct.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.struct.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
 						}
 					},
+					"name": "meta.head.struct.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -12411,14 +16388,15 @@
 					]
 				},
 				{
-					"name": "meta.body.struct.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
 						}
 					},
+					"name": "meta.body.struct.cpp",
 					"patterns": [
 						{
 							"include": "#function_pointer"
@@ -12438,9 +16416,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.struct.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -12450,7 +16430,7 @@
 			]
 		},
 		"struct_declare": {
-			"match": "((?<!\\w)struct(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
+			"match": "((?<!\\w)struct(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
@@ -12463,34 +16443,43 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.struct.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -12526,6 +16515,40 @@
 						}
 					]
 				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"8": {
 					"patterns": [
 						{
@@ -12534,106 +16557,108 @@
 					]
 				},
 				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"10": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.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": {
-					"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": "variable.other.object.declare.cpp"
 				},
-				"21": {
+				"13": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
-					"name": "comment.block.cpp"
-				},
-				"24": {
+				"14": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"switch_conditional_parentheses": {
-			"name": "meta.conditional.switch.cpp",
-			"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -12664,12 +16689,12 @@
 					"name": "punctuation.section.parens.begin.bracket.round.conditional.switch.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.parens.end.bracket.round.conditional.switch.cpp"
 				}
 			},
+			"name": "meta.conditional.switch.cpp",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -12680,26 +16705,26 @@
 			]
 		},
 		"switch_statement": {
-			"name": "meta.block.switch.cpp",
-			"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
+			"begin": "((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)switch(?!\\w))",
+			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.switch.cpp"
 				},
-				"2": {
+				"1": {
 					"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": "\\*\\/",
@@ -12711,21 +16736,23 @@
 						}
 					]
 				},
-				"6": {
+				"5": {
 					"name": "keyword.control.switch.cpp"
 				}
 			},
-			"end": "(?:(?<=\\}|%>|\\?\\?>)|(?=[;>\\[\\]=]))",
+			"endCaptures": {},
+			"name": "meta.block.switch.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.switch.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.switch.cpp"
 						}
 					},
+					"name": "meta.head.switch.cpp",
 					"patterns": [
 						{
 							"include": "#switch_conditional_parentheses"
@@ -12736,14 +16763,15 @@
 					]
 				},
 				{
-					"name": "meta.body.switch.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.switch.cpp"
 						}
 					},
+					"name": "meta.body.switch.cpp",
 					"patterns": [
 						{
 							"include": "#default_statement"
@@ -12760,9 +16788,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.switch.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -12772,7 +16802,7 @@
 			]
 		},
 		"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*([=])",
+			"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"
@@ -12820,32 +16850,32 @@
 			]
 		},
 		"template_call_innards": {
-			"match": "((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<1>?)+)>)\\s*",
+			"match": "((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<1>?)+>)(?:(?:\\s)+)?",
 			"captures": {
 				"0": {
-					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
 							"include": "#template_call_range"
 						}
 					]
 				}
-			}
+			},
+			"name": "meta.template.call.cpp"
 		},
 		"template_call_range": {
-			"name": "meta.template.call.cpp",
-			"begin": "(<)",
+			"begin": "<",
+			"end": ">",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
 				}
 			},
-			"end": "(>)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.angle-brackets.end.template.call.cpp"
 				}
 			},
+			"name": "meta.template.call.cpp",
 			"patterns": [
 				{
 					"include": "#template_call_context"
@@ -12853,8 +16883,8 @@
 			]
 		},
 		"template_definition": {
-			"name": "meta.template.definition.cpp",
-			"begin": "(?<!\\w)(template)\\s*(<)",
+			"begin": "(?<!\\w)(template)(?:(?:\\s)+)?(<)",
+			"end": ">",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.type.template.cpp"
@@ -12863,23 +16893,23 @@
 					"name": "punctuation.section.angle-brackets.start.template.definition.cpp"
 				}
 			},
-			"end": "(>)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.angle-brackets.end.template.definition.cpp"
 				}
 			},
+			"name": "meta.template.definition.cpp",
 			"patterns": [
 				{
-					"begin": "((?<=\\w)\\s*<)",
+					"begin": "(?<=\\w)(?:(?:\\s)+)?<",
+					"end": ">",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
 						}
 					},
-					"end": "(>)",
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
 						}
 					},
@@ -12895,7 +16925,7 @@
 			]
 		},
 		"template_definition_argument": {
-			"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}))*)|((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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*(?:(,)|(?=>|$))",
+			"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": [
@@ -12905,27 +16935,36 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
-					"name": "storage.type.template.argument.$5.cpp"
+				"3": {
+					"name": "storage.type.template.argument.$3.cpp"
 				},
-				"6": {
+				"4": {
 					"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}))*",
@@ -12933,19 +16972,19 @@
 						}
 					]
 				},
-				"7": {
+				"5": {
 					"name": "entity.name.type.template.cpp"
 				},
-				"8": {
+				"6": {
 					"name": "storage.type.template.cpp"
 				},
-				"9": {
+				"7": {
 					"name": "punctuation.vararg-ellipses.template.definition.cpp"
 				},
-				"10": {
+				"8": {
 					"name": "entity.name.type.template.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "punctuation.separator.delimiter.comma.template.argument.cpp"
 				}
 			}
@@ -12970,7 +17009,7 @@
 			]
 		},
 		"template_isolated_definition": {
-			"match": "(?<!\\w)(template)\\s*(<)(.*)(>\\s*$)",
+			"match": "(?<!\\w)(template)(?:(?:\\s)+)?(<)(.*)(>(?:(?:\\s)+)?$)",
 			"captures": {
 				"1": {
 					"name": "storage.type.template.cpp"
@@ -12992,16 +17031,15 @@
 			}
 		},
 		"ternary_operator": {
-			"applyEndPatternLast": true,
-			"begin": "(\\?)",
+			"begin": "\\?",
+			"end": ":",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.operator.ternary.cpp"
 				}
 			},
-			"end": "(:)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "keyword.operator.ternary.cpp"
 				}
 			},
@@ -13081,9 +17119,6 @@
 				{
 					"include": "#square_brackets"
 				},
-				{
-					"include": "#empty_square_brackets"
-				},
 				{
 					"include": "#semicolon"
 				},
@@ -13093,7 +17128,7 @@
 			]
 		},
 		"the_this_keyword": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)this(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)this(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13103,30 +17138,39 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "variable.language.this.cpp"
 				}
 			}
 		},
 		"type_alias": {
-			"match": "(using)\\s*(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(?![\\w<:.]))\\s*(\\=)\\s*((?:typename)?)\\s*((?:(?:(?>(?:(?:(?>(?<!\\s)\\s+)|(?:\\/\\*)(?:(?>(?:[^\\*]|(?>\\*+)[^\\/])*)(?:(?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?<!\\w)(?:volatile|register|restrict|static|extern|const)(?!\\w))\\s+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<58>?)+)>)\\s*)?(?![\\w<:.]))|(.*(?<!;)))(?:(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:(\\[)(\\w*)(\\])\\s*)?\\s*(?:(;)|\\n)",
+			"match": "(using)(?:(?:\\s)+)?(?!namespace)(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<43>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<43>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<43>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))(?:(?:\\s)+)?(\\=)(?:(?:\\s)+)?((?:typename)?)(?:(?:\\s)+)?((?:(?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))(?<!\\w)(?:(?:volatile)|(?:register)|(?:restrict)|(?:static)|(?:extern)|(?:const))(?!\\w)(?:\\s)+)+)?(?:(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<43>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<43>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<43>?)+>)(?:(?:\\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"
@@ -13135,7 +17179,7 @@
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -13160,7 +17204,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -13186,59 +17247,98 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"8": {
+				"6": {
 					"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"13": {
+				"8": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"14": {
+				"9": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"16": {
+				"10": {
+					"patterns": [
+						{
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
+						}
+					]
+				},
+				"12": {
+					"name": "entity.name.scope-resolution.cpp"
+				},
+				"13": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -13246,8 +17346,45 @@
 						}
 					]
 				},
+				"15": {
+					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
+				},
+				"16": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"17": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"18": {
-					"name": "entity.name.scope-resolution.cpp"
+					"name": "entity.name.type.cpp"
 				},
 				"19": {
 					"name": "meta.template.call.cpp",
@@ -13258,62 +17395,50 @@
 					]
 				},
 				"21": {
-					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.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": {
-					"name": "entity.name.type.cpp"
-				},
-				"27": {
-					"name": "meta.template.call.cpp",
-					"patterns": [
-						{
-							"include": "#template_call_range"
-						}
-					]
-				},
-				"29": {
 					"name": "keyword.operator.assignment.cpp"
 				},
-				"30": {
+				"22": {
 					"name": "keyword.other.typename.cpp"
 				},
-				"31": {
+				"23": {
 					"patterns": [
 						{
 							"include": "#storage_specifiers"
 						}
 					]
 				},
-				"32": {
+				"24": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"25": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -13338,7 +17463,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -13346,7 +17488,7 @@
 						}
 					]
 				},
-				"33": {
+				"26": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -13356,78 +17498,106 @@
 						}
 					]
 				},
-				"34": {
+				"27": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"35": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"36": {
-					"name": "comment.block.cpp"
-				},
-				"37": {
+				"28": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"38": {
+				"29": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"39": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"40": {
-					"name": "comment.block.cpp"
-				},
-				"41": {
+				"30": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"43": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"44": {
+				"32": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"46": {
-					"name": "meta.template.call.cpp",
+				"33": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"48": {
+				"35": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"49": {
+				"36": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -13435,38 +17605,47 @@
 						}
 					]
 				},
-				"51": {
+				"38": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"52": {
+				"39": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"53": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"54": {
-					"name": "comment.block.cpp"
-				},
-				"55": {
+				"40": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"56": {
+				"41": {
 					"name": "entity.name.type.cpp"
 				},
-				"57": {
+				"42": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -13474,7 +17653,7 @@
 						}
 					]
 				},
-				"59": {
+				"44": {
 					"name": "meta.declaration.type.alias.value.unknown.cpp",
 					"patterns": [
 						{
@@ -13482,14 +17661,14 @@
 						}
 					]
 				},
-				"60": {
+				"45": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -13525,102 +17704,129 @@
 						}
 					]
 				},
-				"61": {
+				"46": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"62": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"63": {
-					"name": "comment.block.cpp"
-				},
-				"64": {
+				"47": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"65": {
+				"48": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"66": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"67": {
-					"name": "comment.block.cpp"
-				},
-				"68": {
+				"49": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"69": {
+				"50": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"70": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"71": {
-					"name": "comment.block.cpp"
-				},
-				"72": {
+				"51": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"73": {
+				"52": {
 					"name": "punctuation.definition.begin.bracket.square.cpp"
 				},
-				"74": {
+				"53": {
 					"patterns": [
 						{
 							"include": "#evaluation_context"
 						}
 					]
 				},
-				"75": {
+				"54": {
 					"name": "punctuation.definition.end.bracket.square.cpp"
 				},
-				"76": {
+				"55": {
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
 			"name": "meta.declaration.type.alias.cpp"
 		},
 		"type_casting_operators": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)(?:reinterpret_cast|dynamic_cast|static_cast|const_cast)(?!\\w))",
+			"match": "((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))((?<!\\w)(?:(?:reinterpret_cast)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast))(?!\\w))",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -13630,124 +17836,134 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"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"
+				"3": {
+					"name": "keyword.operator.wordlike.cpp keyword.operator.cast.$3.cpp"
 				}
 			}
 		},
 		"typedef_class": {
-			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)class(?!\\w))",
+			"begin": "((?<!\\w)typedef(?!\\w))(?:(?:\\s)+)?(?=(?<!\\w)class(?!\\w))",
+			"end": "(?<=;)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.block.class.cpp",
-					"begin": "((((?<!\\w)class(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+					"begin": "((?<!\\w)class(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.head.class.cpp"
 						},
-						"3": {
-							"name": "storage.type.$3.cpp"
+						"1": {
+							"name": "storage.type.$1.cpp"
 						},
-						"4": {
+						"2": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"5": {
+						"3": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"6": {
+						"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": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
 						"7": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"8": {
-							"patterns": [
-								{
-									"include": "#attributes_context"
-								},
-								{
-									"include": "#number_literal"
-								}
-							]
-						},
-						"9": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"10": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"11": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
+						"10": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"11": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
 						"12": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"13": {
-							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-						},
-						"14": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"15": {
+						"13": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"16": {
+						"14": {
 							"name": "comment.block.cpp"
 						},
-						"17": {
+						"15": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -13759,7 +17975,7 @@
 								}
 							]
 						},
-						"18": {
+						"16": {
 							"patterns": [
 								{
 									"include": "#attributes_context"
@@ -13769,76 +17985,76 @@
 								}
 							]
 						},
-						"19": {
+						"17": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"20": {
+						"18": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"21": {
+						"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.$1.cpp"
+						},
 						"22": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"23": {
-							"name": "entity.name.type.$3.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"24": {
+							"name": "comment.block.cpp"
+						},
+						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
 								}
 							]
 						},
-						"25": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
 						"26": {
-							"name": "comment.block.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"27": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"28": {
-							"name": "storage.type.modifier.final.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"29": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"31": {
-							"name": "comment.block.cpp"
-						},
-						"32": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -13850,20 +18066,20 @@
 								}
 							]
 						},
-						"33": {
+						"31": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"34": {
+						"32": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"35": {
+						"33": {
 							"name": "comment.block.cpp"
 						},
-						"36": {
+						"34": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -13875,18 +18091,10 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
-						},
-						"38": {
-							"patterns": [
-								{
-									"include": "#inheritance_context"
-								}
-							]
 						}
 					},
-					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
@@ -13895,16 +18103,18 @@
 							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
+					"name": "meta.block.class.cpp",
 					"patterns": [
 						{
-							"name": "meta.head.class.cpp",
 							"begin": "\\G ?",
-							"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+							"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
 								}
 							},
+							"name": "meta.head.class.cpp",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -13918,14 +18128,15 @@
 							]
 						},
 						{
-							"name": "meta.body.class.cpp",
 							"begin": "(?<=\\{|<%|\\?\\?<)",
-							"end": "(\\}|%>|\\?\\?>)",
+							"end": "\\}|%>|\\?\\?>",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.end.bracket.curly.class.cpp"
 								}
 							},
+							"name": "meta.body.class.cpp",
 							"patterns": [
 								{
 									"include": "#function_pointer"
@@ -13945,12 +18156,14 @@
 							]
 						},
 						{
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+							"end": "[\\s]*(?=;)",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"name": "meta.tail.class.cpp",
-							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": {
 										"1": {
 											"patterns": [
@@ -13959,7 +18172,7 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
@@ -14085,22 +18298,24 @@
 			]
 		},
 		"typedef_function_pointer": {
-			"begin": "((?<!\\w)typedef(?!\\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*\\))",
+			"begin": "((?<!\\w)typedef(?!\\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*\\))",
+			"end": "(?<=;)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<27>?)+)>)\\s*)?(?![\\w<:.]))(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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*(\\()",
+					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\s)+)?)?(::))?((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<25>?)+>)(?:(?:\\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)+)?(\\()",
+					"end": "(\\))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?=[{=,);>]|\\n)(?!\\()",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
 							"patterns": [
 								{
-									"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+									"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 									"name": "storage.type.$0.cpp"
 								},
 								{
@@ -14125,7 +18340,24 @@
 									"include": "#scope_resolution_inner_generated"
 								},
 								{
-									"include": "#template_call_range"
+									"begin": "<",
+									"end": ">",
+									"beginCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"endCaptures": {
+										"0": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_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}))*",
@@ -14193,17 +18425,17 @@
 								}
 							]
 						},
-						"12": {
+						"11": {
 							"patterns": [
 								{
 									"include": "#scope_resolution_inner_generated"
 								}
 							]
 						},
-						"13": {
+						"12": {
 							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 						},
-						"15": {
+						"13": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -14211,10 +18443,11 @@
 								}
 							]
 						},
-						"17": {
+						"14": {},
+						"15": {
 							"name": "entity.name.scope-resolution.cpp"
 						},
-						"18": {
+						"16": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -14222,23 +18455,24 @@
 								}
 							]
 						},
-						"20": {
+						"17": {},
+						"18": {
 							"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 						},
-						"21": {
+						"19": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"22": {
+						"20": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"23": {
+						"21": {
 							"name": "comment.block.cpp"
 						},
-						"24": {
+						"22": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14250,10 +18484,10 @@
 								}
 							]
 						},
-						"25": {
+						"23": {
 							"name": "entity.name.type.cpp"
 						},
-						"26": {
+						"24": {
 							"name": "meta.template.call.cpp",
 							"patterns": [
 								{
@@ -14261,14 +18495,15 @@
 								}
 							]
 						},
-						"28": {
+						"25": {},
+						"26": {
 							"patterns": [
 								{
 									"match": "\\*",
 									"name": "storage.modifier.pointer.cpp"
 								},
 								{
-									"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+									"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 									"captures": {
 										"1": {
 											"patterns": [
@@ -14304,45 +18539,45 @@
 								}
 							]
 						},
-						"29": {
+						"27": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
+						"28": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"29": {
+							"name": "comment.block.cpp"
+						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
 						},
 						"31": {
-							"name": "comment.block.cpp"
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
 						},
 						"32": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"33": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"34": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"35": {
-							"name": "comment.block.cpp"
-						},
-						"36": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14354,20 +18589,20 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"38": {
+						"36": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"39": {
+						"37": {
 							"name": "comment.block.cpp"
 						},
-						"40": {
+						"38": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14379,36 +18614,35 @@
 								}
 							]
 						},
-						"41": {
+						"39": {
 							"name": "punctuation.section.parens.begin.bracket.round.function.pointer.cpp"
 						},
-						"42": {
+						"40": {
 							"name": "punctuation.definition.function.pointer.dereference.cpp"
 						},
-						"43": {
+						"41": {
 							"name": "entity.name.type.alias.cpp entity.name.type.pointer.function.cpp"
 						},
-						"44": {
+						"42": {
 							"name": "punctuation.definition.begin.bracket.square.cpp"
 						},
-						"45": {
+						"43": {
 							"patterns": [
 								{
 									"include": "#evaluation_context"
 								}
 							]
 						},
-						"46": {
+						"44": {
 							"name": "punctuation.definition.end.bracket.square.cpp"
 						},
-						"47": {
+						"45": {
 							"name": "punctuation.section.parens.end.bracket.round.function.pointer.cpp"
 						},
-						"48": {
+						"46": {
 							"name": "punctuation.section.parameters.begin.bracket.round.function.pointer.cpp"
 						}
 					},
-					"end": "(\\))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=[{=,);]|\\n)(?!\\()",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.section.parameters.end.bracket.round.function.pointer.cpp"
@@ -14447,135 +18681,103 @@
 				}
 			]
 		},
-		"typedef_keyword": {
-			"match": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)typedef(?!\\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": "keyword.other.$5.cpp"
-				}
-			}
-		},
 		"typedef_struct": {
-			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)struct(?!\\w))",
+			"begin": "((?<!\\w)typedef(?!\\w))(?:(?:\\s)+)?(?=(?<!\\w)struct(?!\\w))",
+			"end": "(?<=;)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.block.struct.cpp",
-					"begin": "((((?<!\\w)struct(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+					"begin": "((?<!\\w)struct(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.head.struct.cpp"
 						},
-						"3": {
-							"name": "storage.type.$3.cpp"
+						"1": {
+							"name": "storage.type.$1.cpp"
 						},
-						"4": {
+						"2": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"5": {
+						"3": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"6": {
+						"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": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
 						"7": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"8": {
-							"patterns": [
-								{
-									"include": "#attributes_context"
-								},
-								{
-									"include": "#number_literal"
-								}
-							]
-						},
-						"9": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"10": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"11": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
+						"10": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"11": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
 						"12": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"13": {
-							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-						},
-						"14": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"15": {
+						"13": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"16": {
+						"14": {
 							"name": "comment.block.cpp"
 						},
-						"17": {
+						"15": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14587,7 +18789,7 @@
 								}
 							]
 						},
-						"18": {
+						"16": {
 							"patterns": [
 								{
 									"include": "#attributes_context"
@@ -14597,76 +18799,76 @@
 								}
 							]
 						},
-						"19": {
+						"17": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"20": {
+						"18": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"21": {
+						"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.$1.cpp"
+						},
 						"22": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"23": {
-							"name": "entity.name.type.$3.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"24": {
+							"name": "comment.block.cpp"
+						},
+						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
 								}
 							]
 						},
-						"25": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
 						"26": {
-							"name": "comment.block.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"27": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"28": {
-							"name": "storage.type.modifier.final.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"29": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"31": {
-							"name": "comment.block.cpp"
-						},
-						"32": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14678,20 +18880,20 @@
 								}
 							]
 						},
-						"33": {
+						"31": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"34": {
+						"32": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"35": {
+						"33": {
 							"name": "comment.block.cpp"
 						},
-						"36": {
+						"34": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -14703,18 +18905,10 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
-						},
-						"38": {
-							"patterns": [
-								{
-									"include": "#inheritance_context"
-								}
-							]
 						}
 					},
-					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
@@ -14723,16 +18917,18 @@
 							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
+					"name": "meta.block.struct.cpp",
 					"patterns": [
 						{
-							"name": "meta.head.struct.cpp",
 							"begin": "\\G ?",
-							"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+							"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
 								}
 							},
+							"name": "meta.head.struct.cpp",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -14746,14 +18942,15 @@
 							]
 						},
 						{
-							"name": "meta.body.struct.cpp",
 							"begin": "(?<=\\{|<%|\\?\\?<)",
-							"end": "(\\}|%>|\\?\\?>)",
+							"end": "\\}|%>|\\?\\?>",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
 								}
 							},
+							"name": "meta.body.struct.cpp",
 							"patterns": [
 								{
 									"include": "#function_pointer"
@@ -14773,12 +18970,14 @@
 							]
 						},
 						{
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+							"end": "[\\s]*(?=;)",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"name": "meta.tail.struct.cpp",
-							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": {
 										"1": {
 											"patterns": [
@@ -14787,7 +18986,7 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
@@ -14913,101 +19112,102 @@
 			]
 		},
 		"typedef_union": {
-			"begin": "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)union(?!\\w))",
+			"begin": "((?<!\\w)typedef(?!\\w))(?:(?:\\s)+)?(?=(?<!\\w)union(?!\\w))",
+			"end": "(?<=;)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.typedef.cpp"
 				}
 			},
-			"end": "(?<=;)",
+			"endCaptures": {},
 			"patterns": [
 				{
-					"name": "meta.block.union.cpp",
-					"begin": "((((?<!\\w)union(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+					"begin": "((?<!\\w)union(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 					"beginCaptures": {
-						"1": {
+						"0": {
 							"name": "meta.head.union.cpp"
 						},
-						"3": {
-							"name": "storage.type.$3.cpp"
+						"1": {
+							"name": "storage.type.$1.cpp"
 						},
-						"4": {
+						"2": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"5": {
+						"3": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"6": {
+						"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": "#attributes_context"
+								},
+								{
+									"include": "#number_literal"
+								}
+							]
+						},
 						"7": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"8": {
-							"patterns": [
-								{
-									"include": "#attributes_context"
-								},
-								{
-									"include": "#number_literal"
-								}
-							]
-						},
-						"9": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
-						},
-						"10": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"11": {
+						"9": {
 							"name": "comment.block.cpp"
 						},
+						"10": {
+							"patterns": [
+								{
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
+								}
+							]
+						},
+						"11": {
+							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+						},
 						"12": {
-							"patterns": [
-								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
-								}
-							]
-						},
-						"13": {
-							"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-						},
-						"14": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"15": {
+						"13": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"16": {
+						"14": {
 							"name": "comment.block.cpp"
 						},
-						"17": {
+						"15": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -15019,7 +19219,7 @@
 								}
 							]
 						},
-						"18": {
+						"16": {
 							"patterns": [
 								{
 									"include": "#attributes_context"
@@ -15029,76 +19229,76 @@
 								}
 							]
 						},
-						"19": {
+						"17": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"20": {
+						"18": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"21": {
+						"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.$1.cpp"
+						},
 						"22": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"23": {
-							"name": "entity.name.type.$3.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"24": {
+							"name": "comment.block.cpp"
+						},
+						"25": {
 							"patterns": [
 								{
-									"include": "#inline_comment"
+									"match": "\\*\\/",
+									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+								},
+								{
+									"match": "\\*",
+									"name": "comment.block.cpp"
 								}
 							]
 						},
-						"25": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
 						"26": {
-							"name": "comment.block.cpp"
+							"name": "storage.type.modifier.final.cpp"
 						},
 						"27": {
 							"patterns": [
 								{
-									"match": "\\*\\/",
-									"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-								},
-								{
-									"match": "\\*",
-									"name": "comment.block.cpp"
+									"include": "#inline_comment"
 								}
 							]
 						},
 						"28": {
-							"name": "storage.type.modifier.final.cpp"
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
 						"29": {
-							"patterns": [
-								{
-									"include": "#inline_comment"
-								}
-							]
+							"name": "comment.block.cpp"
 						},
 						"30": {
-							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-						},
-						"31": {
-							"name": "comment.block.cpp"
-						},
-						"32": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -15110,20 +19310,20 @@
 								}
 							]
 						},
-						"33": {
+						"31": {
 							"patterns": [
 								{
 									"include": "#inline_comment"
 								}
 							]
 						},
-						"34": {
+						"32": {
 							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 						},
-						"35": {
+						"33": {
 							"name": "comment.block.cpp"
 						},
-						"36": {
+						"34": {
 							"patterns": [
 								{
 									"match": "\\*\\/",
@@ -15135,18 +19335,10 @@
 								}
 							]
 						},
-						"37": {
+						"35": {
 							"name": "punctuation.separator.colon.inheritance.cpp"
-						},
-						"38": {
-							"patterns": [
-								{
-									"include": "#inheritance_context"
-								}
-							]
 						}
 					},
-					"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
@@ -15155,16 +19347,18 @@
 							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
+					"name": "meta.block.union.cpp",
 					"patterns": [
 						{
-							"name": "meta.head.union.cpp",
 							"begin": "\\G ?",
-							"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+							"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
 								}
 							},
+							"name": "meta.head.union.cpp",
 							"patterns": [
 								{
 									"include": "#ever_present_context"
@@ -15178,14 +19372,15 @@
 							]
 						},
 						{
-							"name": "meta.body.union.cpp",
 							"begin": "(?<=\\{|<%|\\?\\?<)",
-							"end": "(\\}|%>|\\?\\?>)",
+							"end": "\\}|%>|\\?\\?>",
+							"beginCaptures": {},
 							"endCaptures": {
-								"1": {
+								"0": {
 									"name": "punctuation.section.block.end.bracket.curly.union.cpp"
 								}
 							},
+							"name": "meta.body.union.cpp",
 							"patterns": [
 								{
 									"include": "#function_pointer"
@@ -15205,12 +19400,14 @@
 							]
 						},
 						{
+							"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+							"end": "[\\s]*(?=;)",
+							"beginCaptures": {},
+							"endCaptures": {},
 							"name": "meta.tail.union.cpp",
-							"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-							"end": "[\\s\\n]*(?=;)",
 							"patterns": [
 								{
-									"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\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": {
 										"1": {
 											"patterns": [
@@ -15219,7 +19416,7 @@
 													"name": "storage.modifier.pointer.cpp"
 												},
 												{
-													"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+													"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 													"captures": {
 														"1": {
 															"patterns": [
@@ -15345,8 +19542,8 @@
 			]
 		},
 		"typeid_operator": {
-			"contentName": "meta.arguments.operator.typeid.cpp",
-			"begin": "((?<!\\w)typeid(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
+			"begin": "((?<!\\w)typeid(?!\\w))((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(\\()",
+			"end": "\\)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
@@ -15380,12 +19577,12 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp"
 				}
 			},
-			"end": "(\\))",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp"
 				}
 			},
+			"contentName": "meta.arguments.operator.typeid",
 			"patterns": [
 				{
 					"include": "#evaluation_context"
@@ -15393,7 +19590,7 @@
 			]
 		},
 		"typename": {
-			"match": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?<!\\w)typename(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?:(?:(?:unsigned|signed|short|long)|(?:struct|class|union|enum))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<36>?)+)>)\\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*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<36>?)+)>)\\s*)?(::))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?!(?:transaction_safe_dynamic|__has_cpp_attribute|transaction_safe|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|constexpr|consteval|protected|constexpr|co_return|namespace|constexpr|noexcept|typename|decltype|template|operator|noexcept|co_yield|co_await|continue|volatile|register|restrict|explicit|override|volatile|reflexpr|noexcept|requires|default|typedef|nullptr|alignof|mutable|concept|virtual|defined|__asm__|include|_Pragma|mutable|warning|private|alignas|module|switch|not_eq|bitand|and_eq|ifndef|return|sizeof|xor_eq|export|static|delete|public|define|extern|inline|import|pragma|friend|typeid|const|compl|bitor|throw|or_eq|while|catch|break|false|final|const|endif|ifdef|undef|error|using|audit|axiom|line|else|elif|true|NULL|case|goto|else|this|new|asm|not|and|xor|try|for|if|do|or|if)\\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(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<36>?)+)>)\\s*)?(?![\\w<:.]))",
+			"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)))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))*(?:((::)?((?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(?:((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<24>?)+>)(?:(?:\\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*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<24>?)+>)(?:(?:\\s)+)?)?(::))?((?:((?:(?>(?:\\s)+)|\\/\\*(?:[^\\*]|(?:\\*)++[^\\/])*+(?:\\*)++\\/)+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:atomic_cancel)|(?:__has_include)|(?:dynamic_cast)|(?:synchronized)|(?:thread_local)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:consteval)|(?:co_return)|(?:co_return)|(?:constexpr)|(?:protected)|(?:constexpr)|(?:namespace)|(?:noexcept)|(?:typename)|(?:decltype)|(?:template)|(?:operator)|(?:noexcept)|(?:co_yield)|(?:co_await)|(?:continue)|(?:co_await)|(?:co_yield)|(?:volatile)|(?:register)|(?:restrict)|(?:explicit)|(?:override)|(?:volatile)|(?:reflexpr)|(?:noexcept)|(?:requires)|(?:alignas)|(?:typedef)|(?:nullptr)|(?:alignof)|(?:mutable)|(?:concept)|(?:virtual)|(?:defined)|(?:__asm__)|(?:include)|(?:_Pragma)|(?:mutable)|(?:default)|(?:warning)|(?:private)|(?:module)|(?:return)|(?:not_eq)|(?:xor_eq)|(?:and_eq)|(?:ifndef)|(?:pragma)|(?:export)|(?:import)|(?:sizeof)|(?:static)|(?:delete)|(?:public)|(?:define)|(?:extern)|(?:inline)|(?:typeid)|(?:switch)|(?:friend)|(?:bitand)|(?:false)|(?:compl)|(?:bitor)|(?:throw)|(?:or_eq)|(?:while)|(?:catch)|(?:break)|(?:const)|(?:final)|(?:const)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:using)|(?:audit)|(?:axiom)|(?:line)|(?:else)|(?:elif)|(?:true)|(?:NULL)|(?:case)|(?:goto)|(?:else)|(?:this)|(?:new)|(?:asm)|(?:not)|(?:and)|(?:xor)|(?:try)|(?:for)|(?:if)|(?:do)|(?:or)|(?:if))\\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(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<24>?)+>)(?:(?:\\s)+)?)?(?![\\w<:.]))",
 			"captures": {
 				"1": {
 					"name": "storage.modifier.cpp"
@@ -15406,53 +19603,71 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"7": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"8": {
-					"name": "comment.block.cpp"
-				},
-				"9": {
+				"5": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"10": {
+				"6": {
 					"name": "meta.qualified_type.cpp",
 					"patterns": [
 						{
-							"match": "(?<!\\w)(?:struct|class|union|enum)(?!\\w)",
+							"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 							"name": "storage.type.$0.cpp"
 						},
 						{
@@ -15477,7 +19692,24 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"include": "#template_call_range"
+							"begin": "<",
+							"end": ">",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+								}
+							},
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+								}
+							},
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#template_call_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}))*",
@@ -15485,7 +19717,7 @@
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -15495,78 +19727,107 @@
 						}
 					]
 				},
+				"8": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"9": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
+				"10": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"11": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.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": {
-					"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"
-						}
-					]
-				},
-				"21": {
 					"patterns": [
 						{
 							"include": "#scope_resolution_inner_generated"
 						}
 					]
 				},
-				"22": {
+				"13": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"24": {
-					"name": "meta.template.call.cpp",
+				"14": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"match": "(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<2>?)+>)(?:(?:\\s)+)?)?::",
+							"captures": {
+								"1": {
+									"name": "meta.template.call.cpp",
+									"patterns": [
+										{
+											"include": "#template_call_range"
+										}
+									]
+								},
+								"2": {}
+							}
 						}
 					]
 				},
-				"26": {
+				"15": {},
+				"16": {
 					"name": "entity.name.scope-resolution.cpp"
 				},
-				"27": {
+				"17": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -15574,49 +19835,60 @@
 						}
 					]
 				},
-				"29": {
+				"18": {},
+				"19": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.cpp"
 				},
-				"30": {
+				"20": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"31": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"32": {
-					"name": "comment.block.cpp"
-				},
-				"33": {
+				"21": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"34": {
+				"22": {
 					"name": "entity.name.type.cpp"
 				},
-				"35": {
+				"23": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
 							"include": "#template_call_range"
 						}
 					]
-				}
+				},
+				"24": {}
 			}
 		},
 		"undef": {
-			"match": "((?:^)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(#)\\s*undef\\b)((?>(?:(?:(?>(?<!\\s)\\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)+)?undef\\b)((?:((?:(?>(?:\\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": {
 					"name": "keyword.control.directive.undef.cpp"
@@ -15629,144 +19901,162 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "punctuation.definition.directive.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"8": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"9": {
-					"name": "comment.block.cpp"
-				},
-				"10": {
+				"6": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"11": {
+				"7": {
 					"name": "entity.name.function.preprocessor.cpp"
 				}
 			},
 			"name": "meta.preprocessor.undef.cpp"
 		},
 		"union_block": {
-			"name": "meta.block.union.cpp",
-			"begin": "((((?<!\\w)union(?!\\w))(?:(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(DLLEXPORT)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(final)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))?(?:((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(:)((?>[^{]*)))?))",
+			"begin": "((?<!\\w)union(?!\\w))(?:(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))|((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\))))|(?={))(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(DLLEXPORT)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\(\\(.*?\\)\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:(?>(?:\\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)))(final)((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z))))?(?:((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))(:))?",
+			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)(?:(?:\\s)+)?(;)|(;))|(?=[;>\\[\\]=]))",
 			"beginCaptures": {
-				"1": {
+				"0": {
 					"name": "meta.head.union.cpp"
 				},
-				"3": {
-					"name": "storage.type.$3.cpp"
+				"1": {
+					"name": "storage.type.$1.cpp"
 				},
-				"4": {
+				"2": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"5": {
+				"3": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"6": {
+				"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": "#attributes_context"
+						},
+						{
+							"include": "#number_literal"
+						}
+					]
+				},
 				"7": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"8": {
-					"patterns": [
-						{
-							"include": "#attributes_context"
-						},
-						{
-							"include": "#number_literal"
-						}
-					]
-				},
-				"9": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
-				},
-				"10": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"11": {
+				"9": {
 					"name": "comment.block.cpp"
 				},
+				"10": {
+					"patterns": [
+						{
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
+						}
+					]
+				},
+				"11": {
+					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
+				},
 				"12": {
-					"patterns": [
-						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
-						}
-					]
-				},
-				"13": {
-					"name": "entity.name.other.preprocessor.macro.predefined.DLLEXPORT.cpp"
-				},
-				"14": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"15": {
+				"13": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"16": {
+				"14": {
 					"name": "comment.block.cpp"
 				},
-				"17": {
+				"15": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -15778,7 +20068,7 @@
 						}
 					]
 				},
-				"18": {
+				"16": {
 					"patterns": [
 						{
 							"include": "#attributes_context"
@@ -15788,76 +20078,76 @@
 						}
 					]
 				},
-				"19": {
+				"17": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"20": {
+				"18": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"21": {
+				"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.$1.cpp"
+				},
 				"22": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"23": {
-					"name": "entity.name.type.$3.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"24": {
+					"name": "comment.block.cpp"
+				},
+				"25": {
 					"patterns": [
 						{
-							"include": "#inline_comment"
+							"match": "\\*\\/",
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						{
+							"match": "\\*",
+							"name": "comment.block.cpp"
 						}
 					]
 				},
-				"25": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
 				"26": {
-					"name": "comment.block.cpp"
+					"name": "storage.type.modifier.final.cpp"
 				},
 				"27": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"include": "#inline_comment"
 						}
 					]
 				},
 				"28": {
-					"name": "storage.type.modifier.final.cpp"
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
 				"29": {
-					"patterns": [
-						{
-							"include": "#inline_comment"
-						}
-					]
+					"name": "comment.block.cpp"
 				},
 				"30": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"31": {
-					"name": "comment.block.cpp"
-				},
-				"32": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -15869,20 +20159,20 @@
 						}
 					]
 				},
-				"33": {
+				"31": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"34": {
+				"32": {
 					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
 				},
-				"35": {
+				"33": {
 					"name": "comment.block.cpp"
 				},
-				"36": {
+				"34": {
 					"patterns": [
 						{
 							"match": "\\*\\/",
@@ -15894,18 +20184,10 @@
 						}
 					]
 				},
-				"37": {
+				"35": {
 					"name": "punctuation.separator.colon.inheritance.cpp"
-				},
-				"38": {
-					"patterns": [
-						{
-							"include": "#inheritance_context"
-						}
-					]
 				}
 			},
-			"end": "(?:(?:(?<=\\}|%>|\\?\\?>)\\s*(;)|(;))|(?=[;>\\[\\]=]))",
 			"endCaptures": {
 				"1": {
 					"name": "punctuation.terminator.statement.cpp"
@@ -15914,16 +20196,18 @@
 					"name": "punctuation.terminator.statement.cpp"
 				}
 			},
+			"name": "meta.block.union.cpp",
 			"patterns": [
 				{
-					"name": "meta.head.union.cpp",
 					"begin": "\\G ?",
-					"end": "((?:\\{|<%|\\?\\?<|(?=;)))",
+					"end": "(?:\\{|<%|\\?\\?<|(?=;))",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
 						}
 					},
+					"name": "meta.head.union.cpp",
 					"patterns": [
 						{
 							"include": "#ever_present_context"
@@ -15937,14 +20221,15 @@
 					]
 				},
 				{
-					"name": "meta.body.union.cpp",
 					"begin": "(?<=\\{|<%|\\?\\?<)",
-					"end": "(\\}|%>|\\?\\?>)",
+					"end": "\\}|%>|\\?\\?>",
+					"beginCaptures": {},
 					"endCaptures": {
-						"1": {
+						"0": {
 							"name": "punctuation.section.block.end.bracket.curly.union.cpp"
 						}
 					},
+					"name": "meta.body.union.cpp",
 					"patterns": [
 						{
 							"include": "#function_pointer"
@@ -15964,9 +20249,11 @@
 					]
 				},
 				{
+					"begin": "(?<=\\}|%>|\\?\\?>)[\\s]*",
+					"end": "[\\s]*(?=;)",
+					"beginCaptures": {},
+					"endCaptures": {},
 					"name": "meta.tail.union.cpp",
-					"begin": "(?<=\\}|%>|\\?\\?>)[\\s\\n]*",
-					"end": "[\\s\\n]*(?=;)",
 					"patterns": [
 						{
 							"include": "$self"
@@ -15976,7 +20263,7 @@
 			]
 		},
 		"union_declare": {
-			"match": "((?<!\\w)union(?!\\w))((?>(?:(?:(?>(?<!\\s)\\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)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))?(?:(?:\\&|\\*)((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))))*(?:\\&|\\*))?((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))\\b(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(?=\\S)(?![:{])",
+			"match": "((?<!\\w)union(?!\\w))((?:((?:(?>(?:\\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(?!override\\W|override\\$|final\\W|final\\$)((?<!\\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"
@@ -15989,34 +20276,43 @@
 					]
 				},
 				"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"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				},
-				"6": {
+				"4": {
 					"name": "entity.name.type.union.cpp"
 				},
-				"7": {
+				"5": {
 					"patterns": [
 						{
 							"match": "\\*",
 							"name": "storage.modifier.pointer.cpp"
 						},
 						{
-							"match": "(?:\\&((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))){2,}\\&",
+							"match": "(?:\\&((?:(?:(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))+)|(?:\\b)|(?=\\W)|(?<=\\W)|(?:\\A)|(?:\\Z)))){2,}\\&",
 							"captures": {
 								"1": {
 									"patterns": [
@@ -16052,6 +20348,40 @@
 						}
 					]
 				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
+				},
 				"8": {
 					"patterns": [
 						{
@@ -16060,105 +20390,107 @@
 					]
 				},
 				"9": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+					"patterns": [
+						{
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
+						}
+					]
 				},
 				"10": {
-					"name": "comment.block.cpp"
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
 				},
 				"11": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.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": {
-					"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": "variable.other.object.declare.cpp"
 				},
-				"21": {
+				"13": {
 					"patterns": [
 						{
 							"include": "#inline_comment"
 						}
 					]
 				},
-				"22": {
-					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
-				},
-				"23": {
-					"name": "comment.block.cpp"
-				},
-				"24": {
+				"14": {
 					"patterns": [
 						{
-							"match": "\\*\\/",
-							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
-						},
-						{
-							"match": "\\*",
-							"name": "comment.block.cpp"
+							"match": "(?:(?>(?:\\s)+)|(\\/\\*)((?:[^\\*]|(?:\\*)++[^\\/])*+((?:\\*)++\\/)))",
+							"captures": {
+								"1": {
+									"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+								},
+								"2": {
+									"name": "comment.block.cpp"
+								},
+								"3": {
+									"patterns": [
+										{
+											"match": "\\*\\/",
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										},
+										{
+											"match": "\\*",
+											"name": "comment.block.cpp"
+										}
+									]
+								}
+							}
 						}
 					]
 				}
 			}
 		},
 		"using_name": {
-			"match": "(using)\\s+(?!namespace\\b)",
+			"match": "(using)(?:\\s)+(?!namespace\\b)",
 			"captures": {
 				"1": {
 					"name": "keyword.other.using.directive.cpp"
@@ -16166,8 +20498,8 @@
 			}
 		},
 		"using_namespace": {
-			"name": "meta.using-namespace.cpp",
-			"begin": "(?<!\\w)(using)\\s+(namespace)\\s+((::)?(?:((?-mix:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_cancel|atomic_commit|__has_include|dynamic_cast|thread_local|synchronized|static_cast|const_cast|consteval|constexpr|protected|namespace|co_return|constexpr|constexpr|continue|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|co_await|template|volatile|register|restrict|reflexpr|alignof|private|default|mutable|include|concept|__asm__|defined|_Pragma|alignas|typedef|warning|virtual|mutable|struct|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|static|extern|inline|friend|public|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|while|compl|bitor|const|union|ifdef|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|asm|try|for|new|and|xor|not|do|or|if|if)\\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}))*))\\s*+(((?<!<)<(?!<)(?>(?:(?>[^<>]*)\\g<7>?)+)>)\\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)",
+			"begin": "(?<!\\w)(using)(?:\\s)+(namespace)(?:\\s)+((::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|synchronized|dynamic_cast|thread_local|static_cast|const_cast|co_return|constexpr|constexpr|constexpr|co_return|protected|namespace|consteval|noexcept|decltype|template|operator|noexcept|co_yield|co_await|reflexpr|continue|co_await|co_yield|requires|volatile|register|restrict|explicit|volatile|noexcept|typename|default|_Pragma|mutable|include|concept|alignas|virtual|alignof|__asm__|defined|mutable|typedef|warning|private|and_eq|define|pragma|typeid|switch|bitand|return|ifndef|export|struct|sizeof|module|static|public|extern|inline|friend|delete|xor_eq|import|not_eq|class|compl|bitor|throw|or_eq|while|catch|break|union|const|const|endif|ifdef|undef|error|using|else|line|goto|else|elif|this|enum|case|new|asm|not|try|for|and|xor|or|if|do|if)\\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}))*\\s*+(((?<!<)<(?!<)(?:(?:(?:[^'\"<>]*+|\"(?:[^\"]*|\\\\\")\")|'(?:[^']*|\\\\')')\\g<6>?)+>)(?:(?:\\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)",
+			"end": ";",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.using.directive.cpp"
@@ -16185,7 +20517,7 @@
 				"4": {
 					"name": "punctuation.separator.namespace.access.cpp punctuation.separator.scope-resolution.namespace.using.cpp"
 				},
-				"6": {
+				"5": {
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
@@ -16193,16 +20525,17 @@
 						}
 					]
 				},
-				"8": {
+				"6": {},
+				"7": {
 					"name": "entity.name.namespace.cpp"
 				}
 			},
-			"end": "(;)",
 			"endCaptures": {
-				"1": {
+				"0": {
 					"name": "punctuation.terminator.statement.cpp"
 				}
-			}
+			},
+			"name": "meta.using-namespace.cpp"
 		},
 		"vararg_ellipses": {
 			"match": "(?<!\\.)\\.\\.\\.(?!\\.)",
@@ -16211,7 +20544,7 @@
 		"wordlike_operators": {
 			"patterns": [
 				{
-					"match": "(?<!\\w)(?:noexcept|xor_eq|and_eq|delete|not_eq|bitand|bitor|compl|or_eq|not|xor|new|and|or)(?!\\w)",
+					"match": "(?<!\\w)(?:(?:noexcept)|(?:xor_eq)|(?:and_eq)|(?:delete)|(?:not_eq)|(?:bitand)|(?:bitor)|(?:compl)|(?:or_eq)|(?:not)|(?:xor)|(?:new)|(?:and)|(?:or))(?!\\w)",
 					"name": "keyword.operator.wordlike.cpp keyword.operator.$0.cpp"
 				}
 			]
diff --git a/extensions/cpp/test/colorize-results/test-78769_cpp.json b/extensions/cpp/test/colorize-results/test-78769_cpp.json
index 72bb9cdede7..1e908057408 100644
--- a/extensions/cpp/test/colorize-results/test-78769_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-78769_cpp.json
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "public",
-		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp storage.type.modifier.access.public.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp storage.type.modifier.access.public.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -364,7 +364,7 @@
 	},
 	{
 		"c": "base",
-		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.qualified_type.cpp entity.name.type.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp meta.qualified_type.cpp entity.name.type.cpp",
 		"r": {
 			"dark_plus": "entity.name.type: #4EC9B0",
 			"light_plus": "entity.name.type: #267F99",
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "                                                                   ",
-		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp",
 		"r": {
 			"dark_plus": "meta.preprocessor: #569CD6",
 			"light_plus": "meta.preprocessor: #0000FF",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "\\",
-		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp constant.character.escape.line-continuation.cpp",
+		"t": "source.cpp meta.preprocessor.macro.cpp meta.block.namespace.cpp meta.body.namespace.cpp meta.block.struct.cpp meta.head.struct.cpp constant.character.escape.line-continuation.cpp",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #FF0000",
diff --git a/extensions/cpp/test/colorize-results/test-80644_cpp.json b/extensions/cpp/test/colorize-results/test-80644_cpp.json
index 069f31ee72b..d2b3333f677 100644
--- a/extensions/cpp/test/colorize-results/test-80644_cpp.json
+++ b/extensions/cpp/test/colorize-results/test-80644_cpp.json
@@ -375,7 +375,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "3",
-		"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.function.definition.special.constructor.cpp meta.head.function.definition.special.constructor.cpp meta.parameter.initialization constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -527,4 +527,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/cpp/test/colorize-results/test_cc.json b/extensions/cpp/test/colorize-results/test_cc.json
index 324b231bb1b..cb2fb192e1d 100644
--- a/extensions/cpp/test/colorize-results/test_cc.json
+++ b/extensions/cpp/test/colorize-results/test_cc.json
@@ -122,7 +122,7 @@
 	},
 	{
 		"c": "%d",
-		"t": "source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
+		"t": "source.cpp string.quoted.double.cpp constant.other.placeholder",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -430,7 +430,7 @@
 	},
 	{
 		"c": "%d",
-		"t": "source.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
+		"t": "source.cpp string.quoted.double.cpp constant.other.placeholder",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": "user_candidate",
-		"t": "source.cpp meta.bracket.square.access.cpp variable.other.object.cpp",
+		"t": "source.cpp meta.bracket.square.access variable.other.object",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.cpp meta.bracket.square.access.cpp punctuation.definition.begin.bracket.square.cpp",
+		"t": "source.cpp meta.bracket.square.access punctuation.definition.begin.bracket.square",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.cpp meta.bracket.square.access.cpp",
+		"t": "source.cpp meta.bracket.square.access",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.cpp meta.bracket.square.access.cpp punctuation.definition.end.bracket.square.cpp",
+		"t": "source.cpp meta.bracket.square.access punctuation.definition.end.bracket.square",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -727,7 +727,7 @@
 	},
 	{
 		"c": "O",
-		"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",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters 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 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 meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -749,7 +749,7 @@
 	},
 	{
 		"c": "obj",
-		"t": "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 meta.parameter.cpp variable.parameter.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1464,7 +1464,7 @@
 	},
 	{
 		"c": "%s",
-		"t": "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",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1486,7 +1486,7 @@
 	},
 	{
 		"c": "%s",
-		"t": "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",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -1805,7 +1805,7 @@
 	},
 	{
 		"c": "movw $0x38, %ax; ltr %ax",
-		"t": "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",
 		"r": {
 			"dark_plus": "meta.embedded.assembly: #CE9178",
 			"light_plus": "meta.embedded.assembly: #A31515",
@@ -1979,4 +1979,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/cpp/test/colorize-results/test_cpp.json b/extensions/cpp/test/colorize-results/test_cpp.json
index 108895f8f65..cbc126be63f 100644
--- a/extensions/cpp/test/colorize-results/test_cpp.json
+++ b/extensions/cpp/test/colorize-results/test_cpp.json
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": "int",
-		"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",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters 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 +496,7 @@
 	},
 	{
 		"c": ",",
-		"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",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "int",
-		"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",
+		"t": "source.cpp meta.block.class.cpp meta.body.class.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -793,7 +793,7 @@
 	},
 	{
 		"c": "int",
-		"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",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters 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 +804,7 @@
 	},
 	{
 		"c": " ",
-		"t": "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 meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -815,7 +815,7 @@
 	},
 	{
 		"c": "x",
-		"t": "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 meta.parameter.cpp variable.parameter.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -826,7 +826,7 @@
 	},
 	{
 		"c": ",",
-		"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",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters meta.parameter.cpp punctuation.separator.delimiter.comma.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -837,7 +837,7 @@
 	},
 	{
 		"c": " ",
-		"t": "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 meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -848,7 +848,7 @@
 	},
 	{
 		"c": "int",
-		"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",
+		"t": "source.cpp meta.function.definition.cpp meta.head.function.definition.cpp meta.function.definition.parameters 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 +859,7 @@
 	},
 	{
 		"c": " ",
-		"t": "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 meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -870,7 +870,7 @@
 	},
 	{
 		"c": "y",
-		"t": "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 meta.parameter.cpp variable.parameter.cpp",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": "long",
-		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload.cpp meta.parameter.cpp",
+		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload meta.parameter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": "double",
-		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload.cpp meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
+		"t": "source.cpp meta.function.definition.special.operator-overload.cpp meta.head.function.definition.special.operator-overload.cpp meta.function.definition.parameters.special.operator-overload meta.parameter.cpp storage.type.primitive.cpp storage.type.built-in.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -1519,7 +1519,7 @@
 	},
 	{
 		"c": "movl %a %b",
-		"t": "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",
 		"r": {
 			"dark_plus": "meta.embedded.assembly: #CE9178",
 			"light_plus": "meta.embedded.assembly: #A31515",
@@ -2430,4 +2430,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index ea726a30206..9a803e24e5a 100644
--- a/extensions/go/syntaxes/go.tmLanguage.json
+++ b/extensions/go/syntaxes/go.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/better-go-syntax/commit/54ff898316f8647d77ffcf83880a9556445326f1",
+	"version": "https://github.com/jeff-hykin/better-go-syntax/commit/302b427373ba8390786723a99f6cdf8e38833159",
 	"name": "Go",
 	"scopeName": "source.go",
 	"patterns": [
@@ -149,14 +149,7 @@
 			}
 		},
 		{
-			"comment": "Floating-point literals",
-			"match": "(\\.\\d+([Ee][-+]\\d+)?i?)\\b|\\b\\d+\\.\\d*(([Ee][-+]\\d+)?i?\\b)?",
-			"name": "constant.numeric.floating-point.go"
-		},
-		{
-			"comment": "Integers",
-			"match": "\\b((0x[0-9a-fA-F]+)|(0[0-7]+i?)|(\\d+([Ee]\\d+)?i?)|(\\d+[Ee][-+]\\d+i?))\\b",
-			"name": "constant.numeric.integer.go"
+			"include": "#numeric_literals"
 		},
 		{
 			"comment": "Language constants",
@@ -259,7 +252,7 @@
 			}
 		},
 		{
-			"match": "\\w+(?:,\\s*\\w+)*(?=\\s*:=)",
+			"match": "\\b\\w+(?:,\\s*\\w+)*(?=\\s*:=)",
 			"captures": {
 				"0": {
 					"patterns": [
@@ -594,7 +587,7 @@
 		"string_placeholder": {
 			"patterns": [
 				{
-					"match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGsp]",
+					"match": "%(\\[\\d+\\])?([\\+#\\-0\\x20]{,2}((\\d+|\\*)?(\\.?(\\d+|\\*|(\\[\\d+\\])\\*?)?(\\[\\d+\\])?)?))?[vT%tbcdoqxXUbeEfFgGspw]",
 					"name": "constant.other.placeholder.go"
 				}
 			]
@@ -678,6 +671,24 @@
 					]
 				}
 			]
+		},
+		"numeric_literals": {
+			"patterns": [
+				{
+					"include": "#float"
+				},
+				{
+					"include": "#integer"
+				}
+			]
+		},
+		"float": {
+			"match": "(\\.\\d+([Ee][-+]\\d+)?i?)\\b|\\b\\d+\\.\\d*(([Ee][-+]\\d+)?i?\\b)?",
+			"name": "constant.numeric.floating-point.go"
+		},
+		"integer": {
+			"match": "\\b((0x[0-9a-fA-F]+)|(0[0-7]+i?)|(\\d+([Ee]\\d+)?i?)|(\\d+[Ee][-+]\\d+i?))\\b",
+			"name": "constant.numeric.integer.go"
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/hlsl/cgmanifest.json b/extensions/hlsl/cgmanifest.json
index 44b3a016ee0..970c7915a2d 100644
--- a/extensions/hlsl/cgmanifest.json
+++ b/extensions/hlsl/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "shaders-tmLanguage",
 					"repositoryUrl": "https://github.com/tgjones/shaders-tmLanguage",
-					"commitHash": "cd1ef40f549f9ce2b9e6b73498688de114a85382"
+					"commitHash": "87c0dca3a39170dbd7ee7e277db4f915fb2de14a"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/hlsl/syntaxes/hlsl.tmLanguage.json b/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
index dd8f5356fee..5398a76291c 100644
--- a/extensions/hlsl/syntaxes/hlsl.tmLanguage.json
+++ b/extensions/hlsl/syntaxes/hlsl.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/tgjones/shaders-tmLanguage/commit/cd1ef40f549f9ce2b9e6b73498688de114a85382",
+	"version": "https://github.com/tgjones/shaders-tmLanguage/commit/87c0dca3a39170dbd7ee7e277db4f915fb2de14a",
 	"name": "HLSL",
 	"scopeName": "source.hlsl",
 	"patterns": [
@@ -19,16 +19,20 @@
 			"end": "$"
 		},
 		{
-			"name": "constant.numeric.hlsl",
-			"match": "\\b([0-9]+\\.?[0-9]*)\\b"
+			"name": "constant.numeric.decimal.hlsl",
+			"match": "\\b[0-9]+\\.[0-9]*(F|f)?\\b"
 		},
 		{
-			"name": "constant.numeric.hlsl",
-			"match": "\\b(\\.[0-9]+)\\b"
+			"name": "constant.numeric.decimal.hlsl",
+			"match": "(\\.([0-9]+)(F|f)?)\\b"
+		},
+		{
+			"name": "constant.numeric.decimal.hlsl",
+			"match": "\\b([0-9]+(F|f)?)\\b"
 		},
 		{
 			"name": "constant.numeric.hex.hlsl",
-			"match": "\\b(0x[0-9A-F]+)\\b"
+			"match": "\\b(0(x|X)[0-9a-fA-F]+)\\b"
 		},
 		{
 			"name": "constant.language.hlsl",
diff --git a/extensions/log/cgmanifest.json b/extensions/log/cgmanifest.json
index 56318ba0e84..d84272fbe32 100644
--- a/extensions/log/cgmanifest.json
+++ b/extensions/log/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "vscode-logfile-highlighter",
 					"repositoryUrl": "https://github.com/emilast/vscode-logfile-highlighter",
-					"commitHash": "e90aa2554b439827f125fd60ff6d7773fc582fcc"
+					"commitHash": "fbe9797ea7889ee55def6da8dee86ba625ca9759"
 				}
 			},
 			"license": "MIT",
-			"version": "2.5.0"
+			"version": "2.6.0"
 		}
 	],
 	"version": 1
diff --git a/extensions/log/syntaxes/log.tmLanguage.json b/extensions/log/syntaxes/log.tmLanguage.json
index b0f144a67fe..0c511935ad3 100644
--- a/extensions/log/syntaxes/log.tmLanguage.json
+++ b/extensions/log/syntaxes/log.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/emilast/vscode-logfile-highlighter/commit/e90aa2554b439827f125fd60ff6d7773fc582fcc",
+	"version": "https://github.com/emilast/vscode-logfile-highlighter/commit/fbe9797ea7889ee55def6da8dee86ba625ca9759",
 	"name": "Log file",
 	"scopeName": "text.log",
 	"patterns": [
@@ -33,7 +33,7 @@
 			"name": "markup.changed log.debug"
 		},
 		{
-			"match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE)\\b|(?i)\\b(info|information)\\:",
+			"match": "\\b(HINT|INFO|INFORMATION|Info|NOTICE|II)\\b|(?i)\\b(info|information)\\:",
 			"name": "markup.inserted log.info"
 		},
 		{
@@ -45,7 +45,7 @@
 			"name": "markup.inserted log.info"
 		},
 		{
-			"match": "\\b(WARNING|WARN|Warn)\\b|(?i)\\b(warning)\\:",
+			"match": "\\b(WARNING|WARN|Warn|WW)\\b|(?i)\\b(warning)\\:",
 			"name": "markup.deleted log.warning"
 		},
 		{
@@ -57,7 +57,7 @@
 			"name": "markup.deleted log.warning"
 		},
 		{
-			"match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|Error)\\b|(?i)\\b(error)\\:",
+			"match": "\\b(ALERT|CRITICAL|EMERGENCY|ERROR|FAILURE|FAIL|Fatal|FATAL|Error|EE)\\b|(?i)\\b(error)\\:",
 			"name": "string.regexp, strong log.error"
 		},
 		{
diff --git a/extensions/objective-c/cgmanifest.json b/extensions/objective-c/cgmanifest.json
index 9ff092c2ab0..fc4983b457a 100644
--- a/extensions/objective-c/cgmanifest.json
+++ b/extensions/objective-c/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jeff-hykin/cpp-textmate-grammar",
 					"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
-					"commitHash": "bc7dedd28eebe52b374744d3fb34d77ff441569e"
+					"commitHash": "d62c0002b4c36c1c5add356ecc6f478bc2d416e1"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
index 2510f2dc743..429d5326104 100644
--- a/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json
+++ b/extensions/objective-c/syntaxes/objective-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/bc7dedd28eebe52b374744d3fb34d77ff441569e",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/d62c0002b4c36c1c5add356ecc6f478bc2d416e1",
 	"name": "Objective-C++",
 	"scopeName": "source.objcpp",
 	"patterns": [
diff --git a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json b/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
index c4f19d8db54..626678f5295 100644
--- a/extensions/objective-c/syntaxes/objective-c.tmLanguage.json
+++ b/extensions/objective-c/syntaxes/objective-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/bc7dedd28eebe52b374744d3fb34d77ff441569e",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/d62c0002b4c36c1c5add356ecc6f478bc2d416e1",
 	"name": "Objective-C",
 	"scopeName": "source.objc",
 	"patterns": [
diff --git a/extensions/php/cgmanifest.json b/extensions/php/cgmanifest.json
index bd31a070acd..5b4050cdcd0 100644
--- a/extensions/php/cgmanifest.json
+++ b/extensions/php/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "language-php",
 					"repositoryUrl": "https://github.com/atom/language-php",
-					"commitHash": "b95dc79f30084c25547397ab41388af154e69895"
+					"commitHash": "96368115562c38ab3a203a03c4e26cca80fa2a10"
 				}
 			},
 			"license": "MIT",
-			"version": "0.44.3"
+			"version": "0.44.4"
 		}
 	],
 	"version": 1
diff --git a/extensions/php/syntaxes/php.tmLanguage.json b/extensions/php/syntaxes/php.tmLanguage.json
index fef8a2da2a6..08fb0a9eb5f 100644
--- a/extensions/php/syntaxes/php.tmLanguage.json
+++ b/extensions/php/syntaxes/php.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/atom/language-php/commit/b95dc79f30084c25547397ab41388af154e69895",
+	"version": "https://github.com/atom/language-php/commit/96368115562c38ab3a203a03c4e26cca80fa2a10",
 	"scopeName": "source.php",
 	"patterns": [
 		{
@@ -230,7 +230,7 @@
 			]
 		},
 		{
-			"begin": "(?i)(?:^|(?<=}))\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)",
+			"begin": "(?ix)\n(?:\n  (?:^|(?<=}))\\s*(?:(abstract|final)\\s+)?(class)\\s+([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)\n  |\\b(new)\\s+(class)\\b # anonymous class\n)",
 			"beginCaptures": {
 				"1": {
 					"name": "storage.modifier.${1:/downcase}.php"
@@ -240,6 +240,12 @@
 				},
 				"3": {
 					"name": "entity.name.type.class.php"
+				},
+				"4": {
+					"name": "keyword.other.new.php"
+				},
+				"5": {
+					"name": "storage.type.class.php"
 				}
 			},
 			"end": "}|(?=\\?>)",
@@ -525,7 +531,61 @@
 			]
 		},
 		{
-			"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic))\n  |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\n)\n\\s*(\\()",
+			"begin": "(?i)\\b(fn)\\s*(?=&?\\s*\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "storage.type.function.php"
+				}
+			},
+			"end": "=>",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.arrow.php"
+				}
+			},
+			"name": "meta.function.closure.php",
+			"patterns": [
+				{
+					"begin": "(&)?\\s*(\\()",
+					"beginCaptures": {
+						"1": {
+							"name": "storage.modifier.reference.php"
+						},
+						"2": {
+							"name": "punctuation.definition.parameters.begin.bracket.round.php"
+						}
+					},
+					"contentName": "meta.function.parameters.php",
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.parameters.end.bracket.round.php"
+						}
+					},
+					"patterns": [
+						{
+							"include": "#function-parameters"
+						}
+					]
+				},
+				{
+					"match": "(:)\\s*(\\?)?\\s*((?:\\\\?[a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*)+)\\s*",
+					"captures": {
+						"1": {
+							"name": "keyword.operator.return-value.php"
+						},
+						"2": {
+							"name": "keyword.operator.nullable-type.php"
+						},
+						"3": {
+							"name": "storage.type.php"
+						}
+					}
+				}
+			]
+		},
+		{
+			"begin": "(?x)\n((?:(?:final|abstract|public|private|protected|static)\\s+)*)\n(function)\\s+\n(?i:\n  (__(?:call|construct|debugInfo|destruct|get|set|isset|unset|toString|\n        clone|set_state|sleep|wakeup|autoload|invoke|callStatic|serialize|unserialize))\n  |(?:(&)?\\s*([a-zA-Z_\\x{7f}-\\x{7fffffff}][a-zA-Z0-9_\\x{7f}-\\x{7fffffff}]*))\n)\n\\s*(\\()",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -574,6 +634,44 @@
 				}
 			]
 		},
+		{
+			"match": "(?xi)\n((?:(?:public|private|protected|static)(?:\\s+|(?=\\?)))+)                     # At least one modifier\n(?:(\\?)?\\s*                                                                  # Optional nullable\n  (\\\\?(?:[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*\\\\)*)   # Optional namespace\n  ([a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*))?               # Typehinted class name\n\\s+((\\$)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*)          # Variable name",
+			"captures": {
+				"1": {
+					"patterns": [
+						{
+							"match": "public|private|protected|static",
+							"name": "storage.modifier.php"
+						}
+					]
+				},
+				"2": {
+					"name": "keyword.operator.nullable-type.php"
+				},
+				"3": {
+					"name": "support.other.namespace.php",
+					"patterns": [
+						{
+							"match": "(?i)[a-z_\\x{7f}-\\x{7fffffff}][a-z0-9_\\x{7f}-\\x{7fffffff}]*",
+							"name": "storage.type.php"
+						},
+						{
+							"match": "\\\\",
+							"name": "punctuation.separator.inheritance.php"
+						}
+					]
+				},
+				"4": {
+					"name": "storage.type.php"
+				},
+				"5": {
+					"name": "variable.other.php"
+				},
+				"6": {
+					"name": "punctuation.definition.variable.php"
+				}
+			}
+		},
 		{
 			"include": "#invoke-call"
 		},
@@ -667,6 +765,10 @@
 			"match": "(?i)\\bclone\\b",
 			"name": "keyword.other.clone.php"
 		},
+		{
+			"match": "\\.\\.\\.",
+			"name": "keyword.operator.spread.php"
+		},
 		{
 			"match": "\\.=?",
 			"name": "keyword.operator.string.php"
@@ -698,7 +800,7 @@
 			"name": "keyword.operator.comparison.php"
 		},
 		{
-			"match": "=|\\+=|\\-=|\\*=|/=|%=|&=|\\|=|\\^=|<<=|>>=",
+			"match": "=|\\+=|\\-=|\\*\\*?=|/=|%=|&=|\\|=|\\^=|<<=|>>=|\\?\\?=",
 			"name": "keyword.operator.assignment.php"
 		},
 		{
@@ -710,7 +812,7 @@
 			"name": "keyword.operator.increment-decrement.php"
 		},
 		{
-			"match": "\\-|\\+|\\*|/|%",
+			"match": "\\-|\\+|\\*\\*?|/|%",
 			"name": "keyword.operator.arithmetic.php"
 		},
 		{
@@ -1959,7 +2061,7 @@
 			]
 		},
 		"instantiation": {
-			"begin": "(?i)(new)\\s+",
+			"begin": "(?i)(new)\\s+(?!class\\b)",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.other.new.php"
@@ -2066,19 +2168,19 @@
 		"numbers": {
 			"patterns": [
 				{
-					"match": "0[xX][0-9a-fA-F]+",
+					"match": "0[xX][0-9a-fA-F]+(?:_[0-9a-fA-F]+)*",
 					"name": "constant.numeric.hex.php"
 				},
 				{
-					"match": "0[bB][01]+",
+					"match": "0[bB][01]+(?:_[01]+)*",
 					"name": "constant.numeric.binary.php"
 				},
 				{
-					"match": "0[0-7]+",
+					"match": "0(?:_?[0-7]+)+",
 					"name": "constant.numeric.octal.php"
 				},
 				{
-					"match": "(?x)\n(?:\n  [0-9]*(\\.)[0-9]+(?:[eE][+-]?[0-9]+)?|\n  [0-9]+(\\.)[0-9]*(?:[eE][+-]?[0-9]+)?|\n  [0-9]+[eE][+-]?[0-9]+\n)",
+					"match": "(?x)\n(?:\n  (?:[0-9]+(?:_[0-9]+)*)?(\\.)[0-9]+(?:_[0-9]+)*(?:[eE][+-]?[0-9]+(?:_[0-9]+)*)?| # .3\n  [0-9]+(?:_[0-9]+)*(\\.)(?:[0-9]+(?:_[0-9]+)*)?(?:[eE][+-]?[0-9]+(?:_[0-9]+)*)?| # 3.\n  [0-9]+(?:_[0-9]+)*[eE][+-]?[0-9]+(?:_[0-9]+)*                                   # 2e-3\n)",
 					"name": "constant.numeric.decimal.php",
 					"captures": {
 						"1": {
@@ -2090,7 +2192,7 @@
 					}
 				},
 				{
-					"match": "0|[1-9][0-9]*",
+					"match": "0|[1-9](?:_?[0-9]+)*",
 					"name": "constant.numeric.decimal.php"
 				}
 			]
diff --git a/extensions/r/cgmanifest.json b/extensions/r/cgmanifest.json
index 0781a150722..7cf785d7140 100644
--- a/extensions/r/cgmanifest.json
+++ b/extensions/r/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "Ikuyadeu/vscode-R",
 					"repositoryUrl": "https://github.com/Ikuyadeu/vscode-R",
-					"commitHash": "1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff"
+					"commitHash": "bc79e9245682ee09b4f0b742b927a37702d91b82"
 				}
 			},
 			"license": "MIT",
-			"version": "0.5.5"
+			"version": "1.1.8"
 		}
 	],
 	"version": 1
diff --git a/extensions/r/syntaxes/r.tmLanguage.json b/extensions/r/syntaxes/r.tmLanguage.json
index db37b8421fe..2b6c4368da9 100644
--- a/extensions/r/syntaxes/r.tmLanguage.json
+++ b/extensions/r/syntaxes/r.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/Ikuyadeu/vscode-R/commit/1cd3d42a6b2e54276ef2d71fe33bb3fefb1d6cff",
+	"version": "https://github.com/Ikuyadeu/vscode-R/commit/bc79e9245682ee09b4f0b742b927a37702d91b82",
 	"name": "R",
 	"scopeName": "source.r",
 	"patterns": [
@@ -417,7 +417,7 @@
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.definition.parameters.r"
+					"name": "punctuation.section.parens.end.r"
 				}
 			},
 			"name": "meta.function-call.r",
diff --git a/extensions/r/test/colorize-results/test_r.json b/extensions/r/test/colorize-results/test_r.json
index 2d3e504f8de..3ecd0091ce5 100644
--- a/extensions/r/test/colorize-results/test_r.json
+++ b/extensions/r/test/colorize-results/test_r.json
@@ -639,7 +639,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.r meta.function-call.r punctuation.definition.parameters.r",
+		"t": "source.r meta.function-call.r punctuation.section.parens.end.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -716,7 +716,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.r meta.function-call.r punctuation.definition.parameters.r",
+		"t": "source.r meta.function-call.r punctuation.section.parens.end.r",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1044,4 +1044,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file
diff --git a/extensions/shaderlab/test/colorize-results/test_shader.json b/extensions/shaderlab/test/colorize-results/test_shader.json
index 80eff76e153..fac0a925a41 100644
--- a/extensions/shaderlab/test/colorize-results/test_shader.json
+++ b/extensions/shaderlab/test/colorize-results/test_shader.json
@@ -452,7 +452,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.shaderlab meta.cgblock constant.numeric.hlsl",
+		"t": "source.shaderlab meta.cgblock constant.numeric.decimal.hlsl",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -571,4 +571,4 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	}
-]
+]
\ No newline at end of file