From b56ec0d8e7500579715b1d4fb77849157eb79a23 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 11 Apr 2019 09:05:55 +0000
Subject: [PATCH] Fix CPP grammar and themes

Part of #71821
---
 extensions/cpp/cgmanifest.json                |    4 +-
 extensions/cpp/syntaxes/c.tmLanguage.json     |  194 +--
 extensions/cpp/syntaxes/cpp.tmLanguage.json   | 1111 +++++++++++++----
 .../theme-defaults/themes/dark_plus.json      |    7 +-
 .../theme-defaults/themes/hc_black.json       |    7 +-
 .../theme-defaults/themes/light_plus.json     |    7 +-
 .../themes/kimbie-dark-color-theme.json       |    5 +-
 .../themes/dimmed-monokai-color-theme.json    |    7 +-
 8 files changed, 1028 insertions(+), 314 deletions(-)

diff --git a/extensions/cpp/cgmanifest.json b/extensions/cpp/cgmanifest.json
index 43485f926a8..3ab00d30368 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": "47f33650b7eee1cc3d5c9e72a85ac415797a08db"
+					"commitHash": "84a65f7cce43f15aceaf1854c5bcc779c8575fe7"
 				}
 			},
 			"license": "MIT",
-			"version": "1.6.7",
+			"version": "1.7.6",
 			"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 efb692081eb..b7213b949df 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/9de911d74546b9ae74c57e404515935a0405e696",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/d450ac8fb4bd1750389acfd88be341e1a91a02f3",
 	"name": "C",
 	"scopeName": "source.c",
 	"patterns": [
@@ -27,6 +27,10 @@
 		{
 			"include": "#storage_types"
 		},
+		{
+			"match": "typedef",
+			"name": "keyword.other.typedef.c"
+		},
 		{
 			"match": "\\b(const|extern|register|restrict|static|volatile|inline)\\b",
 			"name": "storage.modifier.c"
@@ -50,9 +54,6 @@
 		{
 			"include": "#operators"
 		},
-		{
-			"include": "#operator_overload"
-		},
 		{
 			"include": "#numbers"
 		},
@@ -316,9 +317,9 @@
 			"include": "#parens"
 		},
 		{
-			"begin": "(?!(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|const|static|volatile|register|restrict|constexpr|extern|inline|mutable|friend|NULL|true|false|TRUE|FALSE|nullptr|class|struct|union|enum|explicit|virtual|mutable|constexpr|consteval|private|protected|public|if|elif|else|endif|ifdef|ifndef|define|undef|include|line|error|warning|pragma|_Pragma|defined|__has_include|__has_cpp_attribute|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|atomic_cancel|atomic_commit|atomic_noexcept|concept|co_await|co_return|co_yield|export|import|module|reflexpr|requires|synchronized|thread_local|audit|axiom|transaction_safe|transaction_safe_dynamic)\\s*\\()(?=[a-zA-Z_][a-zA-Z0-9_]*\\s*\\()",
-			"end": "(?<=\\))",
 			"name": "meta.function.c",
+			"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|alignof|alignas|_Alignof|_Alignas|while|for|do|if|else|goto|switch|return|break|case|continue|default|void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t|struct|union|enum|typedef|auto|register|static|extern|thread_local|inline|_Noreturn|const|volatile|restrict|_Atomic)\\s*\\()(?=[a-zA-Z_]\\w*\\s*\\()",
+			"end": "(?<=\\))",
 			"patterns": [
 				{
 					"include": "#function-innards"
@@ -366,54 +367,55 @@
 	],
 	"repository": {
 		"probably_a_parameter": {
-			"match": "(?:([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?==)|(?<=(?:[a-zA-Z0-9_]\\s|[&*>\\]\\)]))\\s*([a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=(?:\\[\\]\\s*)?(?:,|\\))))",
-			"captures": {
-				"1": {
-					"name": "variable.parameter.probably.defaulted.c"
-				},
-				"2": {
-					"name": "variable.parameter.probably.c"
-				}
-			}
+			"include": "#probably_a_parameter"
 		},
-		"operator_overload": {
-			"begin": "((?:[a-zA-Z_][a-zA-Z0-9_]*\\s*(?:<(?:[\\s<>,\\w])*>\\s*)?::)*)(operator)((?:\\s*(?:\\+\\+|\\-\\-|\\(\\)|\\[\\]|\\->|\\+\\+|\\-\\-|\\+|\\-|!|~|\\*|&|\\->\\*|\\*|\\/|%|\\+|\\-|<<|>>|<=>|<|<=|>|>=|==|!=|&|\\^|\\||&&|\\|\\||=|\\+=|\\-=|\\*=|\\/=|%=|<<=|>>=|&=|\\^=|\\|=|,)|\\s+(?:(?:new|new\\[\\]|delete|delete\\[\\])|[a-zA-Z_][a-zA-Z0-9_]*)))\\s*(\\()",
-			"beginCaptures": {
+		"member_access": {
+			"match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool|_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())",
+			"captures": {
 				"1": {
-					"name": "entity.scope.c"
+					"name": "variable.other.object.access.c"
 				},
 				"2": {
-					"name": "entity.name.operator.overload.c"
+					"name": "punctuation.separator.dot-access.c"
 				},
 				"3": {
-					"name": "entity.name.operator.overloadee.c"
+					"name": "punctuation.separator.pointer-access.c"
 				},
 				"4": {
-					"name": "punctuation.section.parameters.begin.bracket.round.c"
-				}
-			},
-			"end": "\\)",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.section.parameters.end.bracket.round.c"
-				}
-			},
-			"name": "meta.function.definition.parameters.operator-overload.c",
-			"patterns": [
-				{
-					"include": "#probably_a_parameter"
+					"patterns": [
+						{
+							"include": "#member_access"
+						},
+						{
+							"include": "#method_access"
+						},
+						{
+							"match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"captures": {
+								"1": {
+									"name": "variable.other.object.access.c"
+								},
+								"2": {
+									"name": "punctuation.separator.dot-access.c"
+								},
+								"3": {
+									"name": "punctuation.separator.pointer-access.c"
+								}
+							}
+						}
+					]
 				},
-				{
-					"include": "#function-innards"
+				"5": {
+					"name": "variable.other.member.c"
 				}
-			]
+			}
 		},
-		"access-method": {
-			"name": "meta.function-call.member.c",
-			"begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+		"method_access": {
+			"contentName": "meta.function-call.member",
+			"begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "variable.object.c"
+					"name": "variable.other.object.access.c"
 				},
 				"2": {
 					"name": "punctuation.separator.dot-access.c"
@@ -424,20 +426,24 @@
 				"4": {
 					"patterns": [
 						{
-							"match": "\\.",
-							"name": "punctuation.separator.dot-access.c"
-						},
-						{
-							"match": "->",
-							"name": "punctuation.separator.pointer-access.c"
+							"include": "#member_access"
 						},
 						{
-							"match": "[a-zA-Z_][a-zA-Z_0-9]*",
-							"name": "variable.object.c"
+							"include": "#method_access"
 						},
 						{
-							"name": "everything.else",
-							"match": ".+"
+							"match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"captures": {
+								"1": {
+									"name": "variable.other.object.access.c"
+								},
+								"2": {
+									"name": "punctuation.separator.dot-access.c"
+								},
+								"3": {
+									"name": "punctuation.separator.pointer-access.c"
+								}
+							}
 						}
 					]
 				},
@@ -448,9 +454,9 @@
 					"name": "punctuation.section.arguments.begin.bracket.round.function.member.c"
 				}
 			},
-			"end": "\\)",
+			"end": "(\\))",
 			"endCaptures": {
-				"0": {
+				"1": {
 					"name": "punctuation.section.arguments.end.bracket.round.function.member.c"
 				}
 			},
@@ -460,10 +466,10 @@
 				}
 			]
 		},
