diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json
index 9c90588adf1..df4e4f0aae9 100644
--- a/extensions/dart/cgmanifest.json
+++ b/extensions/dart/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dart-lang/dart-syntax-highlight",
 					"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
-					"commitHash": "272e2f89f85073c04b7e15b582257f76d2489970"
+					"commitHash": "bb8f7eebf5a1028e70dbebcf35cfef738dddc7fe"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json
index cc9dee8d275..5a4a9393bc7 100644
--- a/extensions/dart/syntaxes/dart.tmLanguage.json
+++ b/extensions/dart/syntaxes/dart.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/dart-lang/dart-syntax-highlight/commit/272e2f89f85073c04b7e15b582257f76d2489970",
+	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/bb8f7eebf5a1028e70dbebcf35cfef738dddc7fe",
 	"name": "Dart",
 	"scopeName": "source.dart",
 	"patterns": [
@@ -14,7 +14,7 @@
 		},
 		{
 			"name": "meta.declaration.dart",
-			"begin": "^\\w*\\b(library|import|part of|part|export)\\b",
+			"begin": "^\\w*\\b(augment\\s+library|library|import\\s+augment|import|part\\s+of|part|export)\\b",
 			"beginCaptures": {
 				"0": {
 					"name": "keyword.other.import.dart"
@@ -208,7 +208,7 @@
 				},
 				{
 					"name": "variable.language.dart",
-					"match": "(?<!\\$)\\b(this|super)\\b(?!\\$)"
+					"match": "(?<!\\$)\\b(this|super|augmented)\\b(?!\\$)"
 				},
 				{
 					"name": "constant.numeric.dart",
@@ -328,11 +328,11 @@
 				},
 				{
 					"name": "keyword.declaration.dart",
-					"match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension type|extension|external|factory|implements|get(?![(<])|mixin|native|operator|set(?![(<])|typedef|with|covariant)\\b(?!\\$)"
+					"match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension\\s+type|extension|external|factory|implements|get(?![(<])|mixin|native|operator|set(?![(<])|typedef|with|covariant)\\b(?!\\$)"
 				},
 				{
 					"name": "storage.modifier.dart",
-					"match": "(?<!\\$)\\b(static|final|const|required|late)\\b(?!\\$)"
+					"match": "(?<!\\$)\\b(macro|augment|static|final|const|required|late)\\b(?!\\$)"
 				},
 				{
 					"name": "storage.type.primitive.dart",
@@ -388,10 +388,33 @@
 				}
 			]
 		},
+		"expression": {
+			"patterns": [
+				{
+					"include": "#constants-and-special-vars"
+				},
+				{
+					"include": "#strings"
+				},
+				{
+					"name": "variable.parameter.dart",
+					"match": "[a-zA-Z0-9_]+"
+				},
+				{
+					"begin": "\\{",
+					"end": "\\}",
+					"patterns": [
+						{
+							"include": "#expression"
+						}
+					]
+				}
+			]
+		},
 		"string-interp": {
 			"patterns": [
 				{
-					"name": "string.interpolated.expression.dart",
+					"name": "meta.embedded.expression.dart",
 					"match": "\\$([a-zA-Z0-9_]+)",
 					"captures": {
 						"1": {
@@ -400,19 +423,12 @@
 					}
 				},
 				{
-					"name": "string.interpolated.expression.dart",
+					"name": "meta.embedded.expression.dart",
 					"begin": "\\$\\{",
 					"end": "\\}",
 					"patterns": [
 						{
-							"include": "#constants-and-special-vars"
-						},
-						{
-							"include": "#strings"
-						},
-						{
-							"name": "variable.parameter.dart",
-							"match": "[a-zA-Z0-9_]+"
+							"include": "#expression"
 						}
 					]
 				},
diff --git a/extensions/go/cgmanifest.json b/extensions/go/cgmanifest.json
index 34d2e164c73..fc3c741c6f6 100644
--- a/extensions/go/cgmanifest.json
+++ b/extensions/go/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "go-syntax",
 					"repositoryUrl": "https://github.com/worlpaker/go-syntax",
-					"commitHash": "6b7e1ad89c031a35a2bf8359538204bcef82f5be"
+					"commitHash": "254bd0f25182c86ffd2043824f8d003e11a34268"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
-			"version": "0.6.5"
+			"version": "0.6.6"
 		}
 	],
 	"version": 1
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index dfda053f9c5..083d4ffb1a4 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/worlpaker/go-syntax/commit/6b7e1ad89c031a35a2bf8359538204bcef82f5be",
+	"version": "https://github.com/worlpaker/go-syntax/commit/254bd0f25182c86ffd2043824f8d003e11a34268",
 	"name": "Go",
 	"scopeName": "source.go",
 	"patterns": [
@@ -265,8 +265,18 @@
 		},
 		"language_constants": {
 			"comment": "Language constants",
-			"match": "\\b(true|false|nil|iota)\\b",
-			"name": "constant.language.go"
+			"match": "\\b(?:(true|false)|(nil)|(iota))\\b",
+			"captures": {
+				"1": {
+					"name": "constant.language.boolean.go"
+				},
+				"2": {
+					"name": "constant.language.null.go"
+				},
+				"3": {
+					"name": "constant.language.iota.go"
+				}
+			}
 		},
 		"comments": {
 			"patterns": [
diff --git a/extensions/julia/cgmanifest.json b/extensions/julia/cgmanifest.json
index 36f64cdda63..9daaee1fdd8 100644
--- a/extensions/julia/cgmanifest.json
+++ b/extensions/julia/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "JuliaEditorSupport/atom-language-julia",
 					"repositoryUrl": "https://github.com/JuliaEditorSupport/atom-language-julia",
-					"commitHash": "c56f92f8120ae9046a064de6351b50b3b5c624a1"
+					"commitHash": "663bf8d943fd8440f4ae7565f73327dd616bf191"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/julia/syntaxes/julia.tmLanguage.json b/extensions/julia/syntaxes/julia.tmLanguage.json
index b6bba37c888..35a4ea7d927 100644
--- a/extensions/julia/syntaxes/julia.tmLanguage.json
+++ b/extensions/julia/syntaxes/julia.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/JuliaEditorSupport/atom-language-julia/commit/c56f92f8120ae9046a064de6351b50b3b5c624a1",
+	"version": "https://github.com/JuliaEditorSupport/atom-language-julia/commit/663bf8d943fd8440f4ae7565f73327dd616bf191",
 	"name": "Julia",
 	"scopeName": "source.julia",
 	"comment": "This grammar is used by Atom (Oniguruma), GitHub (PCRE), and VSCode (Oniguruma),\nso all regexps must be compatible with both engines.\n\nSpecs:\n- https://github.com/kkos/oniguruma/blob/master/doc/RE\n- https://www.pcre.org/current/doc/html/",
@@ -321,7 +321,7 @@
 					"name": "keyword.control.export.julia"
 				},
 				{
-					"match": "\\b(?<![:_])(?:public)\\b",
+					"match": "^(?:public)\\b",
 					"name": "keyword.control.public.julia"
 				},
 				{
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index 758be900ed3..609d875ac2f 100644
--- a/extensions/latex/cgmanifest.json
+++ b/extensions/latex/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "4f8b49bca02b0bfde6e46252c209396ba6c567f9"
+					"commitHash": "56e2dc967e6bafafc1acfeeb80af42b8328b021a"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/latex/syntaxes/LaTeX.tmLanguage.json b/extensions/latex/syntaxes/LaTeX.tmLanguage.json
index 9e520b90573..aad6c5c4bd9 100644
--- a/extensions/latex/syntaxes/LaTeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/LaTeX.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/jlelong/vscode-latex-basics/commit/4f8b49bca02b0bfde6e46252c209396ba6c567f9",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/3d141a124a16558958e95c54267f7ca37986de6f",
 	"name": "LaTeX",
 	"scopeName": "text.tex.latex",
 	"patterns": [
@@ -2903,6 +2903,32 @@
 			"match": "((\\\\)(?:jl|julia)[cv]?)((?:\\[[^\\[]*?\\])?)(?:(?:([^a-zA-Z\\{])(.*?)(\\4))|(?:(\\{)(.*?)(\\})))",
 			"name": "meta.function.verb.latex"
 		},
+		{
+			"begin": "((\\\\)(?:directlua|luadirect))(\\{)",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.verb.latex"
+				},
+				"2": {
+					"name": "punctuation.definition.function.latex"
+				},
+				"3": {
+					"name": "punctuation.definition.arguments.begin.latex"
+				}
+			},
+			"end": "\\}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.arguments.end.latex"
+				}
+			},
+			"contentName": "source.lua",
+			"patterns": [
+				{
+					"include": "source.lua"
+				}
+			]
+		},
 		{
 			"match": "\\\\(?:newline|pagebreak|clearpage|linebreak|pause)(?:\\b)",
 			"name": "keyword.control.layout.latex"
@@ -3016,6 +3042,15 @@
 			"match": "(\\\\)(text(s(terling|ixoldstyle|urd|e(ction|venoldstyle|rvicemark))|yen|n(ineoldstyle|umero|aira)|c(ircledP|o(py(left|right)|lonmonetary)|urrency|e(nt(oldstyle)?|lsius))|t(hree(superior|oldstyle|quarters(emdash)?)|i(ldelow|mes)|w(o(superior|oldstyle)|elveudash)|rademark)|interrobang(down)?|zerooldstyle|o(hm|ne(superior|half|oldstyle|quarter)|penbullet|rd(feminine|masculine))|d(i(scount|ed|v(orced)?)|o(ng|wnarrow|llar(oldstyle)?)|egree|agger(dbl)?|blhyphen(char)?)|uparrow|p(ilcrow|e(so|r(t(housand|enthousand)|iodcentered))|aragraph|m)|e(stimated|ightoldstyle|uro)|quotes(traight(dblbase|base)|ingle)|f(iveoldstyle|ouroldstyle|lorin|ractionsolidus)|won|l(not|ira|e(ftarrow|af)|quill|angle|brackdbl)|a(s(cii(caron|dieresis|acute|grave|macron|breve)|teriskcentered)|cutedbl)|r(ightarrow|e(cipe|ferencemark|gistered)|quill|angle|brackdbl)|g(uarani|ravedbl)|m(ho|inus|u(sicalnote)?|arried)|b(igcircle|orn|ullet|lank|a(ht|rdbl)|rokenbar)))\\b",
 			"name": "constant.character.latex"
 		},
