Merge pull request #151 from wildpeaks/features/updates

Update tokens

.browserslistrc

@@ -0,0 +1 @@
+defaults, not IE 11

.gitignore

@@ -5,6 +5,7 @@
 # But allow these files and folders:
 !/LICENSE
 !/README.md
+!/.browserslistrc
 !/.editorconfig
 !/.gitattributes
 !/.gitignore

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
 	"recommendations": [
 		"EditorConfig.editorconfig",
-		"mrmlnc.vscode-apache",
 		"ms-azuretools.vscode-docker",
 		"mikestead.dotenv",
 		"editorconfig.editorconfig",
@@ -16,7 +15,7 @@
 		"slevesque.shader",
 		"jakeboone02.cypher-query-language",
 		"joaompinto.vscode-graphviz",
-		"hbenl.vscode-test-explorer",
-		"hbenl.vscode-mocha-test-adapter"
+		"mrmlnc.vscode-apache",
+		"melmass.vex"
 	]
 }

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				// "--disable-extensions",
+				"--extensionDevelopmentPath=${workspaceFolder}/package"
+			],
+			"preLaunchTask": "build"
+		}
+	]
+}

.vscode/settings.json

@@ -1,6 +1,4 @@
 {
-	"mochaExplorer.require": "ts-node/register",
-	"mochaExplorer.files": "test/**/*.test.ts",
 	"eslint.validate": [
 		"typescript"
 	],

.vscode/tasks.json

@@ -0,0 +1,14 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "build",
+			"type": "npm",
+			"script": "build",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}

README.md

@@ -55,5 +55,5 @@ Some file formats require additional extensions, such as:
  - `slevesque.shader`
  - `jakeboone02.cypher-query-language`
  - `joaompinto.vscode-graphviz`
-
-
+ - `mrmlnc.vscode-apache`
+ - `melmass.vex`

package.json

@@ -9,13 +9,12 @@
   "prettier": "@wildpeaks/prettier-config",
   "scripts": {
     "build": "mocha -r ts-node/register src/build.ts",
-    "watch": "mocha -r ts-node/register src/build.ts --watch --watch-files src/*",
-    "lint": "eslint src/**/*.ts",
+    "lint": "eslint src/*.ts test/*.ts",
     "test:postbuild": "mocha -r ts-node/register test/*.test.ts"
   },
   "devDependencies": {
     "@types/mocha": "8.2.2",
-    "@types/node": "15.9.0",
+    "@types/node": "15.12.0",
     "@wildpeaks/eslint-config-typescript": "12.0.0",
     "@wildpeaks/prettier-config": "12.0.0",
     "@wildpeaks/tsconfig": "4.0.0",

src/build.ts

@@ -155,7 +155,10 @@ describe("Build", function () {
 						"source.nginx constant.character.brace",
 
 						// Handlebars: <, >
-						"text.html.handlebars punctuation.definition.tag"
+						"text.html.handlebars punctuation.definition.tag",
+
+						// Vex
+						"punctuation.group.vex"
 					],
 					settings: {
 						foreground: Colors.MUTED
@@ -196,7 +199,8 @@ describe("Build", function () {
 						"keyword.operator.bitwise",
 						"keyword.operator.type",
 
-						// import, import * as, export, from, default
+						// type, import, import * as, export, from, default
+						"keyword.control.type",
 						"keyword.control.import",
 						"constant.language.import-export-all",
 						"keyword.control.as",
@@ -223,6 +227,11 @@ describe("Build", function () {
 						// try, catch
 						"keyword.control.trycatch",
 
+						// switch, case
+						"keyword.control.switch.js",
+						"keyword.control.switch.ts",
+						"keyword.control.switch.tsx",
+
 						// Equal signs
 						"keyword.operator.assignment",
 						"keyword.operator.comparison",
@@ -248,6 +257,7 @@ describe("Build", function () {
 
 						// TS: tripleslash "reference"
 						"entity.name.tag.directive.ts",
+						"entity.name.tag.directive.tsx",
 
 						// JS & TS: String template wrappers
 						"punctuation.definition.template-expression.begin",
@@ -303,12 +313,15 @@ describe("Build", function () {
 						// REG: Delete key
 						"entity.name.function.section.delete.reg",
 
-						// PHP: <?php, ?>, $, ::, .
+						// PHP: <?php, ?>, $, ::, ., if, elseif, else
 						"punctuation.section.embedded.begin.php",
 						"punctuation.section.embedded.end.php",
 						"punctuation.definition.variable.php",
 						"keyword.operator.class.php",
 						"keyword.operator.string.php",
+						"keyword.control.if.php",
+						"keyword.control.elseif.php",
+						"keyword.control.else.php",
 
 						// XML tags
 						"punctuation.definition.tag.xml",
@@ -389,7 +402,11 @@ describe("Build", function () {
 						"punctuation.definition.block.sequence.item.yaml",
 
 						// Graphviz: ->
-						"source.dot keyword.operator.dot"
+						"source.dot keyword.operator.dot",
+
+						// Vex
+						"keyword.control.vex",
+						"keyword.operator.vex"
 					],
 					settings: {
 						foreground: Colors.CRIMSON
@@ -483,7 +500,10 @@ describe("Build", function () {
 						"source.dot support.constant.attribute.node.dot",
 
 						// EditorConfig: property name
-						"source.editorconfig keyword.other.definition"
+						"source.editorconfig keyword.other.definition",
+
+						// PHP: variable name
+						"variable.other.php"
 					],
 					settings: {
 						foreground: Colors.GREEN
@@ -508,6 +528,7 @@ describe("Build", function () {
 						// PHP: Constants
 						"constant.language.php",
 						"constant.other.php",
+						"variable.language.this.php",
 
 						// MS: stricmp, color
 						"support.class.primitive.maxscript",
@@ -529,8 +550,12 @@ describe("Build", function () {
 						// undefined
 						"constant.language.undefined",
 
-						// SCSS: variable name
+						// CSS & SCSS: variable name
 						"variable.scss",
+						"variable.parameter.url.scss",
+						"variable.css",
+						"variable.argument.css",
+						"variable.parameter.misc.css",
 
 						// Cypher: Constants
 						"source.cypher constant",
@@ -717,7 +742,7 @@ describe("Build", function () {
 			author: "Cecile Muller",
 			publisher: "wildpeaks",
 			license: "MIT",
-			icon: "icon.png",
+			icon: "https://raw.githubusercontent.com/wildpeaks/vscode-theme/main/src/icon.png",
 			homepage: "https://github.com/wildpeaks/vscode-theme/#readme",
 			repository: "https://github.com/wildpeaks/vscode-theme",
 			bugs: {