-		"access-member": {
-			"name": "variable.object.access.c",
-			"match": "(?:([a-zA-Z_][a-zA-Z0-9_]*)|(?<=\\]|\\)))\\s*(?:((?:\\.|\\.\\*))|((?:->|->\\*)))\\s*((?:[a-zA-Z_][a-zA-Z0-9_]*\\s*(?:\\.|->)\\s*)*)\\b(?!(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t))([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\()",
-			"captures": {
+		"access-method": {
+			"name": "meta.function-call.member.c",
+			"begin": "([a-zA-Z_][a-zA-Z_0-9]*|(?<=[\\]\\)]))\\s*(?:(\\.)|(->))((?:(?:[a-zA-Z_][a-zA-Z_0-9]*)\\s*(?:(?:\\.)|(?:->)))*)\\s*([a-zA-Z_][a-zA-Z_0-9]*)(\\()",
+			"beginCaptures": {
 				"1": {
 					"name": "variable.object.c"
 				},
@@ -484,19 +490,33 @@
 							"name": "punctuation.separator.pointer-access.c"
 						},
 						{
-							"match": "[a-zA-Z_][a-zA-Z0-9_]*",
+							"match": "[a-zA-Z_][a-zA-Z_0-9]*",
 							"name": "variable.object.c"
 						},
 						{
-							"match": ".+",
-							"name": "everything.else"
+							"name": "everything.else.c",
+							"match": ".+"
 						}
 					]
 				},
 				"5": {
-					"name": "variable.other.member.c"
+					"name": "entity.name.function.member.c"
+				},
+				"6": {
+					"name": "punctuation.section.arguments.begin.bracket.round.function.member.c"
 				}
-			}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.arguments.end.bracket.round.function.member.c"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#function-call-innards"
+				}
+			]
 		},
 		"block": {
 			"patterns": [
@@ -534,10 +554,10 @@
 					"include": "#preprocessor-rule-conditional-block"
 				},
 				{
-					"include": "#access-method"
+					"include": "#method_access"
 				},
 				{
-					"include": "#access-member"
+					"include": "#member_access"
 				},
 				{
 					"include": "#c_function_call"
@@ -639,13 +659,13 @@
 						}
 					},
 					"match": "^// =(\\s*.*?)\\s*=\\s*$\\n?",
-					"name": "comment.line.banner.cpp"
+					"name": "comment.line.banner.cpp.c"
 				},
 				{
 					"begin": "(^[ \\t]+)?(?=//)",
 					"beginCaptures": {
 						"1": {
-							"name": "punctuation.whitespace.comment.leading.cpp"
+							"name": "punctuation.whitespace.comment.leading.cpp.c"
 						}
 					},
 					"end": "(?!\\G)",
@@ -654,11 +674,11 @@
 							"begin": "//",
 							"beginCaptures": {
 								"0": {
-									"name": "punctuation.definition.comment.cpp"
+									"name": "punctuation.definition.comment.cpp.c"
 								}
 							},
 							"end": "(?=\\n)",
-							"name": "comment.line.double-slash.cpp",
+							"name": "comment.line.double-slash.cpp.c",
 							"patterns": [
 								{
 									"include": "#line_continuation_character"
@@ -702,7 +722,7 @@
 			]
 		},
 		"parens": {
-			"name": "punctuation.section.parens",
+			"name": "punctuation.section.parens.c",
 			"begin": "\\(",
 			"beginCaptures": {
 				"0": {
@@ -722,7 +742,7 @@
 			]
 		},
 		"parens-block": {
-			"name": "punctuation.section.parens.block",
+			"name": "punctuation.section.parens.block.c",
 			"begin": "\\(",
 			"beginCaptures": {
 				"0": {
@@ -740,8 +760,8 @@
 					"include": "#block_innards"
 				},
 				{
-					"match": "(?<!:):(?!:)",
-					"name": "punctuation.range-based.cpp"
+					"match": "(?-mix:(?<!:):(?!:))",
+					"name": "punctuation.range-based.cpp.c"
 				}
 			]
 		},
@@ -761,7 +781,7 @@
 				}
 			},
 			"match": "^\\s*(((#)\\s*pragma\\s+mark)\\s+(.*))",
