[cpp] update grammar

extensions/cpp/syntaxes/c++.json

@@ -425,6 +425,9 @@
 						{
 							"match": "\\\\x\\h+",
 							"name": "constant.character.escape.cpp"
+						},
+						{
+							"include": "source.c#string_placeholder"
 						}
 					]
 				},
@@ -455,5 +458,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/atom/language-c/commit/a74c2f967d73e802a67fa6e971a8e8dedf076597"
+	"version": "https://github.com/atom/language-c/commit/3a269f88b12e512fb9495dc006a1dabf325d3d7f"
 }
\ No newline at end of file

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

@@ -110,7 +110,29 @@
 		}
 	},
 	{
-		"c": "num_candidate_ret=%d:",
+		"c": "num_candidate_ret=",
+		"t": "source.cpp meta.function.c 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": "%d",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp constant.other.placeholder.c",
+		"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.function.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -407,7 +429,18 @@
 		}
 	},
 	{
-		"c": "%d,",
+		"c": "%d",
+		"t": "source.cpp meta.function.c string.quoted.double.cpp constant.other.placeholder.c",
+		"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.function.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1375,7 +1408,29 @@
 		}
 	},
 	{
-		"c": "STYLE=Keramik;TITLE=%s;THEME=%s",
+		"c": "STYLE=Keramik;TITLE=",
+		"t": "source.cpp meta.block.c 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": "%s",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp constant.other.placeholder.c",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string: #A31515",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string: #A31515",
+			"hc_black": "string: #CE9178"
+		}
+	},
+	{
+		"c": ";THEME=",
 		"t": "source.cpp meta.block.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",
@@ -1385,6 +1440,17 @@
 			"hc_black": "string: #CE9178"
 		}
 	},
+	{
+		"c": "%s",
+		"t": "source.cpp meta.block.c string.quoted.double.cpp constant.other.placeholder.c",
+		"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.c string.quoted.double.cpp punctuation.definition.string.end.cpp",
@@ -1705,7 +1771,51 @@
 		}
 	},
 	{
-		"c": "movw $0x38, %ax; ltr %ax",
+		"c": "movw $0x38, ",
+		"t": "source.cpp meta.block.c meta.function-call.c 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.c meta.function-call.c string.quoted.double.cpp constant.other.placeholder.c",
+		"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.c meta.function-call.c 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.c meta.function-call.c string.quoted.double.cpp constant.other.placeholder.c",
+		"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.c meta.function-call.c string.quoted.double.cpp",
 		"r": {
 			"dark_plus": "string: #CE9178",