Release 1.2.2

Septh · May 17, 2017 · ca71214 · ca71214
1 parent 2c22334
commit ca71214
Show file tree

Hide file tree

Showing 31 changed files with 1,563 additions and 2,195 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.2
+- [language.lua] More identifiers. Again.
+- [themes] Incorporated the latest (1.12.2) VS Code default themes
+
 ## 1.2.1
 - [language.lua] More closely match WoW's Lua 5.1 environement: functions like `tinsert()`, `table.getn()`, `table.foreach()`... actually exist in WoW so we don't tag them as removed or deprecated anymore.
 - [language.lua] Fixed a typo in `'RightButton'`

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This World of Warcraft addon developer toolset for VS Code includes an improved
 * **Full WoW 7.2.x API**
 * **New since 1.2.0: A bunch of useful code snippets, thanks to [m4xc4v413r4](https://github.com/m4xc4v413r4)**
 * Improved Lua 5.1 grammar with World of Warcraft's built-in Lua interpreter specificities
-* Extensive widgets and Lua library support
+* Extensive FrameXML widgets and Lua library support
 * `.toc` file colorization
 * Four new, dedicated color themes based on VS Code's default themes: Light+, Dark+, Monokai and Monokai Dimmed
 
@@ -34,7 +34,7 @@ wow-bundle replaces VS Code's built-in Lua language grammar. Changes worth notic
 
 wow-bundle's Lua grammar also tags a bunch of WoW-related stuff:
 
-* **Blizzard's extensions to the Lua language** like `wipe()`, `strjoin()`, etc.
+* **Blizzard's extensions to the Lua language** like `[table.]wipe()`, `strjoin()`, etc.
 * **World of Warcraft API functions**, with support for functions that can't be called while in combat and functions that can be called only from secure code
 * **WoW Library functions** written in Lua (mostly used by UI code)
 * **Global objects** like `UIParent`, `GameFontNormal` and such
@@ -48,7 +48,7 @@ wow-bundle's Lua grammar also tags a bunch of WoW-related stuff:
 ![lua](images/lua.png)
 
 
-#### Toc files
+#### > Toc files
 
 Also included is a simple grammar for `.toc` files with support for keywords (like `## Interface`, `## Author` and such) and X-keywords (like `## X-Date`, `## X-Website` and such)
 

diff --git a/images/lua.png b/images/lua.png
diff --git a/images/themes.gif b/images/themes.gif
diff --git a/languages/grammars/wow-lua.tmLanguage b/languages/grammars/wow-lua.tmLanguage
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.2.1",
+	"version": "1.2.2",
 	"icon": "images/wow-icon.png",
 	"publisher": "Septh",
 	"license": "MIT",

diff --git a/themes/dark_plus_wow.json b/themes/dark_plus_wow.json
@@ -1,6 +1,6 @@
 {
 	"name": "Dark+ (wow-bundle)",
-	"include": "./theme-defaults/dark_plus.json",
+	"include": "./theme-defaults/themes/dark_plus.json",
 	"settings": [
 		// Comments -- just add italics to the current style
 		{
@@ -20,23 +20,29 @@
 		{
 			"scope": "support.function.metamethod.lua",
 			"settings": {
-				"foreground": "#c586c0"
+				"foreground": "#a671a1"
 			}
 		},
 		{
-			"scope": "keyword.operator.lua, keyword.operator.logical.lua",
+			"scope": "keyword.operator.lua",
 			"settings": {
 				"foreground": "#569cd6"
 			}
 		},
 		{
-			"scope": "variable.language.lua, support.variable.lua",
+			"scope": "keyword.operator.logical.lua",
+			"settings": {
+				"foreground": "#c586c0"
+			}
+		},
+		{
+			"scope": ["variable.language.lua", "support.variable.lua"],
 			"settings": {
 				"foreground": "#569cd6"
 			}
 		},
 		{
-			"scope": "constant.language.lua, support.constant.lua",
+			"scope": [ "constant.language.lua", "constant.language.quoted.lua", "support.constant.lua", "support.constant.quoted.lua"],
 			"settings": {
 				"foreground": "#9cdcfe"
 			}
@@ -47,6 +53,13 @@
 				"foreground": "#e6bc85"
 			}
 		},
+		{
+			"scope": "invalid.deprecated.lua",
+			"settings": {
+				"foreground": "#c586c0",
+				"fontStyle": "underline"
+			}
+		},
 
 		// Word of Warcraft .toc file colors
 		{
@@ -76,7 +89,7 @@
 
 		// World of Warcraft API colors
 		{
-			"comment": "Catches everything not defined below",
+			"comment": "This catches everything not defined below",
 			"scope": [
 				"support.function.wow-api",                  "support.function.wow-library",
 				"support.variable.object.wow-api",           "support.variable.object.wow-library",
@@ -94,27 +107,35 @@
 		},
 
 		{
-			"name": "WoW API functions",
+			"name": "WoW C API functions",
 			"scope": "support.function.wow-api",
 			"settings": {
 				"foreground": "#ff8000"
 			}
 		},
 		{
-			"scope": [
-				"support.function.wow-api.protected",
-				"support.function.wow-api.nocombat"
-			],
+			"scope": [ "support.function.wow-api.protected", "support.function.wow-api.nocombat" ],
+			"settings": {
+				// "foreground": "#cc6600",
+				"fontStyle": "underline"
+			}
+		},
+
+		{
+			"name": "Widgets methods",
+			"scope": "support.class.method.wow-api",
 			"settings": {
-				"foreground": "#cc6600"
+				// "foreground": "#ffaa00"
+				"foreground": "#ff8000"
 			}
 		},
 
 		{
-			"name": "WoW Library (FrameXML)",
+			"name": "WoW Library (Lua functions)",
 			"scope": "support.function.wow-library",
 			"settings": {
-				"foreground": "#ffaf3e"
+				// "foreground": "#ffaf3e"
+				"foreground": "#ffaa00"
 			}
 		},
 		{
@@ -130,13 +151,6 @@
 			}
 		},
 
-		{
-			"scope": "support.class.method.wow-api",
-			"settings": {
-				"foreground": "#ffaa00"
-			}
-		},
-
 		{
 			"name": "WoW API Constants",
 			"scope": [
@@ -151,19 +165,11 @@
 		},
 
 		{
-			"name": "Removed/deprecated stuff",
-			"scope": "invalid.deprecated",
+			"name": "Removed stuff",
+			"scope": "invalid.removed.lua",
 			"settings": {
 				"foreground": "#f44747"
 			}
-		},
-		{
-			"name": "Removed/deprecated stuff",
-			"scope": "invalid.removed",
-			"settings": {
-				"foreground": "#f44747",
-				"fontStyle": "underline"
-			}
 		}
 	]
 }
diff --git a/themes/light_plus_wow.json b/themes/light_plus_wow.json
@@ -1,6 +1,6 @@
 {
 	"name": "Light+ (wow-bundle)",
-	"include": "./theme-defaults/light_plus.json",
+	"include": "./theme-defaults/themes/light_plus.json",
 	"settings": [
 		// Comments -- just add italics to the current style
 		{
@@ -24,28 +24,40 @@
 			}
 		},
 		{
-			"scope": "keyword.operator.lua, keyword.operator.logical.lua",
+			"scope": "keyword.operator.lua",
 			"settings": {
 				"foreground": "#000000"
 			}
 		},
 		{
-			"scope": "variable.language.lua, support.variable.lua",
+			"scope": "keyword.operator.logical.lua",
 			"settings": {
 				"foreground": "#000000"
 			}
 		},
 		{
-			"scope": "constant.language.lua, support.constant.lua",
+			"scope": ["variable.language.lua", "support.variable.lua"],
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"scope": [ "constant.language.lua", "constant.language.quoted.lua", "support.constant.lua", "support.constant.quoted.lua"],
 			"settings": {
 				"foreground": "#09885a"
 			}
 		},
 		{
 			"scope": "constant.character.escape.lua",
 			"settings": {
-				"foreground": "#cc1b1b",
-				"fontStyle": "bold"
+				"foreground": "#cc1b1b"
+			}
+		},
+		{
+			"scope": "invalid.deprecated.lua",
+			"settings": {
+				"foreground": "#0000ff",
+				"fontStyle": "underline"
 			}
 		},
 
@@ -77,7 +89,7 @@
 
 		// World of Warcraft API colors
 		{
-			"comment": "Catches everything not defined below",
+			"comment": "This catches everything not defined below",
 			"scope": [
 				"support.function.wow-api",                  "support.function.wow-library",
 				"support.variable.object.wow-api",           "support.variable.object.wow-library",
@@ -95,24 +107,30 @@
 		},
 
 		{
-			"name": "WoW API functions",
+			"name": "WoW C API functions",
 			"scope": "support.function.wow-api",
 			"settings": {
 				"foreground": "#cc6600"
 			}
 		},
 		{
-			"scope": [
-				"support.function.wow-api.protected",
-				"support.function.wow-api.nocombat"
-			],
+			"scope": [ "support.function.wow-api.protected", "support.function.wow-api.nocombat" ],
+			"settings": {
+				// "foreground": "#994c00",
+				"fontStyle": "underline"
+			}
+		},
+
+		{
+			"name": "Widgets methods",
+			"scope": "support.class.method.wow-api",
 			"settings": {
-				"foreground": "#994c00"
+				"foreground": "#cc6600"
 			}
 		},
 
 		{
-			"name": "WoW Library (FrameXML)",
+			"name": "WoW Library (Lua functions)",
 			"scope": "support.function.wow-library",
 			"settings": {
 				"foreground": "#b37a2b"
@@ -131,13 +149,6 @@
 			}
 		},
 
-		{
-			"scope": "support.class.method.wow-api",
-			"settings": {
-				"foreground": "#cc6600"
-			}
-		},
-
 		{
 			"name": "WoW API Constants",
 			"scope": [
@@ -152,19 +163,11 @@
 		},
 
 		{
-			"name": "Removed/deprecated stuff",
-			"scope": "invalid.deprecated",
+			"name": "Removed stuff",
+			"scope": "invalid.removed.lua",
 			"settings": {
 				"foreground": "#f44747"
 			}
-		},
-		{
-			"name": "Removed/deprecated stuff",
-			"scope": "invalid.removed",
-			"settings": {
-				"foreground": "#f44747",
-				"fontStyle": "underline"
-			}
 		}
 	]
 }