-			"name": "meta.section"
+			"name": "meta.section.c"
 		},
 		"operators": {
 			"patterns": [
@@ -825,10 +845,10 @@
 					},
 					"patterns": [
 						{
-							"include": "#access-method"
+							"include": "#method_access"
 						},
 						{
-							"include": "#access-member"
+							"include": "#member_access"
 						},
 						{
 							"include": "#c_function_call"
@@ -924,15 +944,15 @@
 		"storage_types": {
 			"patterns": [
 				{
-					"match": "(?:(?<![a-zA-Z0-9_])(?:u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t)(?![a-zA-Z0-9_])|_Bool|_Complex|_Imaginary)",
-					"name": "storage.type.built-in.c"
+					"match": "(?-mix:void|char|short|int|signed|unsigned|long|float|double|bool|_Bool)",
+					"name": "storage.type.built-in.primitive.c"
 				},
 				{
-					"match": "(?<![a-zA-Z0-9_])(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t)(?![a-zA-Z0-9_])",
-					"name": "storage.type.built-in.primitive.c"
+					"match": "(?-mix:_Complex|_Imaginary|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|memory_order|atomic_bool|atomic_char|atomic_schar|atomic_uchar|atomic_short|atomic_ushort|atomic_int|atomic_uint|atomic_long|atomic_ulong|atomic_llong|atomic_ullong|atomic_char16_t|atomic_char32_t|atomic_wchar_t|atomic_int_least8_t|atomic_uint_least8_t|atomic_int_least16_t|atomic_uint_least16_t|atomic_int_least32_t|atomic_uint_least32_t|atomic_int_least64_t|atomic_uint_least64_t|atomic_int_fast8_t|atomic_uint_fast8_t|atomic_int_fast16_t|atomic_uint_fast16_t|atomic_int_fast32_t|atomic_uint_fast32_t|atomic_int_fast64_t|atomic_uint_fast64_t|atomic_intptr_t|atomic_uintptr_t|atomic_size_t|atomic_ptrdiff_t|atomic_intmax_t|atomic_uintmax_t)",
+					"name": "storage.type.built-in.c"
 				},
 				{
-					"match": "\\b(asm|__asm__|enum|struct|union)\\b",
+					"match": "(?-mix:\\b(asm|__asm__|enum|struct|union)\\b)",
 					"name": "storage.type.$1.c"
 				}
 			]
@@ -1925,10 +1945,10 @@
 					]
 				},
 				{
-					"include": "#access-method"
+					"include": "#method_access"
 				},
 				{
-					"include": "#access-member"
+					"include": "#member_access"
 				},
 				{
 					"include": "$base"
@@ -1976,10 +1996,10 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"include": "#access-method"
+					"include": "#method_access"
 				},
 				{
-					"include": "#access-member"
+					"include": "#member_access"
 				},
 				{
 					"include": "#operators"
@@ -2045,7 +2065,7 @@
 					"include": "#vararg_ellipses"
 				},
 				{
-					"name": "meta.function.definition.parameters",
+					"name": "meta.function.definition.parameters.c",
 					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|enumerate|return|typeid|alignof|alignas|sizeof|[cr]?iterate|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()\n(\n(?:[A-Za-z_][A-Za-z0-9_]*+|::)++  # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
@@ -2103,10 +2123,10 @@
 					"include": "#storage_types"
 				},
 				{
-					"include": "#access-method"
+					"include": "#method_access"
 				},
 				{
-					"include": "#access-member"
+					"include": "#member_access"
 				},
 				{
 					"include": "#operators"
diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json
index 74780872397..3b58f791cc4 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/47f33650b7eee1cc3d5c9e72a85ac415797a08db",
+	"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/84a65f7cce43f15aceaf1854c5bcc779c8575fe7",
 	"name": "C++",
 	"scopeName": "source.cpp",
 	"patterns": [
@@ -124,7 +124,31 @@
 			"include": "#preprocessor-rule-conditional"
 		},
 		{
-			"include": "#comments-c"
+			"match": "(?<!\\w)#(?:endif|else|elif)(?!\\w)",
+			"name": "keyword.control.directive.$0.cpp"
+		},
+		{
+			"include": "#comments"
+		},
+		{
+			"name": "meta.conditional.case.cpp",
+			"begin": "((?<!\\w)case(?!\\w))",
+			"beginCaptures": {
+				"1": {
+					"name": "keyword.control.case.cpp"
+				}
+			},
+			"end": "(:)",
+			"endCaptures": {
+				"1": {
+					"name": "colon.cpp punctuation.separator.case.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "$base"
+				}
+			]
 		},
 		{
 			"match": "(?<!\\w)(?:throw|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default)(?!\\w)",
@@ -241,7 +265,7 @@
 							"include": "#line_continuation_character"
 						},
 						{
-							"include": "#comments-c"
+							"include": "#comments"
 						}
 					]
 				}
@@ -399,7 +423,7 @@
 		},
 		{
 			"name": "meta.function.definition.parameters.cpp",
-			"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()(?=[a-zA-Z_]\\w*\\s*\\()",
+			"begin": "(?<!\\w)(?!\\s*(?:not|compl|sizeof|new|delete|not_eq|bitand|xor|bitor|and|or|throw|and_eq|xor_eq|or_eq|alignof|alignas|typeid|noexcept|static_cast|dynamic_cast|const_cast|reinterpret_cast|while|for|do|if|else|goto|switch|try|catch|return|break|case|continue|default|auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t|NULL|true|false|nullptr|class|struct|union|enum|const|static|volatile|register|restrict|extern|inline|constexpr|mutable|friend|explicit|virtual|volatile|const|noexcept|constexpr|mutable|constexpr|consteval|private|protected|public|this|template|namespace|using|operator|typedef|decltype|typename|asm|__asm__|concept|requires|export|thread_local|atomic_cancel|atomic_commit|atomic_noexcept|co_await|co_return|co_yield|import|module|reflexpr|synchronized)\\s*\\()(?=[a-zA-Z_]\\w*\\s*(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*\\()",
 			"end": "(?<=\\))",
 			"patterns": [
 				{
@@ -443,7 +467,7 @@
 		},
 		{
 			"match": ",",
-			"name": "punctuation.separator.delimiter.cpp"
+			"name": "comma.cpp punctuation.separator.delimiter.cpp"
 		}
 	],
 	"repository": {
@@ -654,7 +678,7 @@
 					"name": "storage.type.cpp"
 				},
 				{
-					"match": "(?<!\\w)(asm|__asm__|enum|union|struct)(?!\\w)",
+					"match": "(?<!\\w)(asm|__asm__)(?!\\w)",
 					"name": "storage.type.$0.cpp"
 				}
 			]
@@ -663,19 +687,78 @@
 			"match": "(?<!\\w)(?:(?:(delete)\\s*(\\[\\])|(delete))|(new))(?!\\w)",
 			"captures": {
 				"1": {
-					"name": "keyword.operator.memory.delete.array.cpp"
+					"name": "keyword.operator.delete.array.cpp"
 				},
 				"2": {
-					"name": "keyword.operator.memory.delete.array.bracket.cpp"
+					"name": "keyword.operator.delete.array.bracket.cpp"
 				},
 				"3": {
-					"name": "keyword.operator.memory.delete.cpp"
+					"name": "keyword.operator.delete.cpp"
 				},
 				"4": {
-					"name": "keyword.operator.memory.new.cpp"
+					"name": "keyword.operator.new.cpp"
 				}
 			},
-			"name": "keyword.operator.memory.cpp"
+			"name": "keyword.operator.wordlike.cpp memory.cpp"
+		},
+		"attribute_cpp": {
+			"name": "support.other.attribute.cpp",
+			"begin": "((?:\\[\\[|__attribute\\(\\(|__attribute__\\(\\(|__declspec\\())",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.begin.cpp"
+				}
+			},
+			"end": "((?:\\]\\]|\\)\\)|\\)))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.attribute.end.cpp"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#attribute_cpp"
+				},
+				{
+					"begin": "\\(",
+					"end": "\\)",
+					"patterns": [
+						{
+							"include": "#attribute_cpp"
+						},
+						{
+							"include": "#strings_c"
+						}
+					]
+				},
+				{
+					"match": "(using)\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\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_]\\w*(?!\\w)(?=::)",
+					"name": "entity.name.namespace.cpp"
+				},
+				{
+					"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+					"name": "entity.other.attribute.$0.cpp"
+				}
+			]
 		},
 		"template_call_innards": {
 			"match": "<(?:[\\s<>,\\w])*>\\s*",
@@ -707,7 +790,7 @@
 						},
 						{
 							"match": ",",
-							"name": "punctuation.separator.comma.template.argument.cpp"
+							"name": "comma.cpp punctuation.separator.template.argument.cpp"
 						}
 					]
 				}
@@ -803,7 +886,7 @@
 						},
 						{
 							"match": ",",
-							"name": "punctuation.separator.comma.template.argument.cpp"
+							"name": "comma.cpp punctuation.separator.template.argument.cpp"
 						}
 					]
 				},
@@ -854,13 +937,13 @@
 					"name": "storage.type.template.cpp"
 				},
 				"5": {
-					"name": "punctuation.vararg-ellipses.template.definition.cpp"
+					"name": "ellipses.cpp punctuation.vararg-ellipses.template.definition.cpp"
 				},
 				"6": {
 					"name": "entity.name.type.template.cpp"
 				},
 				"7": {
-					"name": "punctuation.separator.comma.template.argument.cpp"
+					"name": "comma.cpp punctuation.separator.template.argument.cpp"
 				}
 			}
 		},
@@ -904,7 +987,7 @@
 						},
 						{
 							"match": ",",
-							"name": "punctuation.separator.comma.template.argument.cpp"
+							"name": "comma.cpp punctuation.separator.template.argument.cpp"
 						}
 					]
 				},
@@ -919,16 +1002,16 @@
 			"begin": "((?<!\\w)sizeof(?!\\w))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.sizeof.cpp"
