Merge branch 'master' into dev

Author: mikecentola

README.md

@@ -86,7 +86,7 @@ This extension adds language syntax for CNC G-Code, code snippets, and colorizat
 | .pu1   | .rol | .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/issues).
+If you would like another file extension supported by this extension, please [open an issue](https://github.com/appliedemgdesign/vscode-gcode-syntax/issues).
 
 ## Installation
 

samplenc/sample-colors.nc

@@ -99,6 +99,20 @@ G04 P500
 
 IF[#898EQ#996]GOTO19999
 
+IF [123 LE ABS[#452 + 1234]] THEN
+(SOMETHING)
+ELSE
+(SOMETHING ELSE)
+ENDIF
+
+WHILE [#123 LT 7.5] DO 5
+(SOMETHING HERE)
+END 5
+
+WHILE [#123 LT 7.5] DO5
+(SOMETHING HERE)
+END5
+
 #[#8 + 7.]=0
 
 G51 P[ #5 * 1000 ]

syntaxes/gcode.tmLanguage.json

@@ -13,31 +13,31 @@
                     "include": "#comments"
                 },
                 {
-                    "include": "#speedsfeeds"
+                    "include": "#bracket-expression"
                 },
                 {
-                    "include": "#prognumbers"
+                    "include": "#keywords"
                 },
                 {
-                    "include": "#coords"
+                    "include": "#operators"
                 },
                 {
-                    "include": "#tools"
+                    "include": "#speedsfeeds"
                 },
                 {
-                    "include": "#modifiers"
+                    "include": "#prognumbers"
                 },
                 {
-                    "include": "#macrovars"
+                    "include": "#coords"
                 },
                 {
-                    "include": "#keywords"
+                    "include": "#tools"
                 },
                 {
-                    "include": "#operators"
+                    "include": "#modifiers"
                 },
                 {
-                    "include": "#bracket-expression"
+                    "include": "#macrovars"
                 }
             ]
         },
@@ -57,7 +57,7 @@
         "keywords": {
             "patterns": [
                 {
-                    "match": "(GOTO(?>\\d+))|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO(?>\\d+))|(WHILE)|(WH)|(END(?>\\d+))|(AND)|(OR)|(XOR)",
+                    "match": "(GOTO(?>\\d+))|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO ?(?>\\d+))|(WHILE)|(WH)|(END ?(?>\\d+))|(AND)|(OR)|(XOR)|(THEN)|(ELSE)|(ENDIF)",
                     "name": "keyword.control.gcode"
                 },
                 {
@@ -219,4 +219,4 @@
             ]
         }
     }
-}
+}