Initial replacement of lazy loading ParseTreeView complete

There is however a bug in the viewer

Author: wiredwiz

GunWin/GunWin.csproj

@@ -181,6 +181,10 @@
       <Project>{8bd992fd-a3b3-4af9-9371-5aa14ddfda68}</Project>
       <Name>Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\ParserTreeView\ParserTreeView.csproj">
+      <Project>{b96d577c-e90a-4817-aa1c-3a211efb83f0}</Project>
+      <Name>ParserTreeView</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Utilities\Utilities.csproj">
       <Project>{4e020f1d-27bf-4853-8573-474d7edb4e72}</Project>
       <Name>Utilities</Name>

GunWin/VisualAnalyzer.Designer.cs

@@ -431,10 +431,11 @@ private void BuildParseTreeTreeViewGuide(ITree tree)
             return;
          }
 
-         var treeNode =
-            new TreeNode(Trees.GetNodeText(tree, _Grammar.ParserRules)) { Tag = tree, Name = tree.GetHashCode().ToString() };
-         ParseTreeView.Nodes.Add(treeNode);
-         AddTreeBranchesAndLeaves(treeNode, tree);
+         //var treeNode =
+         //   new TreeNode(Trees.GetNodeText(tree, _Grammar.ParserRules)) { Tag = tree, Name = tree.GetHashCode().ToString() };
+         //ParseTreeView.Nodes.Add(treeNode);
+         //AddTreeBranchesAndLeaves(treeNode, tree);
+         ParseTreeView.LoadParseTree(tree, _Grammar);
 
          ParseTreeView.EndUpdate();
          ParseTreeView.ResumeLayout();
@@ -819,16 +820,19 @@ private void LoadSourceToolStripMenuItem_Click(object sender, EventArgs e)
 
       private void Menu_GraphFromHere_Click(object sender, EventArgs e)
       {
-         if (_Viewer.SelectedObject is Node node)
+         if (_Viewer.SelectedObject is Node node && node.UserData is ITree target)
          {
-            var treeNodes = ParseTreeView.Nodes.Find(node.UserData?.GetHashCode().ToString(), true);
-            if (treeNodes.Length != 0)
-            {
-               var workingNode = treeNodes.First();
-               ParseTreeView.SelectedNode = workingNode;
-               RenderParseTreeGraph(workingNode.Tag as ITree, 0);
-               ParseTreeView.Focus();
-            }
+            ParseTreeView.SelectTreeNode(target);
+            RenderParseTreeGraph(target, 0);
+            ParseTreeView.Focus();
+            //var treeNodes = ParseTreeView.Nodes.Find(node.UserData?.GetHashCode().ToString(), true);
+            //if (treeNodes.Length != 0)
+            //{
+            //   var workingNode = treeNodes.First();
+            //   ParseTreeView.SelectedNode = workingNode;
+            //   RenderParseTreeGraph(workingNode.Tag as ITree, 0);
+            //   ParseTreeView.Focus();
+            //}
          }
       }
 

GunWin/VisualAnalyzer.cs

@@ -18,6 +18,19 @@ public ParserTreeView()
       {
          InitializeComponent();
          BeforeSelect += ParserTreeView_BeforeSelect;
+         BeforeExpand += ParserTreeView_BeforeExpand;
+      }
+
+      private void ParserTreeView_BeforeExpand(object sender, TreeViewCancelEventArgs e)
+      {
+         if (e.Node.Tag is ITree tree)
+         {
+            for (var i = 0; i < tree.ChildCount; i++)
+            {
+               var child = tree.GetChild(i);
+               AddChildNode(e.Node, child);
+            }
+         }
       }
 
       /// <summary>
@@ -47,6 +60,7 @@ public void LoadParseTree(ITree parseTree, GrammarReference grammar)
       {
          ParseTree = parseTree;
          Grammar = grammar;
+         AddChildNode(null, parseTree);
       }
 
       /// <summary>
@@ -68,6 +82,8 @@ public void SelectTreeNode(ITree tree)
       /// <returns>The final leaf <see cref="TreeNode"/> instance that was created.</returns>
       private TreeNode AddBranchesTillLeaf(ITree tree)
       {
+         // TODO: Find and fix the bug in this method's logic
+
          // fetch our unique ID for the tree instance and then check if it already exists in active nodes
          // if so, we return the existing tree node since nothing more needs to be done
          var nodeName = tree.GetHashCode().ToString();
@@ -119,19 +135,37 @@ private TreeNode AddBranchesTillLeaf(ITree tree)
 
       private TreeNode AddChildNode(TreeNode root, ITree tree)
       {
+         // Add the child node
          var nodeName = tree.GetHashCode().ToString();
-         if (ActiveNodes.TryGetValue(nodeName, out var treeNode))
-            return treeNode;
-         treeNode = new TreeNode(Trees.GetNodeText(tree, Grammar.ParserRules))
+         if (!ActiveNodes.TryGetValue(nodeName, out var treeNode))
+         {
+            treeNode = new TreeNode(Trees.GetNodeText(tree, Grammar.ParserRules))
+            {
+               Tag = tree,
+               Name = nodeName
+            };
+            if (root == null)
+               this.Nodes.Add(treeNode);
+            else
+               root.Nodes.Add(treeNode);
+            ActiveNodes[nodeName] = treeNode;
+         }
+
+         // Now we also add any children of that child node to prepopulate the tree enough to show nodes with children
+         for (var i = 0; i < tree.ChildCount; i++)
          {
-            Tag = tree,
-            Name = nodeName
-         };
-         if (root == null) 
-            this.Nodes.Add(treeNode);
-         else
-            root.Nodes.Add(treeNode);
-         ActiveNodes[nodeName] = treeNode;
+            var child = tree.GetChild(i);
+            nodeName = child.GetHashCode().ToString();
+            if (ActiveNodes.ContainsKey(nodeName))
+               continue;
+            var newChild = new TreeNode(Trees.GetNodeText(child, Grammar.ParserRules))
+            {
+               Tag = child,
+               Name = nodeName
+            };
+            treeNode.Nodes.Add(newChild);
+            ActiveNodes[nodeName] = newChild;
+         }
 
          return treeNode;
       }