+					"name": "keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof keyword.operator.sizeof.cpp"
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof keyword.operator.sizeof.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.operator.sizeof.cpp keyword.operator.functionlike.cpp keyword.operator.sizeof.cpp"
 				}
 			},
 			"patterns": [
@@ -942,16 +1025,16 @@
 			"begin": "((?<!\\w)alignof(?!\\w))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.alignof.cpp"
+					"name": "keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof keyword.operator.alignof.cpp"
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof keyword.operator.alignof.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.operator.alignof.cpp keyword.operator.functionlike.cpp keyword.operator.alignof.cpp"
 				}
 			},
 			"patterns": [
@@ -965,16 +1048,16 @@
 			"begin": "((?<!\\w)alignas(?!\\w))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.alignas.cpp"
+					"name": "keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas keyword.operator.alignas.cpp"
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas keyword.operator.alignas.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.operator.alignas.cpp keyword.operator.functionlike.cpp keyword.operator.alignas.cpp"
 				}
 			},
 			"patterns": [
@@ -988,16 +1071,16 @@
 			"begin": "((?<!\\w)typeid(?!\\w))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.operator.typeid.cpp"
+					"name": "keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid keyword.operator.typeid.cpp"
+					"name": "punctuation.section.arguments.begin.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid keyword.operator.typeid.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.operator.typeid.cpp keyword.operator.functionlike.cpp keyword.operator.typeid.cpp"
 				}
 			},
 			"patterns": [
@@ -1011,16 +1094,16 @@
 			"begin": "((?<!\\w)decltype(?!\\w))(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.other.decltype storage.type.decltype.cpp"
+					"name": "keyword.operator.functionlike.cpp keyword.other.decltype.cpp storage.type.decltype.cpp"
 				},
 				"2": {
-					"name": "punctuation.section.arguments.begin.bracket.round.decltype storage.type.decltype.cpp"
+					"name": "punctuation.section.arguments.begin.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.arguments.end.bracket.round.decltype storage.type.decltype.cpp"
+					"name": "punctuation.section.arguments.end.bracket.round.decltype.cpp keyword.operator.functionlike.cpp storage.type.decltype.cpp"
 				}
 			},
 			"patterns": [
@@ -1048,7 +1131,7 @@
 				},
 				{
 					"match": "(?<!\\w)(?:static_cast|dynamic_cast|const_cast|reinterpret_cast)(?!\\w)",
-					"name": "keyword.operator.cast.$0.cpp"
+					"name": "keyword.operator.wordlike.cpp keyword.operator.cast.$0.cpp"
 				},
 				{
 					"include": "#method_access"
@@ -1058,7 +1141,7 @@
 				},
 				{
 					"match": "(?<!\\w)(?:not|compl|new|delete|not_eq|bitand|xor|bitor|and|or|and_eq|xor_eq|or_eq|noexcept)(?!\\w)",
-					"name": "keyword.operator.$0.cpp"
+					"name": "keyword.operator.wordlike.cpp alias.cpp keyword.operator.$0.cpp"
 				},
 				{
 					"include": "#vararg_ellipses"
@@ -1161,13 +1244,13 @@
 					]
 				},
 				"3": {
-					"name": "punctuation.section.parameters.begin.bracket.round.cpp"
+					"name": "punctuation.section.parameters.begin.bracket.round.operator-overload.cpp"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "punctuation.section.parameters.end.bracket.round.cpp"
+					"name": "punctuation.section.parameters.end.bracket.round.operator-overload.cpp"
 				}
 			},
 			"patterns": [
@@ -1180,87 +1263,107 @@
 			]
 		},
 		"member_access": {
-			"match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!(?:auto|void|char|short|int|signed|unsigned|long|float|double|bool|wchar_t|u_char|u_short|u_int|u_long|ushort|uint|u_quad_t|quad_t|qaddr_t|caddr_t|daddr_t|div_t|dev_t|fixpt_t|blkcnt_t|blksize_t|gid_t|in_addr_t|in_port_t|ino_t|key_t|mode_t|nlink_t|id_t|pid_t|off_t|segsz_t|swblk_t|uid_t|id_t|clock_t|size_t|ssize_t|time_t|useconds_t|suseconds_t|pthread_attr_t|pthread_cond_t|pthread_condattr_t|pthread_mutex_t|pthread_mutexattr_t|pthread_once_t|pthread_rwlock_t|pthread_rwlockattr_t|pthread_t|pthread_key_t|int8_t|int16_t|int32_t|int64_t|uint8_t|uint16_t|uint32_t|uint64_t|int_least8_t|int_least16_t|int_least32_t|int_least64_t|uint_least8_t|uint_least16_t|uint_least32_t|uint_least64_t|int_fast8_t|int_fast16_t|int_fast32_t|int_fast64_t|uint_fast8_t|uint_fast16_t|uint_fast32_t|uint_fast64_t|intptr_t|uintptr_t|intmax_t|intmax_t|uintmax_t|uintmax_t))[a-zA-Z_]\\w*\\b(?!\\())",
+			"match": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*(\\b(?!auto[^(?-mix:\\w)]|void[^(?-mix:\\w)]|char[^(?-mix:\\w)]|short[^(?-mix:\\w)]|int[^(?-mix:\\w)]|signed[^(?-mix:\\w)]|unsigned[^(?-mix:\\w)]|long[^(?-mix:\\w)]|float[^(?-mix:\\w)]|double[^(?-mix:\\w)]|bool[^(?-mix:\\w)]|wchar_t[^(?-mix:\\w)]|u_char[^(?-mix:\\w)]|u_short[^(?-mix:\\w)]|u_int[^(?-mix:\\w)]|u_long[^(?-mix:\\w)]|ushort[^(?-mix:\\w)]|uint[^(?-mix:\\w)]|u_quad_t[^(?-mix:\\w)]|quad_t[^(?-mix:\\w)]|qaddr_t[^(?-mix:\\w)]|caddr_t[^(?-mix:\\w)]|daddr_t[^(?-mix:\\w)]|div_t[^(?-mix:\\w)]|dev_t[^(?-mix:\\w)]|fixpt_t[^(?-mix:\\w)]|blkcnt_t[^(?-mix:\\w)]|blksize_t[^(?-mix:\\w)]|gid_t[^(?-mix:\\w)]|in_addr_t[^(?-mix:\\w)]|in_port_t[^(?-mix:\\w)]|ino_t[^(?-mix:\\w)]|key_t[^(?-mix:\\w)]|mode_t[^(?-mix:\\w)]|nlink_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|pid_t[^(?-mix:\\w)]|off_t[^(?-mix:\\w)]|segsz_t[^(?-mix:\\w)]|swblk_t[^(?-mix:\\w)]|uid_t[^(?-mix:\\w)]|id_t[^(?-mix:\\w)]|clock_t[^(?-mix:\\w)]|size_t[^(?-mix:\\w)]|ssize_t[^(?-mix:\\w)]|time_t[^(?-mix:\\w)]|useconds_t[^(?-mix:\\w)]|suseconds_t[^(?-mix:\\w)]|pthread_attr_t[^(?-mix:\\w)]|pthread_cond_t[^(?-mix:\\w)]|pthread_condattr_t[^(?-mix:\\w)]|pthread_mutex_t[^(?-mix:\\w)]|pthread_mutexattr_t[^(?-mix:\\w)]|pthread_once_t[^(?-mix:\\w)]|pthread_rwlock_t[^(?-mix:\\w)]|pthread_rwlockattr_t[^(?-mix:\\w)]|pthread_t[^(?-mix:\\w)]|pthread_key_t[^(?-mix:\\w)]|int8_t[^(?-mix:\\w)]|int16_t[^(?-mix:\\w)]|int32_t[^(?-mix:\\w)]|int64_t[^(?-mix:\\w)]|uint8_t[^(?-mix:\\w)]|uint16_t[^(?-mix:\\w)]|uint32_t[^(?-mix:\\w)]|uint64_t[^(?-mix:\\w)]|int_least8_t[^(?-mix:\\w)]|int_least16_t[^(?-mix:\\w)]|int_least32_t[^(?-mix:\\w)]|int_least64_t[^(?-mix:\\w)]|uint_least8_t[^(?-mix:\\w)]|uint_least16_t[^(?-mix:\\w)]|uint_least32_t[^(?-mix:\\w)]|uint_least64_t[^(?-mix:\\w)]|int_fast8_t[^(?-mix:\\w)]|int_fast16_t[^(?-mix:\\w)]|int_fast32_t[^(?-mix:\\w)]|int_fast64_t[^(?-mix:\\w)]|uint_fast8_t[^(?-mix:\\w)]|uint_fast16_t[^(?-mix:\\w)]|uint_fast32_t[^(?-mix:\\w)]|uint_fast64_t[^(?-mix:\\w)]|intptr_t[^(?-mix:\\w)]|uintptr_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|intmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)]|uintmax_t[^(?-mix:\\w)])[a-zA-Z_]\\w*\\b(?!\\())",
 			"captures": {
 				"1": {
-					"name": "variable.other.object.access.cpp"
+					"name": "variable.language.this.cpp"
 				},
 				"2": {
-					"name": "punctuation.separator.dot-access.cpp"
+					"name": "variable.other.object.access.cpp"
 				},
 				"3": {
-					"name": "punctuation.separator.pointer-access.cpp"
+					"name": "punctuation.separator.dot-access.cpp"
 				},
 				"4": {
+					"name": "punctuation.separator.pointer-access.cpp"
+				},
+				"5": {
 					"patterns": [
 						{
-							"include": "#member_access"
-						},
-						{
-							"include": "#method_access"
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?-mix:(?:(?:(?<!\\w)this(?!\\w))|(?:(?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->))))",
+							"name": "variable.other.object.property.cpp"
 						},
 						{
-							"match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
-									"name": "variable.other.object.access.cpp"
+									"name": "variable.language.this.cpp"
 								},
 								"2": {
-									"name": "punctuation.separator.dot-access.cpp"
+									"name": "variable.other.object.access.cpp"
 								},
 								"3": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"4": {
 									"name": "punctuation.separator.pointer-access.cpp"
 								}
 							}
+						},
+						{
+							"include": "#member_access"
+						},
+						{
+							"include": "#method_access"
 						}
 					]
 				},
