Release 1.1.10

Septh · Feb 8, 2017 · 54a287e · 54a287e
1 parent 8260c6f
commit 54a287e
Show file tree

Hide file tree

Showing 8 changed files with 242 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.1.10
+- [general] Fixed the color mismatch in WoW themes introduced by VS Code 1.9.0
+
 ## 1.1.9
 - [language.lua] Added some more identifiers -- again
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "wow-bundle",
 	"displayName": "WoW Bundle",
 	"description": "World of Warcraft addon developer toolset for VS Code",
-	"version": "1.1.9",
+	"version": "1.1.10",
 	"icon": "images/wow-icon.png",
 	"publisher": "Septh",
 	"license": "MIT",
@@ -11,7 +11,7 @@
 		"theme": "light"
 	},
 	"engines": {
-		"vscode": "^1.6.0"
+		"vscode": "^1.9.0"
 	},
 	"categories": [ "Languages", "Themes" ],
 	"keywords": [

diff --git a/themes/theme-defaults/dark_plus.json b/themes/theme-defaults/dark_plus.json
@@ -6,7 +6,9 @@
 			"name": "Function declarations",
 			"scope": [
 				"entity.name.function",
-				"support.function"
+				"support.function",
+
+				"support.constant.handlebars"
 			],
 			"settings": {
 				"foreground": "#DCDCAA"
@@ -19,8 +21,28 @@
 				"support.class",
 				"support.type",
 				"entity.name.type",
+				"entity.name.class",
+
 				"storage.type.cs",
-				"storage.type.java"
+				"storage.type.generic.cs",
+				"storage.type.modifier.cs",
+				"storage.type.variable.cs",
+
+				"storage.type.annotation.java",
+				"storage.type.generic.java",
+				"storage.type.java",
+				"storage.type.object.array.java",
+				"storage.type.primitive.array.java",
+				"storage.type.primitive.java",
+				"storage.type.token.java",
+
+				"storage.type.groovy",
+				"storage.type.annotation.groovy",
+				"storage.type.parameters.groovy",
+				"storage.type.generic.groovy",
+				"storage.type.object.array.groovy",
+				"storage.type.primitive.array.groovy",
+				"storage.type.primitive.groovy"
 			],
 			"settings": {
 				"foreground": "#4EC9B0"
@@ -34,7 +56,9 @@
 				"meta.type.new.expr",
 				"support.constant.math",
 				"support.constant.dom",
-				"support.constant.json"
+				"support.constant.json",
+
+				"entity.other.inherited-class"
 			],
 			"settings": {
 				"foreground": "#4EC9B0"
@@ -50,40 +74,38 @@
 		{
 			"name": "Variable and parameter name",
 			"scope": [
-				"variable.parameter",
 				"variable",
-				"variable.name",
+				"meta.definition.variable.name",
 				"support.variable"
 			],
 			"settings": {
 				"foreground": "#9CDCFE"
 			}
 		},
 		{
-			"name": "Object keys, TS gammar specific",
-			"scope": "object-literal.member.key",
+			"name": "Object keys, TS grammar specific",
+			"scope": [
+				"meta.object-literal.key",
+				"meta.object-literal.key entity.name.function"
+			],
 			"settings": {
 				"foreground": "#9CDCFE"
 			}
 		},
 		{
 			"name": "CSS property value",
 			"scope": [
-				"support.property-value",
-				"constant.rgb-value",
-				"support.property-value.scss",
-				"constant.rgb-value.scss"
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
 			],
 			"settings": {
 				"foreground": "#CE9178"
 			}
-		},
-		{
-			"name": "JSX Tag names, workaround for flattening match with function",
-			"scope": "entity.name.function.tag",
-			"settings": {
-				"foreground": "#569cd6"
-			}
 		}
 	]
 }
diff --git a/themes/theme-defaults/dark_vs.json b/themes/theme-defaults/dark_vs.json
@@ -1,6 +1,12 @@
 {
 	"name": "Dark Visual Studio",
 	"settings": [
+		{
+			"settings": {
+				"foreground": "#D4D4D4",
+				"background": "#1E1E1E"
+			}
+		},
 		{
 			"scope": "emphasis",
 			"settings": {
@@ -33,7 +39,9 @@
 			}
 		},
 		{
-			"scope": "constant.numeric",
+			"scope": [
+				"constant.numeric"
+			],
 			"settings": {
 				"foreground": "#b5cea8"
 			}
@@ -44,20 +52,14 @@
 				"foreground": "#646695"
 			}
 		},
-		{
-			"scope": "constant.rgb-value",
-			"settings": {
-				"foreground": "#d4d4d4"
-			}
-		},
 		{
 			"scope": "entity.name.tag",
 			"settings": {
 				"foreground": "#569cd6"
 			}
 		},
 		{
-			"scope": "entity.name.selector",
+			"scope": "entity.name.tag.css",
 			"settings": {
 				"foreground": "#d7ba7d"
 			}
@@ -69,7 +71,19 @@
 			}
 		},
 		{
-			"scope": "entity.other.attribute-name.css",
+			"scope": [
+				"entity.other.attribute-name.class.css",
+				"entity.other.attribute-name.class.mixin.css",
+				"entity.other.attribute-name.id.css",
+				"entity.other.attribute-name.parent-selector.css",
+				"entity.other.attribute-name.pseudo-class.css",
+				"entity.other.attribute-name.pseudo-element.css",
+
+				"source.css.less entity.other.attribute-name.id",
+
+				"entity.other.attribute-name.attribute.scss",
+				"entity.other.attribute-name.scss"
+			],
 			"settings": {
 				"foreground": "#d7ba7d"
 			}
@@ -125,13 +139,13 @@
 			}
 		},
 		{
-			"scope": "markup.punctuation.quote.beginning",
+			"scope": "beginning.punctuation.definition.quote.markdown",
 			"settings": {
 				"foreground": "#608b4e"
 			}
 		},
 		{
-			"scope": "markup.punctuation.list.beginning",
+			"scope": "beginning.punctuation.definition.list.markdown",
 			"settings": {
 				"foreground": "#6796e6"
 			}
@@ -180,7 +194,7 @@
 			}
 		},
 		{
-			"scope": "meta.header.diff",
+			"scope": "meta.diff.header",
 			"settings": {
 				"foreground": "#569cd6"
 			}
@@ -227,6 +241,16 @@
 				"foreground": "#d16969"
 			}
 		},
