Parser work for Tree

Signed-off-by: Mike Centola <[email protected]>

Author: mikecentola

package.json

@@ -30,7 +30,7 @@
     "bugs": {
         "url": "https://github.com/appliedengdesign/vscode-gcode-syntax/issues"
     },
-    "main": "./out/extension",
+    "main": "./out/extension.js",
     "activationEvents": [
         "onLanguage:gcode"
     ],
@@ -125,6 +125,12 @@
                         "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"
                 }
             }
         },
@@ -145,8 +151,26 @@
                     "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",

resources/icons/dark/cwcutting.svg

@@ -13,6 +13,11 @@ class Config {
         this.config = workspace.getConfiguration("gcode");
     } 
 
+    getParam(param: string): any {
+
+        return this.config.get(param);
+    }
+
 }
 
 export const config = new Config();

resources/icons/dark/gcode.svg

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-
+import { config } from './config';
 import * as util from './util';
 import * as manifest from './manifest.json';
 
@@ -17,10 +17,12 @@ export function activate(context: vscode.ExtensionContext) {
     conout.show(true);
     conout.appendLine(name + " v" + version + " activated.");
 
-    // Enable Tree View
+    // G-Code Tree View
     const gcodeTree = new GCodeTreeProvider(context);
     vscode.window.registerTreeDataProvider('gcodeTree', gcodeTree);
 
+    vscode.commands.registerCommand('gcodeTree.refreshEntry', () => gcodeTree.refresh());
+
     conout.appendLine("G-Code Tree View Enabled");
 
     /*

resources/icons/dark/refresh.svg

@@ -1,20 +1,189 @@
+import * as vscode from 'vscode';
+import {GCodeTreeNode} from './gcodeTree';
 
 export class GCodeParser {
 
+    private blocks: Array<GCodeTreeNode>;
+
     constructor( readonly text: string) {
-        
+    
+        this.blocks = this.getBlocks(text);
+
+    }
+
+    getTree(): Array<GCodeTreeNode> {
+        return this.blocks;
     }
 
+    // Split Text into Blocks by newline or ;
+    private getBlocks(text: string): Array<any> {
 
-        // Comments
-        private stripComments(line: string): string {
-            const re1 = new RegExp(/\s*\([^\)]*\)/g);   // Remove anything inside the parentheses
-            const re2 = new RegExp(/\s*;.*/g);          // Remove anything after a semi-colon to the end of the line, including preceding spaces
-            const re3 = new RegExp(/\s+/g);
+        const nodes:Array<any> = [];
+        const lines = text.match(/.*(?:\r\n|\r|\n)/g) || [];
+
+        for (let i = 0; i < lines.length; ++i) {
+            
+            const line = lines[i].trim();
 
-            return (line.replace(re1, '').replace(re2, '').replace(re3, ''));
+            if (line.length === 0) {
+                continue;
+            }
+
+            const result = this.parseLine(line);
+            if (result.length !== 0) {
+                nodes.push(result);
+            }
+        }
+        
+        return nodes;
+
+    }
+
+    // Parse Line for Blocks
+    private parseLine(line: string): Array<GCodeTreeNode> {
+
+        let blocks: Array<GCodeTreeNode> = [];
+        let node: GCodeTreeNode;
+        
+        // Regexp to Pull key words
+        const re = /((GOTO)|(IF)|(EQ)|(NE)|(LT)|(GT)|(LE)|(GE)|(DO)|(WHILE)|(END)|(AND)|(OR)|(XOR)|(SIN)|(COS)|(TAN)|(ASIN)|(ACOS)|(ATAN)|(FIX)|(FUP)|(LN)|(ROUND)|(SQRT)|(FIX)|(FUP)|(ROUND)|(ABS))|((?:\$\$)|(?:\$[a-zA-Z0-9#]*))|([a-zA-Z][0-9\+\-\.]+)|(\*[0-9]+)|([#][0-9]+)|([#][\[].+[\]])/igm;
+       
+        // Strip Comments
+        line = this.stripComments(line);
+
+        // Get Words
+        const words = line.match(re) || [];
+
+        for (let i = 0; i < words.length; ++i) {
+            const word = words[i];
+            const letter = word[0].toUpperCase();
+            const argument = word.slice(1);
+
+            // G-Code
+            if (letter === 'G') {
+
+                switch(argument) {
+
+                    // Rapid Motion
+                    case '00':
+                    case '0' : 
+                       node = new GCodeTreeNode(
+                            'Rapid', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = '[G00] Rapid Motion';
+                        node.setIcon('rapid');
+
+                        blocks.push(node);
+                        break;
+
+                    // Linear / Cutting
+                    case '01':
+                    case '1' : 
+                        node = new GCodeTreeNode(
+                            'Cutting', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = '[G01] Linear]';
+                        node.setIcon('cutting');
+
+                        blocks.push(node);
+                        break;
+
+                    // CW Motion
+                    case '02':
+                    case '2' : 
+                        node = new GCodeTreeNode(
+                            'CW Cutting', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = '[G02] CW Interpolation';
+                        node.setIcon('cwcutting');
+
+                        blocks.push(node);
+                        break;
+
+                    // CCW Motion
+                    case '03':
+                    case '3' :
+                        node = new GCodeTreeNode(
+                            'CCW Cutting', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = '[G03] CCW Interpolation';
+                        node.setIcon('ccwcutting');
+
+                        blocks.push(node);
+                        break;
+
+                    default: {
+                        break;
+                    }
+                }
+
+            } else if (letter === 'M') {
+
+                switch(argument) {
+
+                    // Tool Change
+                    case '06':
+                    case '6' :
+                        node = new GCodeTreeNode(
+                            'Tool Change', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = 'Tool Change';
+                        node.setIcon('toolchange');
+                        
+                        blocks.push(node);
+                        break;
+                    
+                    
+                    // Coolant On
+                    case '08':
+                    case '8' :
+                        node = new GCodeTreeNode(
+                            'Coolant On', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = 'Coolant Turned On';
+                        node.setIcon('coolant');
+                        
+                        blocks.push(node);
+                        break;
+
+                    // Coolant Off
+                    case '09':
+                    case '9' : 
+                        node = new GCodeTreeNode(
+                            'Coolant Off', 
+                            vscode.TreeItemCollapsibleState.None,
+                        );
+                        node.tooltip = 'Coolant Turned Off';
+                        node.setIcon('coolant');
+                        
+                        blocks.push(node);
+
+                    default:
+                        break;
+                }
+            }
         }
 
+        return blocks;
+
+        
+    }
+
+    // Comments
+    private stripComments(line: string): string {
+        const re1 = new RegExp(/\s*\([^\)]*\)/g);   // Remove anything inside the parentheses
+        const re2 = new RegExp(/\s*;.*/g);          // Remove anything after a semi-colon to the end of the line, including preceding spaces
+        const re3 = new RegExp(/\s+/g);
+        
+        return (line.replace(re1, '').replace(re2, '').replace(re3, ''));
+    }
+