+		{
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.variable.latex"
+				}
+			},
+			"match": "(\\\\)[cgl](?:[_\\p{Alphabetic}@]+)+_(?:bitset|clist|dim|fp|int|muskip|str|tl|bool|box|coffin|flag|fparray|intarray|ior|iow|prop|regex|seq)",
+			"name": "variable.other.latex3.latex"
+		},
 		{
 			"captures": {
 				"1": {
diff --git a/extensions/latex/syntaxes/TeX.tmLanguage.json b/extensions/latex/syntaxes/TeX.tmLanguage.json
index 7c2a4f182fc..205d8bdfce0 100644
--- a/extensions/latex/syntaxes/TeX.tmLanguage.json
+++ b/extensions/latex/syntaxes/TeX.tmLanguage.json
@@ -4,27 +4,27 @@
 		"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/jlelong/vscode-latex-basics/commit/4f8b49bca02b0bfde6e46252c209396ba6c567f9",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/8624d0bdae950a70cdf4a1c3d19c7398ef851721",
 	"name": "TeX",
 	"scopeName": "text.tex",
 	"patterns": [
 		{
-			"begin": "(\\\\)iffalse",
+			"begin": "(?<=^\\s*)((\\\\)iffalse)",
 			"beginCaptures": {
-				"0": {
+				"1": {
 					"name": "keyword.control.tex"
 				},
-				"1": {
+				"2": {
 					"name": "punctuation.definition.keyword.tex"
 				}
 			},
 			"contentName": "comment.line.percentage.tex",
-			"end": "(\\\\)(else|fi)",
+			"end": "(?<=^\\s*)((\\\\)(?:else|fi))",
 			"endCaptures": {
-				"0": {
+				"1": {
 					"name": "keyword.control.tex"
 				},
-				"1": {
+				"2": {
 					"name": "punctuation.definition.keyword.tex"
 				}
 			},
@@ -108,7 +108,7 @@
 					"name": "punctuation.definition.function.tex"
 				}
 			},
-			"match": "(\\\\)(?:[\\p{Alphabetic}@]+|[,;])",
+			"match": "(\\\\)(?:[,;]|(?:[\\p{Alphabetic}@]+(?:(?:_[\\p{Alphabetic}@]+)*:[NncVvoxefTFpwD]*)?))",
 			"name": "support.function.general.tex"
 		},
 		{
@@ -174,8 +174,8 @@
 			]
 		},
 		"conditionals": {
-			"begin": "\\\\(if[a-z]*)",
-			"end": "\\\\fi",
+			"begin": "(?<=^\\s*)\\\\if[a-z]*",
+			"end": "(?<=^\\s*)\\\\fi",
 			"patterns": [
 				{
 					"include": "#comment"
diff --git a/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json b/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json
index b4d42b9973c..1f62f492b76 100644
--- a/extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json
+++ b/extensions/latex/syntaxes/cpp-grammar-bailout.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/jlelong/vscode-latex-basics/commit/ff5e3f24ff5f242d62954cf9e124184f27bf24dd",
+	"version": "https://github.com/jlelong/vscode-latex-basics/commit/f17f354528411340e22402230be1b72e5aa1126a",
 	"name": "C++",
 	"scopeName": "source.cpp.embedded.latex",
 	"patterns": [
@@ -780,7 +780,7 @@
 							"include": "#inheritance_context"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -1503,7 +1503,7 @@
 											"name": "meta.template.call.cpp",
 											"patterns": [
 												{
-													"include": "#template_call_range"
+													"include": "#template_call_range_helper"
 												}
 											]
 										},
@@ -1663,14 +1663,14 @@
 							"name": "entity.name.scope-resolution.constructor.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"7": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -1812,7 +1812,7 @@
 											"name": "meta.template.call.cpp",
 											"patterns": [
 												{
-													"include": "#template_call_range"
+													"include": "#template_call_range_helper"
 												}
 											]
 										},
@@ -2072,24 +2072,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -2150,14 +2133,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"12": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -2420,261 +2403,6 @@
 			},
 			"name": "meta.preprocessor.import.cpp"
 		},
-		"d9bc4796b0b_preprocessor_number_literal": {
-			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*",
-			"captures": {
-				"0": {
-					"patterns": [
-						{
-							"begin": "(?=.)",
-							"end": "$|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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.suffix.literal.built-in.floating-point.cpp 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.suffix.literal.built-in.floating-point.cpp 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.suffix.literal.built-in.integer.cpp 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.suffix.literal.built-in.integer.cpp 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.suffix.literal.built-in.integer.cpp 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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
-										}
-									}
-								},
-								{
-									"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
-									"name": "invalid.illegal.constant.numeric.cpp"
-								}
-							]
-						}
-					]
-				}
-			}
-		},
 		"decltype": {
 			"begin": "((?<!\\w)decltype(?!\\w))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()",
 			"end": "\\)|(?=\\\\end\\{(?:minted|cppcode)\\})",
@@ -3012,14 +2740,14 @@
 							"name": "entity.name.scope-resolution.destructor.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"11": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -3357,7 +3085,7 @@
 				"8": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -3369,7 +3097,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -4013,7 +3741,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -4041,7 +3769,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -4183,24 +3911,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -4261,14 +3972,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"24": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -4404,7 +4115,7 @@
 				"51": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -4527,24 +4238,7 @@
 											"include": "#scope_resolution_inner_generated"
 										},
 										{
-											"begin": "<",
-											"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-											"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"
-												}
-											]
+											"include": "#template_call_range_helper"
 										},
 										{
 											"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}))*",
@@ -4605,14 +4299,14 @@
 											"name": "entity.name.scope-resolution.type.cpp"
 										},
 										{
-											"include": "#template_call_range"
+											"include": "#template_call_range_helper"
 										}
 									]
 								},
 								"17": {
 									"patterns": [
 										{
-											"include": "#template_call_range"
+											"include": "#template_call_range_helper"
 										}
 									]
 								},