+		{
+			"name": "JavaScript string interpolation ${}",
+			"scope": [
+				"punctuation.definition.template-expression.begin.ts",
+				"punctuation.definition.template-expression.end.ts"
+			],
+			"settings": {
+				"foreground": "#569cd6"
+			}
+		},
 		{
 			"scope": "support.type.property-name",
 			"settings": {
@@ -245,12 +269,6 @@
 				"foreground": "#569cd6"
 			}
 		},
-		{
-			"scope": "keyword.control.less",
-			"settings": {
-				"foreground": "#d7ba7d"
-			}
-		},
 		{
 			"scope": "keyword.operator",
 			"settings": {
@@ -270,7 +288,10 @@
 			}
 		},
 		{
-			"scope": "metatag.php",
+			"scope": [
+				"punctuation.section.embedded.begin.metatag.php",
+				"punctuation.section.embedded.end.metatag.php"
+			],
 			"settings": {
 				"foreground": "#569cd6"
 			}

diff --git a/themes/theme-defaults/light_plus.json b/themes/theme-defaults/light_plus.json
@@ -2,32 +2,66 @@
 	"name": "Light+",
 	"include": "./light_vs.json",
 	"settings": [
+		{
+			"name": "Function declarations",
+			"scope": [
+				"entity.name.function",
+				"support.function",
+
+				"support.constant.handlebars"
+			],
+			"settings": {
+				"foreground": "#795E26"
+			}
+		},
 		{
 			"name": "Types declaration and references",
 			"scope": [
-				"meta.type.name",
-				"meta.return.type",
 				"meta.return-type",
-				"meta.cast",
-				"meta.type.annotation",
+				"support.class",
 				"support.type",
-				"entity.name.class",
 				"entity.name.type",
+				"entity.name.class",
+
 				"storage.type.cs",
-				"storage.type.java"
+				"storage.type.generic.cs",
+				"storage.type.modifier.cs",
+				"storage.type.variable.cs",
+
+				"storage.type.annotation.java",
+				"storage.type.generic.java",
+				"storage.type.java",
+				"storage.type.object.array.java",
+				"storage.type.primitive.array.java",
+				"storage.type.primitive.java",
+				"storage.type.token.java",
+
+				"storage.type.groovy",
+				"storage.type.annotation.groovy",
+				"storage.type.parameters.groovy",
+				"storage.type.generic.groovy",
+				"storage.type.object.array.groovy",
+				"storage.type.primitive.array.groovy",
+				"storage.type.primitive.groovy"
 			],
 			"settings": {
 				"foreground": "#267f99"
 			}
 		},
 		{
-			"name": "Function declarations",
+			"name": "Types declaration and references, TS grammar specific",
 			"scope": [
-				"entity.name.function",
-				"entity.name.method"
+				"meta.return.type",
+				"meta.type.cast.expr",
+				"meta.type.new.expr",
+				"support.constant.math",
+				"support.constant.dom",
+				"support.constant.json",
+
+				"entity.other.inherited-class"
 			],
 			"settings": {
-				"foreground": "#795E26"
+				"foreground": "#267f99"
 			}
 		},
 		{
@@ -38,16 +72,40 @@
 			}
 		},
 		{
-			"name": "Parameter name",
+			"name": "Variable and parameter name",
 			"scope": [
-				"meta.parameter.type.variable",
-				"variable.parameter",
 				"variable",
-				"variable.name"
+				"meta.definition.variable.name",
+				"support.variable"
 			],
 			"settings": {
 				"foreground": "#001080"
 			}
+		},
+		{
+			"name": "Object keys, TS grammar specific",
+			"scope": [
+				"meta.object-literal.key",
+				"meta.object-literal.key entity.name.function"
+			],
+			"settings": {
+				"foreground": "#001080"
+			}
+		},
+		{
+			"name": "CSS property value",
+			"scope": [
+				"support.constant.property-value",
+				"support.constant.font-name",
+				"support.constant.media-type",
+				"support.constant.media",
+				"constant.other.color.rgb-value",
+				"constant.other.rgb-value",
+				"support.constant.color"
+			],
+			"settings": {
+				"foreground": "#0451a5"
+			}
 		}
 	]
 }