-				"5": {
-					"name": "variable.other.member.cpp"
+				"6": {
+					"name": "variable.other.property.cpp"
 				}
 			}
 		},
 		"method_access": {
 			"contentName": "meta.function-call.member",
-			"begin": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
+			"begin": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))((?:[a-zA-Z_]\\w*\\s*(?-mix:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->)))\\s*)*)\\s*([a-zA-Z_]\\w*)(\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "variable.other.object.access.cpp"
+					"name": "variable.language.this.cpp"
 				},
 				"2": {
-					"name": "punctuation.separator.dot-access.cpp"
+					"name": "variable.other.object.access.cpp"
 				},
 				"3": {
-					"name": "punctuation.separator.pointer-access.cpp"
+					"name": "punctuation.separator.dot-access.cpp"
 				},
 				"4": {
+					"name": "punctuation.separator.pointer-access.cpp"
+				},
+				"5": {
 					"patterns": [
 						{
-							"include": "#member_access"
-						},
-						{
-							"include": "#method_access"
+							"match": "(?<=(?:\\.\\*|\\.|->|->\\*))\\s*(?-mix:(?:(?:(?<!\\w)this(?!\\w))|(?:(?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:(?:(?:\\.\\*|\\.))|(?:(?:->\\*|->))))",
+							"name": "variable.other.object.property.cpp"
 						},
 						{
-							"match": "((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*)(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
+							"match": "(?:((?<!\\w)this(?!\\w))|((?:[a-zA-Z_]\\w*|(?<=\\]|\\)))\\s*))(?:((?:\\.\\*|\\.))|((?:->\\*|->)))",
 							"captures": {
 								"1": {
-									"name": "variable.other.object.access.cpp"
+									"name": "variable.language.this.cpp"
 								},
 								"2": {
-									"name": "punctuation.separator.dot-access.cpp"
+									"name": "variable.other.object.access.cpp"
 								},
 								"3": {
+									"name": "punctuation.separator.dot-access.cpp"
+								},
+								"4": {
 									"name": "punctuation.separator.pointer-access.cpp"
 								}
 							}
+						},
+						{
+							"include": "#member_access"
+						},
+						{
+							"include": "#method_access"
 						}
 					]
 				},
-				"5": {
+				"6": {
 					"name": "entity.name.function.member.cpp"
 				},
-				"6": {
+				"7": {
 					"name": "punctuation.section.arguments.begin.bracket.round.function.member.cpp"
 				}
 			},
@@ -1277,7 +1380,7 @@
 			]
 		},
 		"lambdas": {
-			"begin": "((?:(?<=[^\\s]|^)(?<![\\w\\]\\)])|(?<=\\Wreturn|^return))\\s*(\\[)((?:.*\\[.*?\\].*?)*.*?)(\\]))",
+			"begin": "((?:(?<=[^\\s]|^)(?<![\\w\\]\\)\\[])|(?<=\\Wreturn|^return))\\s*(\\[(?!\\[))((?:.*\\[.*?\\].*?)*.*?)(\\]))",
 			"beginCaptures": {
 				"2": {
 					"name": "punctuation.definition.capture.begin.lambda.cpp"
@@ -1359,19 +1462,6 @@
 				}
 			]
 		},
