Merge branch 'code-tree' into dev

Author: mikecentola

README.md

@@ -15,6 +15,8 @@ Language synax, IntelliSense, code snippits & more for writing G-Code for CNC ma
 
 This extension adds language syntax for CNC G-Code, code snippets, and colorization.
 
+There is also a tree-view of the G-Code, which parses the commands and gives you an overview of the program.
+
 ### Current Supported Extensions
 
 - .m
@@ -51,20 +53,29 @@ This extension adds language syntax for CNC G-Code, code snippets, and colorizat
 
 ## Installation
 
-Install from Extensions Marketplace
+Install from Extensions Marketplace or manually install the `vsix` file.
 
 ## Usage
 
 Install & activate extension. Extension activates when you open a file marked for the `gcode` language.
 
+Tree view is enabled by default and can be access from the G icon on the activity bar.
+
+## Configuration
+
+- Colorization ( Not Currently Active )
+- Machine Type ( Not Currently Active )
+- Tree Auto-Refresh
+  - Tree auto-refreshes as changes are made to the gcode. Disabled by default.
+
 ## Known Issues
 
 Please visit our [GitHub Issues](https://github.com/appliedengdesign/vscode-gcode-syntax/issues) page for any open issues.
 
 ## TODO
 
 - Add more snippets
-- Add tree view feature for machining blocks
+- Add additional tree items.
 - G-Code Debugging
 - Backplotting?
 
@@ -80,6 +91,12 @@ If you work like to help contribute to the code or this project, please fork awa
 
 For more information on contributing, please refer to the [CONTRIBUTING](https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/CONTRIBUTING.md) doc.
 
+## About Applied Eng & Design
+
+We are a full service engineering and design firm, specializing in CAD/CAM, CNC milling, rapid prototyping, training and more.  We also like to dabble in Arudino / RaspberryPi projects, electronics, drones and robotics projects! Subscribe to our YouTube channel for videos on our projects, screencast tutorials, and more!
+
+Follow us on [Twitter](https://twitter.com/appliedengdes) & [Instagram](https://instagram.com/appliedengdes), and like our [Facebook Page](https://facebook.com/appliedengdesign)!
+
 ## License
 
 This extension is licensed under the [MIT License](https://opensource.org/licenses/MIT).

images/screenshot.png

@@ -30,7 +30,7 @@
     "bugs": {
         "url": "https://github.com/appliedengdesign/vscode-gcode-syntax/issues"
     },
-    "main": "./out/extension",
+    "main": "./out/extension.js",
     "activationEvents": [
         "onLanguage:gcode"
     ],
@@ -107,27 +107,70 @@
             "type": "object",
             "title": "G-Code",
             "properties": {
-                "gcode.colorization.enabled": {
+                "gcode.colorization": {
                     "type": "boolean",
                     "default": false,
                     "description": "Enable G-Code specific colorization options",
                     "scope": "window"
                 },
                 "gcode.machineType": {
                     "type": "string",
-                    "default": "mill",
+                    "default": "Mill",
                     "enum": [
-                        "mill",
-                        "lathe"
+                        "Mill",
+                        "Lathe"
                     ],
                     "enumDescriptions": [
                         "Loads specific snippets for CNC Mill G-Code",
                         "Loads specific snippets for CNC Lathe G-Code"
                     ],
                     "scope": "window"
+                },
+                "gcode.treeAutoRefresh": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Enable G-Code Tree Auto Refresh",
+                    "scope": "window"
+                }
+            }
+        },
+        "viewsContainers": {
+            "activitybar": [
+                {
+                    "id": "gcode",
+                    "title": "G-Code",
+                    "icon": "images/vscode-gcode-syntax-icon.svg"
+                }
+            ]
+        },
+        "views": {
+            "gcode": [
+                {
+                    "id": "gcodeTree",
+                    "name": "G-Code Tree",
+                    "when": "gcodeTreeEnabled"
+                }
+            ]
+        },
+        "menus": {
+            "view/title": [
+                {
+                    "command": "gcodeTree.refreshEntry",
+                    "when": "view == gcodeTree",
+                    "group": "navigation"
+                }
+            ]
+        },
+        "commands": [
+            {
+                "command": "gcodeTree.refreshEntry",
+                "title": "Refresh",
+                "icon": {
+                    "light": "resources/icons/light/refresh.svg",
+                    "dark": "resources/icons/dark/refresh.svg"
                 }
             }
-        }
+        ]
     },
     "scripts": {
         "vscode:prepublish": "npm run compile",