From 74a6d6d4231505aa1d5225f32968b653424e1a10 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 20 Feb 2017 17:34:05 +0100
Subject: [PATCH] fix tests for #20610

---
 .../test/colorize-results/12750_html.json     | 24 ++++-----
 .../html/test/colorize-results/test_html.json | 52 +++++++++----------
 .../test/colorize-results/test_md.json        |  2 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/extensions/html/test/colorize-results/12750_html.json b/extensions/html/test/colorize-results/12750_html.json
index e86eddbb113..03eb0cea272 100644
--- a/extensions/html/test/colorize-results/12750_html.json
+++ b/extensions/html/test/colorize-results/12750_html.json
@@ -23,7 +23,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -34,7 +34,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic source.js.embedded.html entity.other.attribute-name.html",
+		"t": "text.html.basic entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -45,7 +45,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "text/javascript",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html",
+		"t": "text.html.basic string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -210,7 +210,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -221,7 +221,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic source.js.embedded.html entity.name.tag.script.html",
+		"t": "text.html.basic entity.name.tag.script.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -265,7 +265,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -386,7 +386,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic source.js.embedded.html entity.name.tag.script.html",
+		"t": "text.html.basic entity.name.tag.script.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
diff --git a/extensions/html/test/colorize-results/test_html.json b/extensions/html/test/colorize-results/test_html.json
index 018d81b8234..3cd79b78c48 100644
--- a/extensions/html/test/colorize-results/test_html.json
+++ b/extensions/html/test/colorize-results/test_html.json
@@ -474,7 +474,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.css.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -485,7 +485,7 @@
 	},
 	{
 		"c": "type",
-		"t": "text.html.basic source.css.embedded.html entity.other.attribute-name.html",
+		"t": "text.html.basic entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic source.css.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.css.embedded.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -518,7 +518,7 @@
 	},
 	{
 		"c": "text/css",
-		"t": "text.html.basic source.css.embedded.html string.quoted.double.html",
+		"t": "text.html.basic string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -529,7 +529,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.css.embedded.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -540,7 +540,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic source.css.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1112,7 +1112,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1123,7 +1123,7 @@
 	},
 	{
 		"c": "src",
-		"t": "text.html.basic source.js.embedded.html entity.other.attribute-name.html",
+		"t": "text.html.basic entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1134,7 +1134,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1145,7 +1145,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1156,7 +1156,7 @@
 	},
 	{
 		"c": "/out/vs/loader.js",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html",
+		"t": "text.html.basic string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1167,7 +1167,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1178,7 +1178,7 @@
 	},
 	{
 		"c": "></",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1189,7 +1189,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic source.js.embedded.html entity.name.tag.script.html",
+		"t": "text.html.basic entity.name.tag.script.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1244,7 +1244,7 @@
 	},
 	{
 		"c": " ",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1255,7 +1255,7 @@
 	},
 	{
 		"c": "src",
-		"t": "text.html.basic source.js.embedded.html entity.other.attribute-name.html",
+		"t": "text.html.basic entity.other.attribute-name.html",
 		"r": {
 			"dark_plus": "entity.other.attribute-name: #9CDCFE",
 			"light_plus": "entity.other.attribute-name: #FF0000",
@@ -1266,7 +1266,7 @@
 	},
 	{
 		"c": "=",
-		"t": "text.html.basic source.js.embedded.html",
+		"t": "text.html.basic",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1277,7 +1277,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html punctuation.definition.string.begin.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.begin.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1288,7 +1288,7 @@
 	},
 	{
 		"c": "https://cdn.rawgit.com/mochajs/mocha/2.2.5/mocha.js",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html",
+		"t": "text.html.basic string.quoted.double.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1299,7 +1299,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "text.html.basic source.js.embedded.html string.quoted.double.html punctuation.definition.string.end.html",
+		"t": "text.html.basic string.quoted.double.html punctuation.definition.string.end.html",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.double.html: #0000FF",
@@ -1310,7 +1310,7 @@
 	},
 	{
 		"c": "></",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -1321,7 +1321,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic source.js.embedded.html entity.name.tag.script.html",
+		"t": "text.html.basic entity.name.tag.script.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1376,7 +1376,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2157,7 +2157,7 @@
 	},
 	{
 		"c": "</",
-		"t": "text.html.basic source.js.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.basic punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",
@@ -2168,7 +2168,7 @@
 	},
 	{
 		"c": "script",
-		"t": "text.html.basic source.js.embedded.html entity.name.tag.script.html",
+		"t": "text.html.basic entity.name.tag.script.html",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
diff --git a/extensions/markdown/test/colorize-results/test_md.json b/extensions/markdown/test/colorize-results/test_md.json
index 86531913276..4e5b3dacac6 100644
--- a/extensions/markdown/test/colorize-results/test_md.json
+++ b/extensions/markdown/test/colorize-results/test_md.json
@@ -1013,7 +1013,7 @@
 	},
 	{
 		"c": ">",
-		"t": "text.html.markdown source.css.embedded.html punctuation.definition.tag.html",
+		"t": "text.html.markdown punctuation.definition.tag.html",
 		"r": {
 			"dark_plus": "punctuation.definition.tag: #808080",
 			"light_plus": "punctuation.definition.tag: #800000",