Merge branch 'hotfix-0.1.1'

Author: mikecentola

.vscode/launch.json

@@ -1,6 +1,6 @@
 // A launch configuration that launches the extension inside a new window
 {
-    "version": "0.1.0",
+    "version": "0.1.1",
     "configurations": [
         {
             "name": "Launch Extension",

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 All changes to vscode-code-syntax will be documented here.
 
+## v0.1.1 [#]()
+
 ## v0.1.0 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.1.0)
 
 - Initial Release

README.md

@@ -25,7 +25,7 @@ Install & activate extension. Extension activates when you open a file marked fo
 
 ## Known Issues
 
-No known issues at this time.
+Please visit our [GitHub Issues](https://github.com/appliedengdesign/vscode-gcode-syntax/issues) page for any open issues.
 
 ## TODO
 

package.json

@@ -2,7 +2,7 @@
     "name": "vscode-gcode-syntax",
     "displayName": "G-Code Syntax",
     "description": "CNC G-Code Syntax Langauge",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "license": "MIT",
     "publisher": "appliedengdesign",
     "author": {

syntaxes/gcode.tmLanguage.json

@@ -5,9 +5,6 @@
         {
             "include": "#comments"
         },
-        {
-            "include": "#keywords"
-        },
         {
             "include": "#speedsfeeds"
         },
@@ -25,6 +22,12 @@
         },
         {
             "include": "#macrovars"
+        },
+        {
+            "include": "#keywords"
+        },
+        {
+            "include": "#operators"
         }
     ],
     "repository": {
@@ -60,16 +63,28 @@
                     "name": "string.gcode"
                 },
                 {
-                    "match": "(GOTO)|(IF)|(EQ)|(NE)|(LT)|(GT)",
+                    "match": "(GOTO)|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO)|(WHILE)|(END)|(AND)|(OR)|(XOR)",
                     "name": "keyword.control.gcode"
                 }
             ]
         },
         "operators": {
             "patterns": [
                 {
-                    "match": "(SIN)|(COS)|(TAN)",
+                    "match": "(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(LN)|(SQRT)|(MOD)|(EXP)",
                     "name": "support.constant.math.gcode"
+                },
+                {
+                    "match": "(FIX)|(FUP)|(ROUND)|(ABS)",
+                    "name": "support.constant.math.gcode"
+                },
+                {
+                    "match": "(\\+)|(\\*)|(\\/)|(\\*\\*)",
+                    "name": "support.constant.math.gcode"
+                },
+                {
+                    "match": "(\\-)",
+                    "name": "invalid.gcode"
                 }
             ]
         },