@@ -4686,7 +4380,7 @@
 		},
 		"function_pointer": {
 			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
+			"end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w)))+(?=\\s*(?:\\{|;|\\n|\\r|=))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
@@ -4718,24 +4412,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -4796,14 +4473,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"12": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -4955,6 +4632,41 @@
 				},
 				"5": {
 					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"8": {
+					"name": "comment.block.cpp"
+				},
+				"9": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"10": {
+					"name": "storage.modifier.specifier.functional.post-parameters.$10.cpp"
+				},
+				"11": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"12": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"13": {
+					"name": "comment.block.cpp"
+				},
+				"14": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"patterns": [
@@ -4965,7 +4677,7 @@
 		},
 		"function_pointer_parameter": {
 			"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
+			"end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w)))+(?=\\s*(?:\\{|;|\\n|\\r|=))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
 			"beginCaptures": {
 				"1": {
 					"name": "meta.qualified_type.cpp",
@@ -4997,24 +4709,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -5075,14 +4770,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"12": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -5234,6 +4929,41 @@
 				},
 				"5": {
 					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"6": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"7": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"8": {
+					"name": "comment.block.cpp"
+				},
+				"9": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+				},
+				"10": {
+					"name": "storage.modifier.specifier.functional.post-parameters.$10.cpp"
+				},
+				"11": {
+					"patterns": [
+						{
+							"include": "#inline_comment"
+						}
+					]
+				},
+				"12": {
+					"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+				},
+				"13": {
+					"name": "comment.block.cpp"
+				},
+				"14": {
+					"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 				}
 			},
 			"patterns": [
@@ -5613,24 +5343,7 @@
 									"include": "#scope_resolution_inner_generated"
 								},
 								{
-									"begin": "<",
-									"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-									"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"
-										}
-									]
+									"include": "#template_call_range_helper"
 								},
 								{
 									"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}))*",
@@ -5709,14 +5422,14 @@
 									"name": "entity.name.scope-resolution.type.cpp"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
 						"8": {
 							"patterns": [
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -5787,7 +5500,7 @@
 			"name": "invalid.illegal.unexpected.punctuation.definition.comment.end.cpp"
 		},
 		"label": {
-			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\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*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:)",
+			"match": "((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\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*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(:)(?!:)",
 			"captures": {
 				"1": {
 					"patterns": [
@@ -6559,7 +6272,7 @@
 				"7": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -6625,7 +6338,7 @@
 								"3": {
 									"patterns": [
 										{
-											"include": "#template_call_range"
+											"include": "#template_call_range_helper"
 										}
 									]
 								},
@@ -6794,24 +6507,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -6872,14 +6568,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"24": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -7107,24 +6803,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -7185,14 +6864,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"24": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -7655,24 +7334,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -7733,14 +7395,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"16": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -7890,14 +7552,14 @@
 							"name": "entity.name.scope-resolution.operator.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"46": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -7951,14 +7613,14 @@
 							"name": "entity.name.scope-resolution.operator-overload.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"59": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -8111,7 +7773,7 @@
 							"include": "#ever_present_context"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						},
 						{
 							"begin": "\\(",
@@ -9611,7 +9273,7 @@
 					"include": "#scope_resolution_parameter_inner_generated"
 				},
 				{
-					"match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
+					"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 					"name": "storage.type.$0.cpp"
 				},
 				{
@@ -9701,7 +9363,7 @@
 					"name": "entity.name.type.parameter.cpp"
 				},
 				{
-					"include": "#template_call_range"
+					"include": "#template_call_range_helper"
 				},
 				{
 					"match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*)",
@@ -10412,7 +10074,7 @@
 					"include": "#scope_resolution_parameter_inner_generated"
 				},
 				{
-					"match": "(?:(?:struct)|(?:class)|(?:union)|(?:enum))",
+					"match": "(?<!\\w)(?:(?:struct)|(?:class)|(?:union)|(?:enum))(?!\\w)",
 					"name": "storage.type.$0.cpp"
 				},
 				{
@@ -10498,7 +10160,7 @@
 					"name": "entity.name.type.parameter.cpp"
 				},
 				{
-					"include": "#template_call_range"
+					"include": "#template_call_range_helper"
 				},
 				{
 					"match": "((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*)",
@@ -11224,7 +10886,7 @@
 					"include": "#string_context"
 				},
 				{
-					"include": "#d9bc4796b0b_preprocessor_number_literal"
+					"include": "#preprocessor_number_literal"
 				},
 				{
 					"include": "#operators"
@@ -11384,6 +11046,261 @@
 				}
 			]
 		},
+		"preprocessor_number_literal": {
+			"match": "(?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*",
+			"captures": {
+				"0": {
+					"patterns": [
+						{
+							"begin": "(?=.)",
+							"end": "$|(?=\\\\end\\{(?:minted|cppcode)\\})",
+							"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.suffix.literal.built-in.floating-point.cpp 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.suffix.literal.built-in.floating-point.cpp 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.suffix.literal.built-in.integer.cpp 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.suffix.literal.built-in.integer.cpp 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.suffix.literal.built-in.integer.cpp 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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+										}
+									}
+								},
+								{
+									"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+									"name": "invalid.illegal.constant.numeric.cpp"
+								}
+							]
+						}
+					]
+				}
+			}
+		},
 		"qualified_type": {
 			"match": "\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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<11>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.])",
 			"captures": {
@@ -11416,24 +11333,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -11512,14 +11412,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"7": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -11659,24 +11559,7 @@
 									"include": "#scope_resolution_inner_generated"
 								},
 								{
-									"begin": "<",
-									"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-									"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"
-										}
-									]
+									"include": "#template_call_range_helper"
 								},
 								{
 									"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}))*",
@@ -11737,14 +11620,14 @@
 									"name": "entity.name.scope-resolution.type.cpp"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
 						"21": {
 							"patterns": [
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -11940,24 +11823,7 @@
 									"include": "#scope_resolution_inner_generated"
 								},
 								{
-									"begin": "<",
-									"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-									"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"
-										}
-									]
+									"include": "#template_call_range_helper"
 								},
 								{
 									"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}))*",
@@ -12018,14 +11884,14 @@
 									"name": "entity.name.scope-resolution.type.cpp"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
 						"21": {
 							"patterns": [
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -12249,7 +12115,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12271,7 +12137,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12293,7 +12159,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12305,7 +12171,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12340,7 +12206,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12362,7 +12228,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12374,7 +12240,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12409,7 +12275,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12431,7 +12297,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12443,7 +12309,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12478,7 +12344,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12490,7 +12356,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12525,7 +12391,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12547,7 +12413,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12559,7 +12425,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12594,7 +12460,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12616,7 +12482,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12628,7 +12494,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12663,7 +12529,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12685,7 +12551,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12697,7 +12563,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12732,7 +12598,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12754,7 +12620,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12766,7 +12632,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12801,7 +12667,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12823,7 +12689,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12835,7 +12701,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12870,7 +12736,7 @@
 				"2": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				}
@@ -12892,7 +12758,7 @@
 				"3": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12904,7 +12770,7 @@
 					"name": "meta.template.call.cpp",
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -12960,24 +12826,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -13056,14 +12905,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"8": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -14310,8 +14159,8 @@
 					]
 				},
 				{
-					"begin": "((?:[uUL]8?)?R)\\\"(?:[pP]?(?:sql|SQL)|d[dm]l)\\(",
-					"end": "\\)(?:[pP]?(?:sql|SQL)|d[dm]l)\\\"|(?=\\\\end\\{(?:minted|cppcode)\\})",
+					"begin": "((?:[uUL]8?)?R)\\\"\\(",
+					"end": "\\)\\\"|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.cpp"
@@ -14325,18 +14174,16 @@
 							"name": "punctuation.definition.string.end.cpp"
 						}
 					},
