Improve colorization of embedded start end puctuators across languages

extensions/coffeescript/test/colorize-results/test-regex_coffee.json

@@ -454,11 +454,11 @@
 		"c": "#{",
 		"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
-			"light_plus": "punctuation.section.embedded.coffee: #0000FF",
-			"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
-			"light_vs": "punctuation.section.embedded.coffee: #0000FF",
-			"hc_black": "punctuation.section.embedded.coffee: #569CD6"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -476,11 +476,11 @@
 		"c": "}",
 		"t": "source.coffee string.regexp.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
-			"light_plus": "punctuation.section.embedded.coffee: #0000FF",
-			"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
-			"light_vs": "punctuation.section.embedded.coffee: #0000FF",
-			"hc_black": "punctuation.section.embedded.coffee: #569CD6"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{

extensions/coffeescript/test/colorize-results/test_coffee.json

@@ -311,11 +311,11 @@
 		"c": "#{",
 		"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
-			"light_plus": "punctuation.section.embedded.coffee: #0000FF",
-			"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
-			"light_vs": "punctuation.section.embedded.coffee: #0000FF",
-			"hc_black": "punctuation.section.embedded.coffee: #569CD6"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -333,11 +333,11 @@
 		"c": "}",
 		"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
-			"light_plus": "punctuation.section.embedded.coffee: #0000FF",
-			"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
-			"light_vs": "punctuation.section.embedded.coffee: #0000FF",
-			"hc_black": "punctuation.section.embedded.coffee: #569CD6"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -575,11 +575,11 @@
 		"c": "#{",
 		"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
-			"light_plus": "punctuation.section.embedded.coffee: #0000FF",
-			"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
-			"light_vs": "punctuation.section.embedded.coffee: #0000FF",
-			"hc_black": "punctuation.section.embedded.coffee: #569CD6"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -597,11 +597,11 @@
 		"c": "}",
 		"t": "source.coffee meta.function-call.coffee meta.arguments.coffee string.quoted.double.coffee source.coffee.embedded.source punctuation.section.embedded.coffee",
 		"r": {
-			"dark_plus": "punctuation.section.embedded.coffee: #569CD6",
-			"light_plus": "punctuation.section.embedded.coffee: #0000FF",
-			"dark_vs": "punctuation.section.embedded.coffee: #569CD6",
-			"light_vs": "punctuation.section.embedded.coffee: #0000FF",
-			"hc_black": "punctuation.section.embedded.coffee: #569CD6"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{

extensions/javascript/test/colorize-results/test_jsx.json

@@ -1664,11 +1664,11 @@
 		"c": "{",
 		"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.begin.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -1686,11 +1686,11 @@
 		"c": "}",
 		"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.without-attributes.js meta.jsx.children.tsx meta.embedded.expression.js punctuation.section.embedded.end.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -1862,11 +1862,11 @@
 		"c": "{",
 		"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.begin.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -1906,11 +1906,11 @@
 		"c": "}",
 		"t": "source.js meta.var.expr.js meta.objectliteral.js meta.object.member.js meta.function.expression.js meta.block.js meta.tag.without-attributes.js meta.jsx.children.tsx meta.tag.js meta.embedded.expression.js punctuation.section.embedded.end.js",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "default: #FFFFFF"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{

extensions/php/test/colorize-results/issue-28354_php.json

@@ -73,7 +73,7 @@
 			"light_plus": "punctuation.section.embedded.begin.php: #800000",
 			"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.begin.php: #800000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -458,7 +458,7 @@
 			"light_plus": "punctuation.section.embedded.end.php: #800000",
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -469,7 +469,7 @@
 			"light_plus": "punctuation.section.embedded.end.php: #800000",
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{

extensions/php/test/colorize-results/test_php.json

@@ -227,7 +227,7 @@
 			"light_plus": "punctuation.section.embedded.begin.php: #800000",
 			"dark_vs": "punctuation.section.embedded.begin.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.begin.php: #800000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -3549,7 +3549,7 @@
 			"light_plus": "punctuation.section.embedded.end.php: #800000",
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -3560,7 +3560,7 @@
 			"light_plus": "punctuation.section.embedded.end.php: #800000",
 			"dark_vs": "punctuation.section.embedded.end.php: #569CD6",
 			"light_vs": "punctuation.section.embedded.end.php: #800000",
-			"hc_black": "default: #FFFFFF"
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{

extensions/ruby/test/colorize-results/test_rb.json

@@ -2258,11 +2258,11 @@
 		"c": "#{",
 		"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.begin.ruby",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{
@@ -2280,11 +2280,11 @@
 		"c": "}",
 		"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.end.ruby source.ruby",
 		"r": {
-			"dark_plus": "meta.embedded: #D4D4D4",
-			"light_plus": "meta.embedded: #000000",
-			"dark_vs": "meta.embedded: #D4D4D4",
-			"light_vs": "meta.embedded: #000000",
-			"hc_black": "string: #CE9178"
+			"dark_plus": "punctuation.section.embedded: #569CD6",
+			"light_plus": "punctuation.section.embedded: #0000FF",
+			"dark_vs": "punctuation.section.embedded: #569CD6",
+			"light_vs": "punctuation.section.embedded: #0000FF",
+			"hc_black": "punctuation.section.embedded: #569CD6"
 		}
 	},
 	{

extensions/theme-defaults/themes/dark_vs.json

@@ -252,7 +252,7 @@
 			"scope": [
 				"punctuation.definition.template-expression.begin",
 				"punctuation.definition.template-expression.end",
-				"punctuation.section.embedded.coffee"
+				"punctuation.section.embedded"
 			],
 			"settings": {
 				"foreground": "#569cd6"

extensions/theme-defaults/themes/hc_black_defaults.json

@@ -231,7 +231,7 @@
 			"scope": [
 				"punctuation.definition.template-expression.begin",
 				"punctuation.definition.template-expression.end",
-				"punctuation.section.embedded.coffee"
+				"punctuation.section.embedded"
 			],
 			"settings": {
 				"foreground": "#569cd6"

extensions/theme-defaults/themes/light_vs.json

@@ -248,7 +248,7 @@
 			"scope": [
 				"punctuation.definition.template-expression.begin",
 				"punctuation.definition.template-expression.end",
-				"punctuation.section.embedded.coffee"
+				"punctuation.section.embedded"
 			],
 			"settings": {
 				"foreground": "#0000ff"

extensions/theme-monokai/themes/monokai-color-theme.json

@@ -121,7 +121,7 @@
 			"name": "Template Definition",
 			"scope": [
 				"punctuation.definition.template-expression",
-				"punctuation.section.embedded.coffee"
+				"punctuation.section.embedded"
 			],
 			"settings": {
 				"foreground": "#F92672"

extensions/theme-red/themes/Red-color-theme.json

@@ -169,14 +169,6 @@
 				"foreground": "#aa5507ff"
 			}
 		},
-		{
-			"name": "String embedded-source",
-			"scope": "string.quoted source",
-			"settings": {
-				"fontStyle": "",
-				"foreground": "#9df39fff"
-			}
-		},
 		{
 			"name": "String constant",
 			"scope": "string constant",