-		"angle_brackets": {
-			"begin": "<",
-			"end": ">",
-			"name": "meta.angle-brackets.cpp",
-			"patterns": [
-				{
-					"include": "#angle_brackets"
-				},
-				{
-					"include": "$base"
-				}
-			]
-		},
 		"block": {
 			"begin": "\\{",
 			"beginCaptures": {
@@ -1428,88 +1518,605 @@
 							"include": "#probably_a_parameter"
 						},
 						{
-							"include": "#function-innards-c"
+							"include": "#function-innards-c"
+						}
+					]
+				},
+				{
+					"begin": "(?x)\n(:)\n(\n  (?=\n    \\s*[A-Za-z_][A-Za-z0-9_:]* # actual name\n    \\s* (\\() # opening bracket\n  )\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.initializer-list.parameters.cpp"
+						}
+					},
+					"end": "(?=\\{)",
+					"name": "meta.function.constructor.initializer-list.cpp",
+					"patterns": [
+						{
+							"include": "$base"
+						}
+					]
+				}
+			]
+		},
+		"special_block": {
+			"patterns": [
+				{
+					"include": "#attribute_cpp"
+				},
+				{
+					"name": "meta.using-namespace.cpp",
+					"begin": "(?<!\\w)(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*))?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=;|\\n)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.other.using.directive.cpp"
+						},
+						"2": {
+							"name": "keyword.other.namespace.directive.cpp storage.type.namespace.directive.cpp"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#scope_resolution"
+								}
+							]
+						},
+						"4": {
+							"name": "entity.name.namespace.cpp"
+						}
+					},
+					"end": "(;)",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						}
+					}
+				},
+				{
+					"name": "meta.block.namespace.cpp",
+					"begin": "((?<!\\w)(namespace)\\s+(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)\\s*(?:((?<!\\w)[a-zA-Z_]\\w*(?!\\w))|(?=\\{)))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.head.namespace.cpp"
+						},
+						"2": {
+							"name": "keyword.other.namespace.definition.cpp storage.type.namespace.definition.cpp"
+						},
+						"3": {
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#scope_resolution"
+								}
+							]
+						},
+						"5": {
+							"name": "entity.name.namespace.cpp"
+						}
+					},
+					"end": "(?:(?<=\\})|(?=[;()>\\[\\]=]))",
+					"patterns": [
+						{
+							"name": "meta.head.namespace.cpp",
+							"begin": "\\G",
+							"end": "((?:\\{|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.namespace.cpp"
+								}
+							}
+						},
+						{
+							"name": "meta.body.namespace.cpp",
+							"begin": "(?<=\\{)",
+							"end": "(\\})",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.namespace.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.namespace.cpp",
+							"begin": "(?<=})[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
+						}
+					]
+				},
+				{
+					"name": "meta.block.class.cpp",
+					"begin": "((((?<!\\w)class(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.head.class.cpp"
+						},
+						"3": {
+							"name": "storage.type.$3.cpp"
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"6": {
+							"name": "entity.name.type.$3.cpp"
+						},
+						"7": {
+							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+						},
+						"8": {
+							"patterns": [
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
+								},
+								{
+									"match": "(?:private|protected|public)",
+									"name": "storage.type.modifier.access.$0.cpp"
+								},
+								{
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.inherited.cpp"
+										}
+									}
+								}
+							]
+						}
+					},
+					"end": "(?:(?:(?<=})\\s*(;)|(;))|(?=[;()>\\[\\]=]))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"name": "meta.head.class.cpp",
+							"begin": "\\G",
+							"end": "((?:\\{|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.class.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
+								},
+								{
+									"match": "(?:private|protected|public)",
+									"name": "storage.type.modifier.access.$0.cpp"
+								},
+								{
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.inherited.cpp"
+										}
+									}
+								},
+								{
+									"name": "meta.template.call.cpp",
+									"begin": "(<)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"end": "(>)",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#storage_types"
+										},
+										{
+											"include": "#constants"
+										},
+										{
+											"include": "#scope_resolution"
+										},
+										{
+											"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+											"name": "storage.type.user-defined.cpp"
+										},
+										{
+											"include": "#operators"
+										},
+										{
+											"include": "#number_literal"
+										},
+										{
+											"include": "#strings"
+										},
+										{
+											"match": ",",
+											"name": "comma.cpp punctuation.separator.template.argument.cpp"
+										}
+									]
+								},
+								{
+									"include": "#comments"
+								}
+							]
+						},
+						{
+							"name": "meta.body.class.cpp",
+							"begin": "(?<=\\{)",
+							"end": "(\\})",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.class.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#special_block"
+								},
+								{
+									"include": "#constructor"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.class.cpp",
+							"begin": "(?<=})[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
+						}
+					]
+				},
+				{
+					"name": "meta.block.struct.cpp",
+					"begin": "((((?<!\\w)struct(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?))",
+					"beginCaptures": {
+						"1": {
+							"name": "meta.head.struct.cpp"
+						},
+						"3": {
+							"name": "storage.type.$3.cpp"
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"5": {
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"6": {
+							"name": "entity.name.type.$3.cpp"
+						},
+						"7": {
+							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+						},
+						"8": {
+							"patterns": [
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
+								},
+								{
+									"match": "(?:private|protected|public)",
+									"name": "storage.type.modifier.access.$0.cpp"
+								},
+								{
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.inherited.cpp"
+										}
+									}
+								}
+							]
+						}
+					},
+					"end": "(?:(?:(?<=})\\s*(;)|(;))|(?=[;()>\\[\\]=]))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
+						}
+					},
+					"patterns": [
+						{
+							"name": "meta.head.struct.cpp",
+							"begin": "\\G",
+							"end": "((?:\\{|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.struct.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
+								},
+								{
+									"match": "(?:private|protected|public)",
+									"name": "storage.type.modifier.access.$0.cpp"
+								},
+								{
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.inherited.cpp"
+										}
+									}
+								},
+								{
+									"name": "meta.template.call.cpp",
+									"begin": "(<)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"end": "(>)",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#storage_types"
+										},
+										{
+											"include": "#constants"
+										},
+										{
+											"include": "#scope_resolution"
+										},
+										{
+											"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+											"name": "storage.type.user-defined.cpp"
+										},
+										{
+											"include": "#operators"
+										},
+										{
+											"include": "#number_literal"
+										},
+										{
+											"include": "#strings"
+										},
+										{
+											"match": ",",
+											"name": "comma.cpp punctuation.separator.template.argument.cpp"
+										}
+									]
+								},
+								{
+									"include": "#comments"
+								}
+							]
+						},
+						{
+							"name": "meta.body.struct.cpp",
+							"begin": "(?<=\\{)",
+							"end": "(\\})",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.struct.cpp"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#special_block"
+								},
+								{
+									"include": "#constructor"
+								},
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.struct.cpp",
+							"begin": "(?<=})[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
 						}
 					]
 				},
 				{
-					"begin": "(?x)\n(:)\n(\n  (?=\n    \\s*[A-Za-z_][A-Za-z0-9_:]* # actual name\n    \\s* (\\() # opening bracket\n  )\n)",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.initializer-list.parameters.cpp"
-						}
-					},
-					"end": "(?=\\{)",
-					"name": "meta.function.constructor.initializer-list.cpp",
-					"patterns": [
-						{
-							"include": "$base"
-						}
-					]
-				}
-			]
-		},
-		"special_block": {
-			"patterns": [
-				{
-					"name": "meta.using-namespace-declaration.cpp",
-					"begin": "(?<!\\w)(using)\\s+(namespace)\\s+(?:((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*))?((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?=;|\\n)",
+					"name": "meta.block.union.cpp",
+					"begin": "((((?<!\\w)union(?!\\w))(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={))(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?))",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.other.using.directive.cpp"
-						},
-						"2": {
-							"name": "keyword.other.namespace.directive storage.type.namespace.directive.cpp"
+							"name": "meta.head.union.cpp"
 						},
 						"3": {
+							"name": "storage.type.$3.cpp"
+						},
+						"4": {
 							"patterns": [
 								{
-									"include": "#scope_resolution"
+									"include": "#attribute_cpp"
 								}
 							]
 						},
-						"4": {
-							"name": "entity.name.namespace.cpp"
+						"5": {
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"6": {
+							"name": "entity.name.type.$3.cpp"
+						},
+						"7": {
+							"name": "colon.cpp punctuation.separator.inhertance.cpp"
+						},
+						"8": {
+							"patterns": [
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
+								},
+								{
+									"match": "(?:private|protected|public)",
+									"name": "storage.type.modifier.access.$0.cpp"
+								},
+								{
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.inherited.cpp"
+										}
+									}
+								}
+							]
 						}
 					},