-					"name": "meta.string.quoted.double.raw.sql.cpp",
+					"name": "string.quoted.double.raw.cpp",
 					"patterns": [
-						{
-							"include": "source.sql"
-						}
+						{}
 					]
 				},
 				{
 					"begin": "((?:u|u8|U|L)?R)\"(?:([^ ()\\\\\\t]{0,16})|([^ ()\\\\\\t]*))\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin"
+							"name": "punctuation.definition.string.$2.begin"
 						},
 						"1": {
 							"name": "meta.encoding"
@@ -14345,25 +14192,29 @@
 							"name": "invalid.illegal.delimiter-too-long"
 						}
 					},
-					"end": "(\\)\\2(\\3)\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?|(?=\\\\end\\{(?:minted|cppcode)\\})",
+					"end": "(\\)(\\2)(\\3)\")(?:((?:[a-zA-Z]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*)|(_(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U[0-9a-fA-F]{8}))*))?|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"endCaptures": {
 						"1": {
-							"name": "punctuation.definition.string.end"
-						},
-						"2": {
-							"name": "invalid.illegal.delimiter-too-long"
+							"name": "punctuation.definition.string.$2.end"
 						},
 						"3": {
-							"name": "keyword.other.suffix.literal.user-defined.reserved.string.cpp"
+							"name": "invalid.illegal.delimiter-too-long"
 						},
 						"4": {
+							"name": "keyword.other.suffix.literal.user-defined.reserved.string.cpp"
+						},
+						"5": {
 							"name": "keyword.other.suffix.literal.user-defined.string.cpp"
 						}
 					},
-					"name": "string.quoted.double.raw"
+					"name": "string.quoted.double.raw.$2"
 				}
 			]
 		},
+		"string_escaped_char": {
+			"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"
+		},
 		"string_escapes_context_c": {
 			"patterns": [
 				{
@@ -14575,7 +14426,7 @@
 							"include": "#inheritance_context"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -14947,7 +14798,7 @@
 					"include": "#ever_present_context"
 				},
 				{
-					"include": "#template_call_range"
+					"include": "#template_call_range_helper"
 				},
 				{
 					"include": "#storage_types"
@@ -14981,7 +14832,7 @@
 				"0": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -15017,6 +14868,615 @@
 				}
 			]
 		},
