Update C++ grammar to get recent fixes

extensions/cpp/test/colorize-results/test_c.json

@@ -947,7 +947,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -958,7 +958,7 @@
 	},
 	{
 		"c": "determinant",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -969,7 +969,7 @@
 	},
 	{
 		"c": ">",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.comparison.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -980,7 +980,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -991,7 +991,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1068,7 +1068,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": "sqrt",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c entity.name.function.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c entity.name.function.c",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1112,7 +1112,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": "determinant",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1178,7 +1178,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1189,7 +1189,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1200,7 +1200,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1211,7 +1211,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1266,7 +1266,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1277,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1288,7 +1288,7 @@
 	},
 	{
 		"c": "b",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1310,7 +1310,7 @@
 	},
 	{
 		"c": "sqrt",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c entity.name.function.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c entity.name.function.c",
 		"r": {
 			"dark_plus": "entity.name.function: #DCDCAA",
 			"light_plus": "entity.name.function: #795E26",
@@ -1321,7 +1321,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c punctuation.section.arguments.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1332,7 +1332,7 @@
 	},
 	{
 		"c": "determinant",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1343,7 +1343,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c meta.function-call.c punctuation.section.arguments.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1354,7 +1354,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1376,7 +1376,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1387,7 +1387,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1398,7 +1398,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1409,7 +1409,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1420,7 +1420,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1684,7 +1684,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1695,7 +1695,7 @@
 	},
 	{
 		"c": "determinant",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1706,7 +1706,7 @@
 	},
 	{
 		"c": "==",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.comparison.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.comparison.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1717,7 +1717,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1728,7 +1728,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1849,7 +1849,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1860,7 +1860,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1871,7 +1871,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -1882,7 +1882,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1893,7 +1893,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2212,7 +2212,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2223,7 +2223,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2234,7 +2234,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2245,7 +2245,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2256,7 +2256,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2377,7 +2377,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.begin.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.begin.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2388,7 +2388,7 @@
 	},
 	{
 		"c": "2",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c constant.numeric.c",
+		"t": "source.c meta.block.c meta.parens.block.c constant.numeric.c",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -2399,7 +2399,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c keyword.operator.c",
+		"t": "source.c meta.block.c meta.parens.block.c keyword.operator.c",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -2410,7 +2410,7 @@
 	},
 	{
 		"c": "a",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c",
+		"t": "source.c meta.block.c meta.parens.block.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -2421,7 +2421,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.c meta.block.c punctuation.section.parens.block.c punctuation.section.parens.end.bracket.round.c",
+		"t": "source.c meta.block.c meta.parens.block.c punctuation.section.parens.end.bracket.round.c",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",

extensions/cpp/test/colorize-results/test_cc.json

@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp punctuation.section.parens-c.cpp punctuation.section.parens.begin.bracket.round.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.section.parens.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -232,7 +232,7 @@
 	},
 	{
 		"c": "int",
-		"t": "source.cpp punctuation.section.parens-c.cpp storage.type.primitive.cpp",
+		"t": "source.cpp meta.parens.cpp storage.type.primitive.cpp",
 		"r": {
 			"dark_plus": "storage.type: #569CD6",
 			"light_plus": "storage.type: #0000FF",
@@ -243,7 +243,7 @@
 	},
 	{
 		"c": " i",
-		"t": "source.cpp punctuation.section.parens-c.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -254,7 +254,7 @@
 	},
 	{
 		"c": "=",
-		"t": "source.cpp punctuation.section.parens-c.cpp keyword.operator.assignment.cpp",
+		"t": "source.cpp meta.parens.cpp keyword.operator.assignment.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.cpp punctuation.section.parens-c.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.parens.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -276,7 +276,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp punctuation.section.parens-c.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -287,7 +287,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.cpp punctuation.section.parens-c.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -298,7 +298,7 @@
 	},
 	{
 		"c": "<",
-		"t": "source.cpp punctuation.section.parens-c.cpp keyword.operator.comparison.cpp",
+		"t": "source.cpp meta.parens.cpp keyword.operator.comparison.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "num_candidate",
-		"t": "source.cpp punctuation.section.parens-c.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -320,7 +320,7 @@
 	},
 	{
 		"c": ";",
-		"t": "source.cpp punctuation.section.parens-c.cpp punctuation.terminator.statement.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.terminator.statement.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -331,7 +331,7 @@
 	},
 	{
 		"c": "++",
-		"t": "source.cpp punctuation.section.parens-c.cpp keyword.operator.increment.cpp",
+		"t": "source.cpp meta.parens.cpp keyword.operator.increment.cpp",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -342,7 +342,7 @@
 	},
 	{
 		"c": "i",
-		"t": "source.cpp punctuation.section.parens-c.cpp",
+		"t": "source.cpp meta.parens.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -353,7 +353,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp punctuation.section.parens-c.cpp punctuation.section.parens.end.bracket.round.cpp",
+		"t": "source.cpp meta.parens.cpp punctuation.section.parens.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1189,13 +1189,13 @@
 	},
 	{
 		"c": "std",
-		"t": "source.cpp meta.block.cpp meta.scope-resolution.cpp entity.name.namespace.scope-resolution.cpp",
+		"t": "source.cpp meta.block.cpp meta.scope-resolution.cpp entity.name.type.namespace.scope-resolution.cpp",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "entity.name.type: #4EC9B0"
 		}
 	},
 	{
@@ -1771,118 +1771,8 @@
 		}
 	},
 	{
-		"c": "asm",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp storage.type.asm.cpp",
-		"r": {
-			"dark_plus": "storage.type: #569CD6",
-			"light_plus": "storage.type: #0000FF",
-			"dark_vs": "storage.type: #569CD6",
-			"light_vs": "storage.type: #0000FF",
-			"hc_black": "storage.type: #569CD6"
-		}
-	},
-	{
-		"c": "(",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp punctuation.section.parens.begin.bracket.round.cpp",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": "\"",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp punctuation.definition.string.begin.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "movw $0x38, ",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "%a",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "x; ltr ",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "%a",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp constant.other.placeholder.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "x",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": "\"",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp string.quoted.double.cpp punctuation.definition.string.end.cpp",
-		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string: #A31515",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string: #A31515",
-			"hc_black": "string: #CE9178"
-		}
-	},
-	{
-		"c": ")",
-		"t": "source.cpp meta.block.cpp meta.function-call.cpp punctuation.section.parens.end.bracket.round.cpp",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
-		}
-	},
-	{
-		"c": ";",
-		"t": "source.cpp meta.block.cpp punctuation.terminator.statement.cpp",
+		"c": "asm(\"movw $0x38, %ax; ltr %ax\");",
+		"t": "source.cpp meta.block.cpp meta.function-call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1893,7 +1783,7 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.cpp meta.block.cpp",
+		"t": "source.cpp meta.block.cpp meta.function-call.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",

extensions/cpp/test/colorize-results/test_cpp.json

@@ -617,13 +617,13 @@
 	},
 	{
 		"c": "Rectangle",
-		"t": "source.cpp meta.scope-resolution.cpp entity.name.namespace.scope-resolution.cpp",
+		"t": "source.cpp meta.scope-resolution.cpp entity.name.type.namespace.scope-resolution.cpp",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "entity.name.type: #4EC9B0",
+			"light_plus": "entity.name.type: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "entity.name.type: #4EC9B0"
 		}
 	},
 	{
@@ -1057,7 +1057,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.cpp meta.block.cpp meta.block.parens.cpp punctuation.section.parens.begin.bracket.round.cpp",
+		"t": "source.cpp meta.block.cpp meta.parens.block.cpp punctuation.section.parens.begin.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1068,7 +1068,7 @@
 	},
 	{
 		"c": "3",
-		"t": "source.cpp meta.block.cpp meta.block.parens.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.block.cpp meta.parens.block.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1079,7 +1079,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.cpp meta.block.cpp meta.block.parens.cpp comma.cpp punctuation.separator.delimiter.cpp",
+		"t": "source.cpp meta.block.cpp meta.parens.block.cpp comma.cpp punctuation.separator.delimiter.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1090,7 +1090,7 @@
 	},
 	{
 		"c": "4",
-		"t": "source.cpp meta.block.cpp meta.block.parens.cpp constant.numeric.decimal.cpp",
+		"t": "source.cpp meta.block.cpp meta.parens.block.cpp constant.numeric.decimal.cpp",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -1101,7 +1101,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.cpp meta.block.cpp meta.block.parens.cpp punctuation.section.parens.end.bracket.round.cpp",
+		"t": "source.cpp meta.block.cpp meta.parens.block.cpp punctuation.section.parens.end.bracket.round.cpp",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",