-					"end": "(;)",
+					"end": "(?:(?:(?<=})\\s*(;)|(;))|(?=[;()>\\[\\]=]))",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
-						}
-					}
-				},
-				{
-					"name": "meta.namespace-block.cpp",
-					"begin": "(?<!\\w)(namespace)\\s+((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)\\s*(?:((?<!\\w)[a-zA-Z_]\\w*(?!\\w))|(?=\\{))",
-					"beginCaptures": {
-						"1": {
-							"name": "keyword.other.namespace.definition storage.type.namespace.definition.cpp"
 						},
 						"2": {
-							"patterns": [
-								{
-									"include": "#scope_resolution"
-								}
-							]
-						},
-						"3": {
-							"name": "entity.name.namespace.cpp"
+							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
-					"end": "(?:(?<=\\})|(?=;|,|\\(|\\)|>|\\[|\\]|=))",
 					"patterns": [
 						{
-							"begin": "(\\{)",
-							"beginCaptures": {
+							"name": "meta.head.union.cpp",
+							"begin": "\\G",
+							"end": "((?:\\{|(?=;)))",
+							"endCaptures": {
 								"1": {
-									"name": "punctuation.definition.scope.cpp"
+									"name": "punctuation.section.block.begin.bracket.curly.union.cpp"
 								}
 							},
+							"patterns": [
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.delimiter.inhertance.cpp"
+								},
+								{
+									"match": "(?:private|protected|public)",
+									"name": "storage.type.modifier.access.$0.cpp"
+								},
+								{
+									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
+									"captures": {
+										"1": {
+											"name": "entity.name.type.inherited.cpp"
+										}
+									}
+								},
+								{
+									"name": "meta.template.call.cpp",
+									"begin": "(<)",
+									"beginCaptures": {
+										"1": {
+											"name": "punctuation.section.angle-brackets.begin.template.call.cpp"
+										}
+									},
+									"end": "(>)",
+									"endCaptures": {
+										"1": {
+											"name": "punctuation.section.angle-brackets.end.template.call.cpp"
+										}
+									},
+									"patterns": [
+										{
+											"include": "#storage_types"
+										},
+										{
+											"include": "#constants"
+										},
+										{
+											"include": "#scope_resolution"
+										},
+										{
+											"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+											"name": "storage.type.user-defined.cpp"
+										},
+										{
+											"include": "#operators"
+										},
+										{
+											"include": "#number_literal"
+										},
+										{
+											"include": "#strings"
+										},
+										{
+											"match": ",",
+											"name": "comma.cpp punctuation.separator.template.argument.cpp"
+										}
+									]
+								},
+								{
+									"include": "#comments"
+								}
+							]
+						},
+						{
+							"name": "meta.body.union.cpp",
+							"begin": "(?<=\\{)",
 							"end": "(\\})",
 							"endCaptures": {
 								"1": {
-									"name": "punctuation.definition.scope.cpp"
+									"name": "punctuation.section.block.end.bracket.curly.union.cpp"
 								}
 							},
 							"patterns": [
@@ -1525,130 +2132,204 @@
 							]
 						},
 						{
-							"include": "$base"
+							"name": "meta.tail.union.cpp",
+							"begin": "(?<=})[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
 						}
 					]
 				},
 				{
-					"name": "meta.class-struct-block.cpp",
-					"begin": "(((?<!\\w)(?:class|struct|union|enum)(?!\\w))\\s+((?<!\\w)[a-zA-Z_]\\w*(?!\\w))(?:\\s*(:)\\s*((?:(?:,)?\\s*(?:(?:private|protected|public))?\\s*(?:\\s*(?:,)?\\s*(?!(?:private|protected|public))(?<!\\w)[a-zA-Z_]\\w*(?!\\w))+)*))?)",
+					"name": "meta.block.enum.cpp",
+					"begin": "((enum)\\s+(?:(class|struct)(?:(?:\\s+|((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))|(?={)))?(?:((?:(?:(?:\\[\\[).*?(?:\\]\\])|(?:__attribute\\(\\(|__attribute__\\(\\().*?(?:\\)\\)))|(?:__declspec\\().*?(?:\\)))(?!\\))))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w))?(?:\\s*(:)\\s*(?:(((?:[a-zA-Z_]\\w*\\s*(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?::)*\\s*)([a-zA-Z_]\\w*)\\s*(?:(<(?:[\\s<>,\\w])*>\\s*))?(::)))?\\s*((?<!\\w)[a-zA-Z_]\\w*(?!\\w)))?)",
 					"beginCaptures": {
+						"1": {
+							"name": "meta.head.enum.cpp"
+						},
 						"2": {
-							"name": "storage.type.$2.cpp"
+							"name": "storage.type.enum.cpp"
 						},
 						"3": {
-							"name": "entity.name.type.$1.cpp"
+							"name": "storage.type.enum.enum-key.$3.cpp"
 						},
 						"4": {
-							"name": "punctuation.inhertance.colon.cpp"
+							"patterns": [
+								{
+									"include": "#attribute_cpp"
+								}
+							]
 						},
 						"5": {
 							"patterns": [
 								{
-									"match": ",",
-									"name": "punctuation.separator.delimiter.inhertance.cpp"
+									"include": "#attribute_cpp"
+								}
+							]
+						},
+						"6": {
+							"name": "entity.name.type.enum.cpp"
+						},
+						"7": {
+							"name": "colon.cpp punctuation.separator.type-specifier.cpp"
+						},
+						"8": {
+							"name": "meta.scope-resolution.cpp"
+						},
+						"9": {
+							"patterns": [
+								{
+									"include": "#scope_resolution"
+								}
+							]
+						},
+						"10": {
+							"name": "entity.name.namespace.scope-resolution.cpp"
+						},
+						"11": {
+							"name": "meta.template.call.cpp",
+							"patterns": [
+								{
+									"include": "#storage_types"
 								},
 								{
-									"match": "(?:private|protected|public)",
-									"name": "storage.type.modifier.access.$0.cpp"
+									"include": "#constants"
 								},
 								{
-									"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
-									"captures": {
-										"1": {
-											"name": "entity.name.type.inherited.cpp"
-										}
-									}
+									"include": "#scope_resolution"
+								},
+								{
+									"match": "(?<!\\w)[a-zA-Z_]\\w*(?!\\w)",
+									"name": "storage.type.user-defined.cpp"
+								},
+								{
+									"include": "#operators"
+								},
+								{
+									"include": "#number_literal"
+								},
+								{
+									"include": "#strings"
+								},
+								{
+									"match": ",",
+									"name": "comma.cpp punctuation.separator.template.argument.cpp"
 								}
 							]
+						},
+						"12": {
+							"name": "punctuation.separator.namespace.access.cpp"
+						},
+						"13": {
+							"name": "storage.type.integral.$13.cpp"
 						}
 					},
-					"end": "(?:(?:(?<=\\})|(;))|(?=([()>\\[\\]=])))",
+					"end": "(?:(?:(?<=})\\s*(;)|(;))|(?=[;()>\\[\\]=]))",
 					"endCaptures": {
 						"1": {
 							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
 					"patterns": [
 						{
-							"include": "#angle_brackets"
-						},
-						{
-							"match": ",",
-							"name": "punctuation.separator.delimiter.inhertance.cpp"
-						},
-						{
-							"match": "(?:private|protected|public)",
-							"name": "storage.type.modifier.access.$0.cpp"
-						},
-						{
-							"match": "(?<=private|protected|public|,|:)\\s*(?!(?:private|protected|public))((?<!\\w)[a-zA-Z_]\\w*(?!\\w))",
-							"captures": {
+							"name": "meta.head.enum.cpp",
+							"begin": "\\G",
+							"end": "((?:\\{|(?=;)))",
+							"endCaptures": {
 								"1": {
-									"name": "entity.name.type.inherited.cpp"
+									"name": "punctuation.section.block.begin.bracket.curly.enum.cpp"
 								}
 							}
 						},
 						{
-							"begin": "\\{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.block.begin.bracket.curly.cpp"
-								}
-							},
-							"end": "(\\})(\\s*\\n)?",
+							"name": "meta.body.enum.cpp",
+							"begin": "(?<=\\{)",
+							"end": "(\\})",
 							"endCaptures": {
 								"1": {
-									"name": "punctuation.section.block.end.bracket.curly.cpp"
-								},
-								"2": {
-									"name": "invalid.illegal.you-forgot-semicolon.cpp"
+									"name": "punctuation.section.block.end.bracket.curly.enum.cpp"
 								}
 							},
 							"patterns": [
-								{
-									"include": "#special_block"
-								},
-								{
-									"include": "#constructor"
-								},
 								{
 									"include": "$base"
 								}
 							]
 						},
 						{
-							"include": "$base"
+							"name": "meta.tail.enum.cpp",
+							"begin": "(?<=})[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
 						}
 					]
 				},
 				{
-					"begin": "\\b(extern)(?=\\s*\")",
+					"name": "meta.block.extern.cpp",
+					"begin": "((\\bextern)(?=\\s*\\\"))",
 					"beginCaptures": {
 						"1": {
-							"name": "storage.modifier.cpp"
+							"name": "meta.head.extern.cpp"
+						},
+						"2": {
+							"name": "storage.type.extern.cpp"
+						}
+					},
+					"end": "(?:(?:(?<=})\\s*(;)|(;))|(?=[;()>\\[\\]=]))",
+					"endCaptures": {
+						"1": {
+							"name": "punctuation.terminator.statement.cpp"
+						},
+						"2": {
+							"name": "punctuation.terminator.statement.cpp"
 						}
 					},
-					"end": "(?<=\\})|(?=\\w)|(?=\\s*#\\s*endif\\b)",
-					"name": "meta.extern-block.cpp",
 					"patterns": [
 						{
-							"begin": "\\{",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.section.block.begin.bracket.curly.cpp"
+							"name": "meta.head.extern.cpp",
+							"begin": "\\G",
+							"end": "((?:\\{|(?=;)))",
+							"endCaptures": {
+								"1": {
+									"name": "punctuation.section.block.begin.bracket.curly.extern.cpp"
 								}
 							},
-							"end": "\\}|(?=\\s*#\\s*endif\\b)",
+							"patterns": [
+								{
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.body.extern.cpp",
+							"begin": "(?<=\\{)",
+							"end": "(\\})",
 							"endCaptures": {
-								"0": {
-									"name": "punctuation.section.block.end.bracket.curly.cpp"
+								"1": {
+									"name": "punctuation.section.block.end.bracket.curly.extern.cpp"
 								}
 							},
 							"patterns": [
 								{
-									"include": "#special_block"
-								},
+									"include": "$base"
+								}
+							]
+						},
+						{
+							"name": "meta.tail.extern.cpp",
+							"begin": "(?<=})[\\s\\n]*",
+							"end": "[\\s\\n]*(?=;)",
+							"patterns": [
 								{
 									"include": "$base"
 								}
@@ -1832,7 +2513,7 @@
 				}
 			]
 		},
-		"comments-c": {
+		"comments": {
 			"patterns": [
 				{
 					"captures": {
@@ -1959,7 +2640,7 @@
 				},
 				{
 					"match": "(?-mix:(?<!:):(?!:))",
-					"name": "punctuation.range-based.cpp"
+					"name": "colon.cpp punctuation.separator.range-based.cpp"
 				}
 			]
 		},
@@ -2127,14 +2808,6 @@
 							"include": "$base"
 						}
 					]
-				},
-				{
-					"match": "^\\s*#\\s*(else|elif|endif)\\b",
-					"captures": {
-						"0": {
-							"name": "invalid.illegal.stray-$1.cpp"
-						}
-					}
 				}
 			]
 		},
@@ -2207,14 +2880,6 @@
 							"include": "#block_innards-c"
 						}
 					]
-				},
-				{
-					"match": "^\\s*#\\s*(else|elif|endif)\\b",
-					"captures": {
-						"0": {
-							"name": "invalid.illegal.stray-$1.cpp"
-						}
-					}
 				}
 			]
 		},
