Merge branch 'release-0.7.2'

mikecentola · mikecentola · commit 04c78954f7c1 · 2022-06-30T23:56:42.000-04:00
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -14,7 +14,7 @@
     ],
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "ecmaVersion": 2019,
+        "ecmaVersion": 2021,
         "sourceType": "module",
         "ecmaFeatures": {
             "impliedStrict": true
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .eslintcache
+.vscode-test/**
 *.vsix
 dist
 images/*.ai
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All changes to G-Code Language Extension will be documented here.
 
+## v0.7.2 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.7.2)
+
+### Fixes
+
+- Fixed highlighting syntax for `T` inside of other words [#40](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/40)
+
+### Other
+
+- Updated dependencies [#38](https://github.com/appliedengdesign/vscode-gcode-syntax/pull/38)
+- Refactored some Regex to be more concise
+- Updated VSCode engine to `^1.68.0`
+- Update Typescript build to ES2021
+- Updated README
+
 ## v0.7.1 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.7.1)
 
 ### New Features
diff --git a/README.md b/README.md
@@ -83,7 +83,8 @@ This extension adds language syntax for CNC G-Code, code snippets, and colorizat
 | .gcode | .gp  | .hnc   | .knc   | .lib | .m   | .min | .mpf |
 | .mpr   | .msb | .nc    | .ncc   | .ncd | .ncf | .ncg | .nci |
 | .ncp   | .ngc | .out   | .pim   | .pit | .plt | .ply | .prg |
-| .pu1   | .rol | .sbp   | .spf   | .ssb | .sub | .tap | .xpi | 
+| .pu1   | .rol | .S     | .sbp   | .spf | .ssb | .sub | .tap |
+| .xpi   |      |        |        |      |      |      |      |
 ```
 
 If you would like another file extension supported by this extension, please [open an issue](https://github.com/appliedemgdesign/vscode-gcode-syntax/issues).
@@ -140,7 +141,7 @@ Visit our [projects page](https://github.com/appliedengdesign/vscode-gcode-synta
 
 ## Changelog
 
-Latest Version: v0.7.1
+Latest Version: v0.7.2
 
 Please refer to our [CHANGELOG](https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/CHANGELOG.md) doc.
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "displayName": "G-Code Syntax",
     "shortName": "G-Code",
     "description": "Turn VSCode into a fully capable G-Code editor, including language support & more.",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "license": "MIT",
     "publisher": "appliedengdesign",
     "author": {
@@ -12,7 +12,7 @@
     },
     "copyright": "Copyright (c) 2022 Applied Eng. & Design / Mike Centola",
     "engines": {
-        "vscode": "^1.67.0"
+        "vscode": "^1.68.0"
     },
     "categories": [
         "Programming Languages",
@@ -467,27 +467,27 @@
         "@types/chai": "^4.3.1",
         "@types/glob": "^7.2.0",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^17.0.34",
-        "@types/vscode": "^1.67.0",
-        "@typescript-eslint/eslint-plugin": "^5.24.0",
-        "@typescript-eslint/parser": "^5.24.0",
+        "@types/node": "^18.0.0",
+        "@types/vscode": "^1.68.1",
+        "@typescript-eslint/eslint-plugin": "^5.30.0",
+        "@typescript-eslint/parser": "^5.30.0",
         "chai": "^4.3.6",
-        "eslint": "^8.15.0",
+        "eslint": "^8.18.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-prettier": "^4.0.0",
+        "eslint-plugin-prettier": "^4.2.1",
         "fork-ts-checker-webpack-plugin": "^7.2.11",
         "glob": "^8.0.3",
         "mocha": "^10.0.0",
-        "prettier": "^2.6.2",
+        "prettier": "^2.7.1",
         "shx": "^0.3.4",
-        "ts-loader": "^9.3.0",
-        "ts-node": "^10.7.0",
-        "typescript": "^4.6.4",
+        "ts-loader": "^9.3.1",
+        "ts-node": "^10.8.1",
+        "typescript": "^4.7.4",
         "vscode-test": "^1.6.1",
-        "webpack": "^5.72.1",
+        "webpack": "^5.73.0",
         "webpack-bundle-analyzer": "^4.5.0",
-        "webpack-cli": "^4.9.2"
+        "webpack-cli": "^4.10.0"
     },
     "dependencies": {
         "@appliedengdesign/gcode-reference": "^0.0.3"
diff --git a/syntaxes/gcode.tmLanguage.json b/syntaxes/gcode.tmLanguage.json
@@ -16,7 +16,13 @@
                     "include": "#bracket-expression"
                 },
                 {
-                    "include": "#keywords"
+                    "include": "#control"
+                },
+                {
+                    "include": "#gcodes"
+                },
+                {
+                    "include": "#mcodes"
                 },
                 {
                     "include": "#operators"
@@ -54,12 +60,28 @@
                 }
             ]
         },
-        "keywords": {
+        "control": {
             "patterns": [
                 {
-                    "match": "(GOTO(?>\\d+))|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO ?(?>\\d+))|(WHILE)|(WH)|(END ?(?>\\d+))|(AND)|(OR)|(XOR)|(THEN)|(ELSE)|(ENDIF)",
+                    "match": "(GOTO\\s?\\d*)",
+                    "name": "keyword.control.gcode"
+                },
+                {
+                    "match": "(EQ|NE|LT|GT|LE|GE|AND|OR|XOR)",
                     "name": "keyword.control.gcode"
                 },
+                {
+                    "match": "(DO\\s?\\d*|WHILE|WH|END|IF|THEN|ELSE|ENDIF)",
+                    "name": "keyword.control.gcode"
+                },
+                {
+                    "match": "([\\%])",
+                    "name": "string.gcode"
+                }
+            ]
+        },
+        "gcodes": {
+            "patterns": [
                 {
                     "match": "[gG](1)?5[4-9](.1)?\\s?(P[0-9]{1,3})?",
                     "name": "constant.numeric.gcode"
@@ -75,29 +97,29 @@
                 {
                     "match": "[gG][0-9]{1,3}(\\.[0-9])?",
                     "name": "markup.bold.gcode"
-                },
+                }
+            ]
+        },
+        "mcodes": {
+            "patterns": [
                 {
                     "match": "[mM][0-9]{1,3}",
                     "name": "keyword.operator.quantifier.regexp.gcode"
-                },
-                {
-                    "match": "([\\%])",
-                    "name": "string.gcode"
                 }
             ]
         },
         "operators": {
             "patterns": [
                 {
-                    "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(FIX)|(FUP)|(LN)|(ROUND)|(SQRT)",
+                    "match": "(SIN|COS|TAN|ASIN|ACOS|ATAN|FIX|FUP|LN|ROUND|SQRT)",
                     "name": "support.constant.math.gcode"
                 },
                 {
-                    "match": "(FIX)|(FUP)|(ROUND)|(ABS)|(MOD)",
+                    "match": "(FIX|FUP|ROUND|ABS|MOD)",
                     "name": "support.constant.math.gcode"
                 },
                 {
-                    "match": "(\\+)|(\\*)|(\\/)|(\\*\\*)",
+                    "match": "(\\+|\\*|\\/|\\*\\*)",
                     "name": "support.constant.math.gcode"
                 },
                 {
@@ -157,15 +179,15 @@
         "tools": {
             "patterns": [
                 {
-                    "match": "([dD])\\s?(\\d*\\.?\\d*|(?=[#\\[]))",
+                    "match": "([dD])\\s?(\\d+(\\.\\d*)?|(?=[#\\[]))",
                     "name": "constant.character.gcode"
                 },
                 {
-                    "match": "([hH])\\s?(\\d*\\.?\\d*|(?=[#\\[]))",
+                    "match": "([hH])\\s?(\\d+(\\.\\d*)?|(?=[#\\[]))",
                     "name": "constant.character.gcode"
                 },
                 {
-                    "match": "([tT])\\s?(\\d*\\.?\\d*|(?=[#\\[]))",
+                    "match": "([tT])\\s?(\\d+(\\.\\d*)?|(?=[#\\[]))",
                     "name": "constant.character.gcode"
                 }
             ]
@@ -219,4 +241,4 @@
             ]
         }
     }
-}
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,13 +1,14 @@
 {
+	"$schema": "https://json.schemastore.org/tsconfig",
 	"compilerOptions": {
 		"esModuleInterop": true,
 		"forceConsistentCasingInFileNames": true,
 		"incremental": true,
 		"isolatedModules": true,
 		"lib": [
-			"es2020"
+			"ES2021"
 		],
-		"module": "esnext",
+		"module": "CommonJS",
 		"moduleResolution": "node",
 		"noFallthroughCasesInSwitch": true,
 		"noImplicitReturns": true,
@@ -19,7 +20,7 @@
 		"skipLibCheck": true,
 		"sourceMap": true,
 		"strict": true,
-		"target": "es2019",
+		"target": "ES2021",
 		"useDefineForClassFields": true
 	},
 	"include": [
@@ -28,6 +29,6 @@
 	],
 	"exclude": [
 		"node_modules",
-		"samplenc",
+		"samplenc"
 	]
 }
diff --git a/tsconfig.tests.json b/tsconfig.tests.json
@@ -2,9 +2,9 @@
     "extends": "./tsconfig.json",
     "compilerOptions": {
         "lib": [
-            "es2020"
+            "ES2021"
         ],
-        "module": "commonjs",
+        "module": "CommonJS",
         "outDir": "out",
         "tsBuildInfoFile": "tsconfig.tests.tsbuildinfo"
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.eslintcache`
	`2`	`+.vscode-test/**`
`2`	`3`	`*.vsix`
`3`	`4`	`dist`
`4`	`5`	`images/*.ai`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,13 @@`
`16`	`16`	`"include": "#bracket-expression"`
`17`	`17`	`},`
`18`	`18`	`{`
`19`		`- "include": "#keywords"`
	`19`	`+ "include": "#control"`
	`20`	`+ },`
	`21`	`+ {`
	`22`	`+ "include": "#gcodes"`
	`23`	`+ },`
	`24`	`+ {`
	`25`	`+ "include": "#mcodes"`
`20`	`26`	`},`
`21`	`27`	`{`
`22`	`28`	`"include": "#operators"`
`@@ -54,12 +60,28 @@`
`54`	`60`	`}`
`55`	`61`	`]`
`56`	`62`	`},`
`57`		`- "keywords": {`
	`63`	`+ "control": {`
`58`	`64`	`"patterns": [`
`59`	`65`	`{`
`60`		`- "match": "(GOTO(?>\\d+))\|(IF)\|(EQ)\|(NE)\|(LT)\|(GT)\|(LE)\|(GE)\|(DO ?(?>\\d+))\|(WHILE)\|(WH)\|(END ?(?>\\d+))\|(AND)\|(OR)\|(XOR)\|(THEN)\|(ELSE)\|(ENDIF)",`
	`66`	`+ "match": "(GOTO\\s?\\d*)",`
	`67`	`+ "name": "keyword.control.gcode"`
	`68`	`+ },`
	`69`	`+ {`
	`70`	`+ "match": "(EQ\|NE\|LT\|GT\|LE\|GE\|AND\|OR\|XOR)",`
`61`	`71`	`"name": "keyword.control.gcode"`
`62`	`72`	`},`
	`73`	`+ {`
	`74`	`+ "match": "(DO\\s?\\d*\|WHILE\|WH\|END\|IF\|THEN\|ELSE\|ENDIF)",`
	`75`	`+ "name": "keyword.control.gcode"`
	`76`	`+ },`
	`77`	`+ {`
	`78`	`+ "match": "([\\%])",`
	`79`	`+ "name": "string.gcode"`
	`80`	`+ }`
	`81`	`+ ]`
	`82`	`+ },`
	`83`	`+ "gcodes": {`
	`84`	`+ "patterns": [`
`63`	`85`	`{`
`64`	`86`	`"match": "[gG](1)?5[4-9](.1)?\\s?(P[0-9]{1,3})?",`
`65`	`87`	`"name": "constant.numeric.gcode"`
`@@ -75,29 +97,29 @@`
`75`	`97`	`{`
`76`	`98`	`"match": "[gG][0-9]{1,3}(\\.[0-9])?",`
`77`	`99`	`"name": "markup.bold.gcode"`
`78`		`- },`
	`100`	`+ }`
	`101`	`+ ]`
	`102`	`+ },`
	`103`	`+ "mcodes": {`
	`104`	`+ "patterns": [`
`79`	`105`	`{`
`80`	`106`	`"match": "[mM][0-9]{1,3}",`
`81`	`107`	`"name": "keyword.operator.quantifier.regexp.gcode"`
`82`		`- },`
`83`		`- {`
`84`		`- "match": "([\\%])",`
`85`		`- "name": "string.gcode"`
`86`	`108`	`}`
`87`	`109`	`]`
`88`	`110`	`},`
`89`	`111`	`"operators": {`
`90`	`112`	`"patterns": [`
`91`	`113`	`{`
`92`		`- "match": "(SIN)\|(COS)\|(TAN)\|(ASIN)\|(ACOS)\|(ATAN)\|(FIX)\|(FUP)\|(LN)\|(ROUND)\|(SQRT)",`
	`114`	`+ "match": "(SIN\|COS\|TAN\|ASIN\|ACOS\|ATAN\|FIX\|FUP\|LN\|ROUND\|SQRT)",`
`93`	`115`	`"name": "support.constant.math.gcode"`
`94`	`116`	`},`
`95`	`117`	`{`
`96`		`- "match": "(FIX)\|(FUP)\|(ROUND)\|(ABS)\|(MOD)",`
	`118`	`+ "match": "(FIX\|FUP\|ROUND\|ABS\|MOD)",`
`97`	`119`	`"name": "support.constant.math.gcode"`
`98`	`120`	`},`
`99`	`121`	`{`
`100`		`- "match": "(\\+)\|(\\)\|(\\/)\|(\\\\*)",`
	`122`	`+ "match": "(\\+\|\\\|\\/\|\\\\*)",`
`101`	`123`	`"name": "support.constant.math.gcode"`
`102`	`124`	`},`
`103`	`125`	`{`
`@@ -157,15 +179,15 @@`
`157`	`179`	`"tools": {`
`158`	`180`	`"patterns": [`
`159`	`181`	`{`
`160`		`- "match": "([dD])\\s?(\\d\\.?\\d\|(?=[#\\[]))",`
	`182`	`+ "match": "([dD])\\s?(\\d+(\\.\\d*)?\|(?=[#\\[]))",`
`161`	`183`	`"name": "constant.character.gcode"`
`162`	`184`	`},`
`163`	`185`	`{`
`164`		`- "match": "([hH])\\s?(\\d\\.?\\d\|(?=[#\\[]))",`
	`186`	`+ "match": "([hH])\\s?(\\d+(\\.\\d*)?\|(?=[#\\[]))",`
`165`	`187`	`"name": "constant.character.gcode"`
`166`	`188`	`},`
`167`	`189`	`{`
`168`		`- "match": "([tT])\\s?(\\d\\.?\\d\|(?=[#\\[]))",`
	`190`	`+ "match": "([tT])\\s?(\\d+(\\.\\d*)?\|(?=[#\\[]))",`
`169`	`191`	`"name": "constant.character.gcode"`
`170`	`192`	`}`
`171`	`193`	`]`
`@@ -219,4 +241,4 @@`
`219`	`241`	`]`
`220`	`242`	`}`
`221`	`243`	`}`
`222`		`-}`
	`244`	`+}`