+		"template_call_range_helper": {
+			"patterns": [
+				{
+					"match": "\\b((?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(<<)",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"begin": "(?=.)",
+									"end": "$|(?=\\\\end\\{(?:minted|cppcode)\\})",
+									"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*)?$)",
+											"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.suffix.literal.built-in.floating-point.cpp keyword.other.unit.suffix.floating-point.cpp"
+												},
+												"12": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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": {
+												"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.suffix.literal.built-in.floating-point.cpp keyword.other.unit.suffix.floating-point.cpp"
+												},
+												"11": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"5": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"5": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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"
+												},
+												"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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"9": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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": {
+												"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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"8": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp keyword.other.unit.user-defined.cpp"
+												}
+											}
+										},
+										{
+											"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+											"name": "invalid.illegal.constant.numeric.cpp"
+										}
+									]
+								}
+							]
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "keyword.operator.bitwise.shift.cpp"
+						}
+					}
+				},
+				{
+					"match": "\\b((?<!\\w)\\.?\\d(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])*)((?:((?:\\s*+\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(<)",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"begin": "(?=.)",
+									"end": "$|(?=\\\\end\\{(?:minted|cppcode)\\})",
+									"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*)?$)",
+											"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.suffix.literal.built-in.floating-point.cpp keyword.other.unit.suffix.floating-point.cpp"
+												},
+												"12": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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": {
+												"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.suffix.literal.built-in.floating-point.cpp keyword.other.unit.suffix.floating-point.cpp"
+												},
+												"11": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"5": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"5": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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"
+												},
+												"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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"9": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp 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": {
+												"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.suffix.literal.built-in.integer.cpp keyword.other.unit.suffix.integer.cpp"
+												},
+												"8": {
+													"name": "keyword.other.suffix.literal.user-defined.integer.cpp keyword.other.unit.user-defined.cpp"
+												}
+											}
+										},
+										{
+											"match": "(?:(?:[0-9a-zA-Z_\\.]|')|(?<=[eEpP])[+-])+",
+											"name": "invalid.illegal.constant.numeric.cpp"
+										}
+									]
+								}
+							]
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"3": {
+							"patterns": [
+								{
+									"match": "\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+",
+									"captures": {
+										"1": {
+											"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+										},
+										"2": {
+											"name": "comment.block.cpp"
+										},
+										"3": {
+											"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+										}
+									}
+								}
+							]
+						},
+						"4": {
+							"name": "keyword.operator.comparison.cpp"
+						}
+					}
+				},
+				{
+					"include": "#template_call_range"
+				}
+			]
+		},
 		"template_definition": {
 			"begin": "(?<!\\w)(template)(?:\\s+)?(<)",
 			"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
@@ -15400,24 +15860,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -15496,14 +15939,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"15": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -15906,7 +16349,7 @@
 									"include": "#inheritance_context"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -16065,7 +16508,7 @@
 			"patterns": [
 				{
 					"begin": "(\\s*+((?:(?:(?:\\[\\[.*?\\]\\]|__attribute(?:__)?\\s*\\(\\s*\\(.*?\\)\\s*\\))|__declspec\\(.*?\\))|alignas\\(.*?\\))(?!\\)))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:(?:(?:unsigned)|(?:signed)|(?:short)|(?:long))|(?:(?:struct)|(?:class)|(?:union)|(?:enum)))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:((?:::)?(?:(?!\\b(?:__has_cpp_attribute|reinterpret_cast|atomic_noexcept|atomic_commit|atomic_cancel|__has_include|thread_local|dynamic_cast|synchronized|static_cast|const_cast|consteval|co_return|protected|constinit|constexpr|co_return|consteval|namespace|constexpr|constexpr|co_await|explicit|volatile|noexcept|co_yield|noexcept|noexcept|requires|typename|decltype|operator|template|continue|co_await|co_yield|volatile|register|restrict|reflexpr|mutable|alignof|include|private|defined|typedef|_Pragma|__asm__|concept|mutable|warning|default|virtual|alignas|public|sizeof|delete|not_eq|bitand|and_eq|xor_eq|typeid|switch|return|struct|static|extern|inline|friend|ifndef|define|pragma|export|import|module|catch|throw|const|or_eq|compl|while|ifdef|const|bitor|union|class|undef|error|break|using|endif|goto|line|enum|this|case|else|elif|else|not|try|for|asm|and|xor|new|do|if|or|if)\\b)(?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(((?<!<)<(?!<)(?:(?:\\/\\*(?:[^\\*]++|\\*+(?!\\/))*+\\*\\/)|(?:\"(?:[^\"]*|\\\\\")\")|(?:'(?:[^']*|\\\\')')|\\g<18>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)\\s*+)?::)*+)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?!(?:(?:transaction_safe_dynamic)|(?:__has_cpp_attribute)|(?:reinterpret_cast)|(?:transaction_safe)|(?:atomic_noexcept)|(?:atomic_commit)|(?:__has_include)|(?:atomic_cancel)|(?:synchronized)|(?:thread_local)|(?:dynamic_cast)|(?:static_cast)|(?:const_cast)|(?:constexpr)|(?:co_return)|(?:constinit)|(?:namespace)|(?:protected)|(?:consteval)|(?:constexpr)|(?:constexpr)|(?:co_return)|(?:consteval)|(?:co_await)|(?:continue)|(?:template)|(?:reflexpr)|(?:volatile)|(?:register)|(?:co_await)|(?:co_yield)|(?:restrict)|(?:noexcept)|(?:volatile)|(?:override)|(?:explicit)|(?:decltype)|(?:operator)|(?:noexcept)|(?:noexcept)|(?:typename)|(?:requires)|(?:co_yield)|(?:nullptr)|(?:alignof)|(?:alignas)|(?:default)|(?:mutable)|(?:virtual)|(?:mutable)|(?:private)|(?:include)|(?:warning)|(?:_Pragma)|(?:defined)|(?:typedef)|(?:__asm__)|(?:concept)|(?:define)|(?:module)|(?:sizeof)|(?:switch)|(?:delete)|(?:pragma)|(?:and_eq)|(?:inline)|(?:xor_eq)|(?:typeid)|(?:import)|(?:extern)|(?:public)|(?:bitand)|(?:static)|(?:export)|(?:return)|(?:friend)|(?:ifndef)|(?:not_eq)|(?:false)|(?:final)|(?:break)|(?:const)|(?:catch)|(?:endif)|(?:ifdef)|(?:undef)|(?:error)|(?:audit)|(?:while)|(?:using)|(?:axiom)|(?:or_eq)|(?:compl)|(?:throw)|(?:bitor)|(?:const)|(?:line)|(?:case)|(?:else)|(?:this)|(?:true)|(?:goto)|(?:else)|(?:NULL)|(?:elif)|(?:new)|(?:asm)|(?:xor)|(?:and)|(?:try)|(?:not)|(?:for)|(?:do)|(?:if)|(?:or)|(?:if))\\b)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-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>|(?:(?:[^'\"<>\\/]|\\/[^*])++))*>)?(?![\\w<:.]))(((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))?(?:(?:&|\\*)((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))*(?:&|\\*))?((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(\\()(\\*)(?:\\s+)?((?:(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{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*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
+					"end": "(\\))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))(?:(?:((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z))((?<!\\w)(?:(?:override)|(?:volatile)|(?:noexcept)|(?:final)|(?:const))(?!\\w)))+(?=\\s*(?:\\{|;|\\n|\\r|=))((?:(?:(?:\\s*+(\\/\\*)((?:[^\\*]++|\\*+(?!\\/))*+(\\*\\/))\\s*+)+)|(?:\\s++)|(?<=\\W)|(?=\\W)|^|(?:\\n?$)|\\A|\\Z)))?(?=[{=,);>]|\\n)(?!\\()|(?=\\\\end\\{(?:minted|cppcode)\\})",
 					"beginCaptures": {
 						"1": {
 							"name": "meta.qualified_type.cpp",
@@ -16097,24 +16540,7 @@
 									"include": "#scope_resolution_inner_generated"
 								},
 								{
-									"begin": "<",
-									"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-									"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"
-										}
-									]
+									"include": "#template_call_range_helper"
 								},
 								{
 									"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}))*",
@@ -16175,14 +16601,14 @@
 									"name": "entity.name.scope-resolution.type.cpp"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
 						"12": {
 							"patterns": [
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -16334,6 +16760,41 @@
 						},
 						"5": {
 							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						"6": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"7": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"8": {
+							"name": "comment.block.cpp"
+						},
+						"9": {
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
+						},
+						"10": {
+							"name": "storage.modifier.specifier.functional.post-parameters.$10.cpp"
+						},
+						"11": {
+							"patterns": [
+								{
+									"include": "#inline_comment"
+								}
+							]
+						},
+						"12": {
+							"name": "comment.block.cpp punctuation.definition.comment.begin.cpp"
+						},
+						"13": {
+							"name": "comment.block.cpp"
+						},
+						"14": {
+							"name": "comment.block.cpp punctuation.definition.comment.end.cpp"
 						}
 					},
 					"patterns": [
@@ -16549,7 +17010,7 @@
 									"include": "#inheritance_context"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -16901,7 +17362,7 @@
 									"include": "#inheritance_context"
 								},
 								{
-									"include": "#template_call_range"
+									"include": "#template_call_range_helper"
 								}
 							]
 						},
@@ -17173,24 +17634,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -17269,14 +17713,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"13": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -17569,7 +18013,7 @@
 							"include": "#inheritance_context"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -17828,7 +18272,7 @@
 				"5": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -17931,24 +18375,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -18027,14 +18454,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"12": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
@@ -18296,24 +18723,7 @@
 							"include": "#scope_resolution_inner_generated"
 						},
 						{
-							"begin": "<",
-							"end": ">|(?=\\\\end\\{(?:minted|cppcode)\\})",
-							"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"
-								}
-							]
+							"include": "#template_call_range_helper"
 						},
 						{
 							"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}))*",
@@ -18392,14 +18802,14 @@
 							"name": "entity.name.scope-resolution.type.cpp"
 						},
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
 				"12": {
 					"patterns": [
 						{
-							"include": "#template_call_range"
+							"include": "#template_call_range_helper"
 						}
 					]
 				},