@@ -2229,7 +2894,7 @@
 					"name": "invalid.illegal.macro-name.cpp"
 				},
 				{
-					"include": "#comments-c"
+					"include": "#comments"
 				},
 				{
 					"include": "#strings_c"
@@ -2329,7 +2994,7 @@
 							]
 						},
 						{
-							"include": "#comments-c"
+							"include": "#comments"
 						},
 						{
 							"include": "#preprocessor-rule-enabled-elif"
@@ -2426,7 +3091,7 @@
 							]
 						},
 						{
-							"include": "#comments-c"
+							"include": "#comments"
 						},
 						{
 							"include": "#preprocessor-rule-enabled-elif-block"
@@ -2510,7 +3175,7 @@
 					]
 				},
 				{
-					"include": "#comments-c"
+					"include": "#comments"
 				},
 				{
 					"begin": "\\n",
@@ -2569,7 +3234,7 @@
 							]
 						},
 						{
-							"include": "#comments-c"
+							"include": "#comments"
 						},
 						{
 							"begin": "^\\s*((#)\\s*else\\b)",
@@ -2671,7 +3336,7 @@
 							]
 						},
 						{
-							"include": "#comments-c"
+							"include": "#comments"
 						},
 						{
 							"begin": "^\\s*((#)\\s*else\\b)",
@@ -2760,7 +3425,7 @@
 					]
 				},
 				{
-					"include": "#comments-c"
+					"include": "#comments"
 				},
 				{
 					"begin": "\\n",
@@ -2847,7 +3512,7 @@
 					]
 				},
 				{
-					"include": "#comments-c"
+					"include": "#comments"
 				},
 				{
 					"begin": "\\n",
@@ -3087,7 +3752,7 @@
 		"preprocessor-rule-define-line-functions": {
 			"patterns": [
 				{
-					"include": "#comments-c"
+					"include": "#comments"
 				},
 				{
 					"include": "#storage_types"
@@ -3153,7 +3818,10 @@
 		"function-innards-c": {
 			"patterns": [
 				{
-					"include": "#comments-c"
+					"include": "#attribute_cpp"
+				},
+				{
+					"include": "#comments"
 				},
 				{
 					"include": "#storage_types"
@@ -3217,7 +3885,10 @@
 		"function-call-innards-c": {
 			"patterns": [
 				{
-					"include": "#comments-c"
+					"include": "#attribute_cpp"
+				},
+				{
+					"include": "#comments"
 				},
 				{
 					"include": "#storage_types"
@@ -3235,7 +3906,7 @@
 					"begin": "(?x)\n(?!(?:while|for|do|if|else|switch|catch|return|typeid|alignof|alignas|sizeof|and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq|alignof|alignas)\\s*\\()\n(\n(?:new)\\s*((?-mix:(?:(?-mix:(?:<(?:[\\s<>,\\w])*>\\s*)))?)) # actual name\n|\n(?:(?<=operator)(?:[-*&<>=+!]+|\\(\\)|\\[\\]))\n)\n\\s*(\\()",
 					"beginCaptures": {
 						"1": {
-							"name": "keyword.operator.memory.new.cpp"
+							"name": "keyword.operator.wordlike.cpp memory.cpp keyword.operator.new.cpp"
 						},
 						"2": {
 							"patterns": [
@@ -3300,7 +3971,7 @@
 								},
 								{
 									"match": ",",
-									"name": "punctuation.separator.comma.template.argument.cpp"
+									"name": "comma.cpp punctuation.separator.template.argument.cpp"
 								}
 							]
 						},
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index 3e2c5ac607c..c66e666e2dc 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -68,7 +68,12 @@
 		},
 		{
 			"name": "Control flow keywords",
-			"scope": "keyword.control",
+			"scope": [
+				"keyword.control",
+				"keyword.operator.new.cpp",
+				"keyword.operator.delete.cpp",
+				"keyword.other.using"
+			],
 			"settings": {
 				"foreground": "#C586C0"
 			}
diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json
index c34b0981fd6..74bf098818a 100644
--- a/extensions/theme-defaults/themes/hc_black.json
+++ b/extensions/theme-defaults/themes/hc_black.json
@@ -65,7 +65,12 @@
 		},
 		{
 			"name": "Control flow keywords",
-			"scope": "keyword.control",
+			"scope": [
+				"keyword.control",
+				"keyword.operator.new.cpp",
+				"keyword.operator.delete.cpp",
+				"keyword.other.using"
+			],
 			"settings": {
 				"foreground": "#C586C0"
 			}
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index 726cae4058d..c58e8c6f903 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -68,7 +68,12 @@
 		},
 		{
 			"name": "Control flow keywords",
-			"scope": "keyword.control",
+			"scope": [
+				"keyword.control",
+				"keyword.operator.new.cpp",
+				"keyword.operator.delete.cpp",
+				"keyword.other.using"
+			],
 			"settings": {
 				"foreground": "#AF00DB"
 			}
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index d4fbd2f7e2e..8b2110255f2 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -113,7 +113,10 @@
 			"name": "Keywords",
 			"scope": [
 				"keyword",
-				"keyword.control"
+				"keyword.control",
+				"keyword.operator.new.cpp",
+				"keyword.operator.delete.cpp",
+				"keyword.other.using"
 			],
 			"settings": {
 				"foreground": "#98676a"
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
index b50041d6cdd..e5088a0811e 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -255,7 +255,12 @@
 		},
 		{
 			"name": "Keyword Control",
-			"scope": "keyword.control",
+			"scope": [
+				"keyword.control",
+				"keyword.operator.new.cpp",
+				"keyword.operator.delete.cpp",
+				"keyword.other.using"
+			],
 			"settings": {
 				"fontStyle": "",
 				"foreground": "#9872A2"
-- 
GitLab