diff --git a/extensions/less/cgmanifest.json b/extensions/less/cgmanifest.json
index 663e1cc4daf..caf908bbcc0 100644
--- a/extensions/less/cgmanifest.json
+++ b/extensions/less/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-less",
 					"repositoryUrl": "https://github.com/radium-v/Better-Less",
-					"commitHash": "05de79f600227201e35f07a49f07acce80e49dbf"
+					"commitHash": "24047277622c245dbe9309f0004d0ccb8f02636f"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/less/syntaxes/less.tmLanguage.json b/extensions/less/syntaxes/less.tmLanguage.json
index 3d2c6bdaeb0..2acac688385 100644
--- a/extensions/less/syntaxes/less.tmLanguage.json
+++ b/extensions/less/syntaxes/less.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/radium-v/Better-Less/commit/05de79f600227201e35f07a49f07acce80e49dbf",
+	"version": "https://github.com/radium-v/Better-Less/commit/24047277622c245dbe9309f0004d0ccb8f02636f",
 	"name": "Less",
 	"scopeName": "source.css.less",
 	"patterns": [
@@ -3966,7 +3966,7 @@
 							]
 						},
 						{
-							"begin": "\\bfilter\\b",
+							"begin": "\\b(?:backdrop-)?filter\\b",
 							"beginCaptures": {
 								"0": {
 									"name": "support.type.property-name.less"
diff --git a/extensions/lua/cgmanifest.json b/extensions/lua/cgmanifest.json
index 50afc15d1cf..f35219d5a61 100644
--- a/extensions/lua/cgmanifest.json
+++ b/extensions/lua/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "sumneko/lua.tmbundle",
 					"repositoryUrl": "https://github.com/sumneko/lua.tmbundle",
-					"commitHash": "94ce82cc4d45f82641a5252d7a7fd9e28c875adc"
+					"commitHash": "1483add845ebfb3e1e631fe372603e5fed2cdd42"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/lua/syntaxes/lua.tmLanguage.json b/extensions/lua/syntaxes/lua.tmLanguage.json
index e578b8846cb..61875d06cf8 100644
--- a/extensions/lua/syntaxes/lua.tmLanguage.json
+++ b/extensions/lua/syntaxes/lua.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/sumneko/lua.tmbundle/commit/94ce82cc4d45f82641a5252d7a7fd9e28c875adc",
+	"version": "https://github.com/sumneko/lua.tmbundle/commit/1483add845ebfb3e1e631fe372603e5fed2cdd42",
 	"name": "Lua",
 	"scopeName": "source.lua",
 	"patterns": [
@@ -141,8 +141,8 @@
 		{
 			"match": "<\\s*(const|close)\\s*>",
 			"captures": {
-				"1": {
-					"name": "string.tag.lua"
+				"0": {
+					"name": "storage.type.attribute.lua"
 				}
 			}
 		},
@@ -155,7 +155,7 @@
 			"name": "keyword.control.lua"
 		},
 		{
-			"match": "\\b(local|global)\\b",
+			"match": "\\b(local)\\b",
 			"name": "keyword.local.lua"
 		},
 		{
@@ -363,7 +363,7 @@
 									"name": "punctuation.definition.comment.begin.lua"
 								}
 							},
-							"end": "\\]\\1\\]",
+							"end": "(--)?\\]\\1\\]",
 							"endCaptures": {
 								"0": {
 									"name": "punctuation.definition.comment.end.lua"
@@ -383,7 +383,7 @@
 									"name": "punctuation.definition.comment.begin.lua"
 								}
 							},
-							"end": "\\]\\1\\]",
+							"end": "(--)?\\]\\1\\]",
 							"endCaptures": {
 								"0": {
 									"name": "punctuation.definition.comment.end.lua"
@@ -472,7 +472,7 @@
 		"emmydoc": {
 			"patterns": [
 				{
-					"begin": "(?<=---[ \\t]*)@class",
+					"begin": "(?<=---)[ \\t]*@class",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -491,7 +491,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@enum",
+					"begin": "(?<=---)[ \\t]*@enum",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -511,7 +511,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@type",
+					"begin": "(?<=---)[ \\t]*@type",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -525,7 +525,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@alias",
+					"begin": "(?<=---)[ \\t]*@alias",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -550,7 +550,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)(@operator)\\s*(\\b[a-z]+)?",
+					"begin": "(?<=---)[ \\t]*(@operator)\\s*(\\b[a-z]+)?",
 					"beginCaptures": {
 						"1": {
 							"name": "storage.type.annotation.lua"
@@ -567,7 +567,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@cast",
+					"begin": "(?<=---)[ \\t]*@cast",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -596,7 +596,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@param",
+					"begin": "(?<=---)[ \\t]*@param",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -624,7 +624,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@return",
+					"begin": "(?<=---)[ \\t]*@return",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -642,7 +642,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@field",
+					"begin": "(?<=---)[ \\t]*@field",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -677,7 +677,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@generic",
+					"begin": "(?<=---)[ \\t]*@generic",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -711,7 +711,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@vararg",
+					"begin": "(?<=---)[ \\t]*@vararg",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -725,7 +725,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@overload",
+					"begin": "(?<=---)[ \\t]*@overload",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -739,7 +739,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@deprecated",
+					"begin": "(?<=---)[ \\t]*@deprecated",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -748,7 +748,7 @@
 					"end": "(?=[\\n@#])"
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@meta",
+					"begin": "(?<=---)[ \\t]*@meta",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -757,7 +757,7 @@
 					"end": "(?=[\\n@#])"
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@private",
+					"begin": "(?<=---)[ \\t]*@private",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -766,7 +766,7 @@
 					"end": "(?=[\\n@#])"
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@protected",
+					"begin": "(?<=---)[ \\t]*@protected",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -775,7 +775,7 @@
 					"end": "(?=[\\n@#])"
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@package",
+					"begin": "(?<=---)[ \\t]*@package",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -784,7 +784,7 @@
 					"end": "(?=[\\n@#])"
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@version",
+					"begin": "(?<=---)[ \\t]*@version",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -803,7 +803,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@see",
+					"begin": "(?<=---)[ \\t]*@see",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -822,7 +822,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@diagnostic",
+					"begin": "(?<=---)[ \\t]*@diagnostic",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -855,7 +855,7 @@
 					]
 				},
 				{
-					"begin": "(?<=---[ \\t]*)@module",
+					"begin": "(?<=---)[ \\t]*@module",
 					"beginCaptures": {
 						"0": {
 							"name": "storage.type.annotation.lua"
@@ -869,7 +869,7 @@
 					]
 				},
 				{
-					"match": "(?<=---[ \\t]*)@(async|nodiscard)",
+					"match": "(?<=---)[ \\t]*@(async|nodiscard)",
 					"name": "storage.type.annotation.lua"
 				},
 				{
diff --git a/extensions/razor/cgmanifest.json b/extensions/razor/cgmanifest.json
index d3685974bdb..b8b0e5dae4f 100644
--- a/extensions/razor/cgmanifest.json
+++ b/extensions/razor/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/razor",
 					"repositoryUrl": "https://github.com/dotnet/razor",
-					"commitHash": "f01e110af179981942987384d2b5d4e489eab014"
+					"commitHash": "39159764277f3c80a786d8872eba7730da3d7ef0"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/razor/syntaxes/cshtml.tmLanguage.json b/extensions/razor/syntaxes/cshtml.tmLanguage.json
index 389a6daf249..71055e66e10 100644
--- a/extensions/razor/syntaxes/cshtml.tmLanguage.json
+++ b/extensions/razor/syntaxes/cshtml.tmLanguage.json
@@ -4,9 +4,31 @@
 		"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/dotnet/razor/commit/f01e110af179981942987384d2b5d4e489eab014",
+	"version": "https://github.com/dotnet/razor/commit/39159764277f3c80a786d8872eba7730da3d7ef0",
 	"name": "ASP.NET Razor",
 	"scopeName": "text.html.cshtml",
+	"injections": {
+		"string.quoted.double.html": {
+			"patterns": [
+				{
+					"include": "#explicit-razor-expression"
+				},
+				{
+					"include": "#implicit-expression"
+				}
+			]
+		},
+		"string.quoted.single.html": {
+			"patterns": [
+				{
+					"include": "#explicit-razor-expression"
+				},
+				{
+					"include": "#implicit-expression"
+				}
+			]
+		}
+	},
 	"patterns": [
 		{
 			"include": "#razor-control-structures"
diff --git a/extensions/shellscript/cgmanifest.json b/extensions/shellscript/cgmanifest.json
index 01ceff5f55a..48f939ecc45 100644
--- a/extensions/shellscript/cgmanifest.json
+++ b/extensions/shellscript/cgmanifest.json
@@ -6,11 +6,11 @@
 				"git": {
 					"name": "jeff-hykin/better-shell-syntax",
 					"repositoryUrl": "https://github.com/jeff-hykin/better-shell-syntax",
-					"commitHash": "21748db7c7fd6ccd660c5bc770212836e58385ae"
+					"commitHash": "6d0bc37a6b8023a5fddf75bd2b4eb1e1f962e4c2"
 				}
 			},
 			"license": "MIT",
-			"version": "1.8.3"
+			"version": "1.8.7"
 		}
 	],
 	"version": 1
diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
index 28492442703..7aae970d227 100644
--- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+++ b/extensions/shellscript/syntaxes/shell-unix-bash.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-shell-syntax/commit/21748db7c7fd6ccd660c5bc770212836e58385ae",
+	"version": "https://github.com/jeff-hykin/better-shell-syntax/commit/6d0bc37a6b8023a5fddf75bd2b4eb1e1f962e4c2",
 	"name": "Shell Script",
 	"scopeName": "source.shell",
 	"patterns": [
@@ -14,7 +14,7 @@
 	],
 	"repository": {
 		"alias_statement": {
-			"begin": "(?:(alias)(?:[ \\t]*+)((?:(?:((?<!\\w)-\\w+\\b)(?:[ \\t]*+))*))(?:(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))))",
+			"begin": "(?:(?:[ \\t]*+)(alias)(?:[ \\t]*+)((?:(?:((?<!\\w)-\\w+\\b)(?:[ \\t]*+))*))(?:(?:[ \\t]*+)(?:((?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))(?:(?:(\\[)((?:(?:(?:(?:\\$?)(?:(?<!\\w)(?:[a-zA-Z_0-9-]+)(?!\\w))|@)|\\*)|(-?\\d+)))(\\]))?))(?:(?:(\\=)|(\\+\\=))|(\\-\\=))))",
 			"end": "(?:(?= |\\t|$)|(?:(?:(?:(;)|(&&))|(\\|\\|))|(&)))",
 			"beginCaptures": {
 				"1": {
@@ -95,7 +95,7 @@
 		"argument_context": {
 			"patterns": [
 				{
-					"match": "(?:[ \\t]*+)((?:[^ \t\n'&;<>\\(\\)\\$`\\\\\"\\|]+)(?!>))",
+					"match": "(?:[ \\t]*+)((?:[^ \t\n>&;<>\\(\\)\\$`\\\\\"'<\\|]+)(?!>))",
 					"captures": {
 						"1": {
 							"name": "string.unquoted.argument.shell",
@@ -296,7 +296,7 @@
 			]
 		},
 		"basic_command_name": {
-			"match": "(?:(?:(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!nocorrect |nocorrect\t|nocorrect$|readonly |readonly\t|readonly$|function |function\t|function$|foreach |foreach\t|foreach$|coproc |coproc\t|coproc$|logout |logout\t|logout$|export |export\t|export$|select |select\t|select$|repeat |repeat\t|repeat$|pushd |pushd\t|pushd$|until |until\t|until$|while |while\t|while$|local |local\t|local$|case |case\t|case$|done |done\t|done$|elif |elif\t|elif$|else |else\t|else$|esac |esac\t|esac$|popd |popd\t|popd$|then |then\t|then$|time |time\t|time$|for |for\t|for$|end |end\t|end$|fi |fi\t|fi$|do |do\t|do$|in |in\t|in$|if |if\t|if$))(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)(?:[^!'\" \\t\\n\\r]+?)))(?:(?= |\\t)|(?:(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))))",
+			"match": "(?:(?:(?!(?:!|&|\\||\\(|\\)|\\{|\\[|<|>|#|\\n|$|;|[ \\t]))(?!nocorrect |nocorrect\t|nocorrect$|readonly |readonly\t|readonly$|function |function\t|function$|foreach |foreach\t|foreach$|coproc |coproc\t|coproc$|logout |logout\t|logout$|export |export\t|export$|select |select\t|select$|repeat |repeat\t|repeat$|pushd |pushd\t|pushd$|until |until\t|until$|while |while\t|while$|local |local\t|local$|case |case\t|case$|done |done\t|done$|elif |elif\t|elif$|else |else\t|else$|esac |esac\t|esac$|popd |popd\t|popd$|then |then\t|then$|time |time\t|time$|for |for\t|for$|end |end\t|end$|fi |fi\t|fi$|do |do\t|do$|in |in\t|in$|if |if\t|if$))(?:((?<=^|;|&|[ \\t])(?:readonly|declare|typeset|export|local)(?=[ \\t]|;|&|$))|((?!\"|'|\\\\\\n?$)(?:[^!'\"<> \\t\\n\\r]+?)))(?:(?= |\\t)|(?:(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\))))",
 			"captures": {
 				"1": {
 					"name": "storage.modifier.$1.shell"
@@ -435,10 +435,18 @@
 					"name": "keyword.operator.orvariable.language.special.or.shell keyword.operator.alternation.ruby.shell punctuation.definition.regex.alternation.shell punctuation.separator.regex.alternation.shell"
 				},
 				{
-					"begin": "\\(",
+					"match": "\\\\.",
+					"name": "constant.character.escape.shell"
+				},
+				{
+					"match": "(?<=\\tin| in| |\\t|;;)\\(",
+					"name": "keyword.operator.pattern.case.shell"
+				},
+				{
+					"begin": "(?<=\\S)(\\()",
 					"end": "\\)",
 					"beginCaptures": {
-						"0": {
+						"1": {
 							"name": "punctuation.definition.group.shell punctuation.definition.regex.group.shell"
 						}
 					},
@@ -486,7 +494,7 @@
 		},
 		"command_name_range": {
 			"begin": "\\G",
-			"end": "(?= |\\t|;|\\||&|$|\\n|\\)|\\`)",
+			"end": "(?:(?= |\\t|;|\\||&|$|\\n|\\)|\\`)|(?=<))",
 			"beginCaptures": {},
 			"endCaptures": {},
 			"name": "meta.statement.command.name.shell",
@@ -503,7 +511,7 @@
 					"include": "#variable"
 				},
 				{
-					"match": "(?:(?<!\\w)(?<=\\G|'|\"|\\}|\\))([^ \\n\\t\\r\"'=;&\\|`\\)\\{]+))",
+					"match": "(?:(?<!\\w)(?<=\\G|'|\"|\\}|\\))([^ \\n\\t\\r\"'=;&\\|`\\)\\{<>]+))",
 					"captures": {
 						"1": {
 							"name": "entity.name.function.call.shell entity.name.command.shell"
@@ -564,6 +572,9 @@
 				},
 				{
 					"include": "#string"
+				},
+				{
+					"include": "#heredoc"
 				}
 			]
 		},
@@ -867,7 +878,7 @@
 					},
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.heredoc.delimiter.shell"
+							"name": "punctuation.definition.string.heredoc.$0.shell"
 						}
 					},
 					"contentName": "string.quoted.heredoc.indent.$3",
@@ -1500,6 +1511,30 @@
 				}
 			]
 		},
+		"math_operators": {
+			"patterns": [
+				{
+					"match": "\\+{1,2}|-{1,2}|!|~|\\*{1,2}|/|%|<[<=]?|>[>=]?|==|!=|^|\\|{1,2}|&{1,2}|\\?|\\:|,|=|[*/%+\\-&^|]=|<<=|>>=",
+					"name": "keyword.operator.arithmetic.shell"
+				},
+				{
+					"match": "0[xX][0-9A-Fa-f]+",
+					"name": "constant.numeric.hex.shell"
+				},
+				{
+					"match": "0\\d+",
+					"name": "constant.numeric.octal.shell"
+				},
+				{
+					"match": "\\d{1,2}#[0-9a-zA-Z@_]+",
+					"name": "constant.numeric.other.shell"
+				},
+				{
+					"match": "\\d+",
+					"name": "constant.numeric.integer.shell"
+				}
+			]
+		},
 		"misc_ranges": {
 			"patterns": [
 				{
@@ -1912,7 +1947,7 @@
 			]
 		},
 		"redirect_fix": {
-			"match": "(?:(>>?)(?:[ \\t]*+)([^ \t\n'&;<>\\(\\)\\$`\\\\\"\\|]+))",
+			"match": "(?:(>>?)(?:[ \\t]*+)([^ \t\n>&;<>\\(\\)\\$`\\\\\"'<\\|]+))",
 			"captures": {
 				"1": {
 					"name": "keyword.operator.redirect.shell"
@@ -1996,7 +2031,7 @@
 			}
 		},
 		"simple_unquoted": {
-			"match": "[^ \\t\\n'&;<>\\(\\)\\$`\\\\\"\\|]",
+			"match": "[^ \\t\\n>&;<>\\(\\)\\$`\\\\\"'<\\|]",
 			"name": "string.unquoted.shell"
 		},
 		"special_expansion": {
@@ -2135,6 +2170,9 @@
 				{
 					"include": "#for_statement"
 				},
+				{
+					"include": "#while_statement"
+				},
 				{
 					"include": "#function_definition"
 				},
@@ -2275,6 +2313,41 @@
 					}
 				}
 			]
+		},
+		"while_statement": {
+			"patterns": [
+				{
+					"begin": "(\\bwhile\\b)",
+					"end": "(?=;|\\||&|\\n|\\)|\\`|\\{|\\}|[ \\t]*#|\\])(?<!\\\\)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.while.shell"
+						}
+					},
+					"endCaptures": {},
+					"name": "meta.while.shell",
+					"patterns": [
+						{
+							"include": "#line_continuation"
+						},
+						{
+							"include": "#math_operators"
+						},
+						{
+							"include": "#option"
+						},
+						{
+							"include": "#simple_unquoted"
+						},
+						{
+							"include": "#normal_context"
+						},
+						{
+							"include": "#string"
+						}
+					]
+				}
+			]
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
index 4d399b0c0ec..d6b2ef38ebb 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_go.json
@@ -1065,7 +1065,7 @@
 	},
 	{
 		"c": "nil",
-		"t": "source.go constant.language.go",
+		"t": "source.go constant.language.null.go",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",