Some more watch panel improvements

Added support for the Delete key to delete entries.
Fixed delete watches, it never worked properly.
Optimized adding, removing and updating new entries.

Author: Neverbirth

External/Plugins/FlashDebugger/Controls/DataTreeControl.cs

@@ -70,6 +70,7 @@ public DataTreeControl(bool watchMode)
                 NameNodeTextBox.EditorHided += NameNodeTextBox_EditorHided;
                 NameNodeTextBox.IsEditEnabledValueNeeded += NameNodeTextBox_IsEditEnabledValueNeeded;
                 NameNodeTextBox.LabelChanged += NameNodeTextBox_LabelChanged;
+                _tree.KeyDown += Tree_KeyDown;
                 _tree.NodeMouseClick += Tree_NameNodeMouseClick;
             }
 
@@ -175,6 +176,16 @@ void NameNodeTextBox_LabelChanged(object sender, LabelEventArgs e)
             if (!newExp) node.Text = e.OldLabel;
         }
 
+        void Tree_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Delete)
+            {
+                var node = _tree.SelectedNode;
+                if (node != null && node.Level == 1 && node.NextNode != null)
+                    PanelsHelper.watchUI.RemoveElement(Tree.SelectedNode.Index);
+            }
+        }
+
         void Tree_NameNodeMouseClick(object sender, TreeNodeAdvMouseEventArgs e)
         {
             if (e.Node.Level == 1 && e.Control == NameNodeTextBox && !e.Node.CanExpand &&
@@ -323,7 +334,7 @@ private void WatchItemClick(Object sender, EventArgs e)
             DataNode node = Tree.SelectedNode.Tag as DataNode;
             if (watchMode)
             {
-                PanelsHelper.watchUI.RemoveElement(Tree.SelectedNode.Row);
+                PanelsHelper.watchUI.RemoveElement(Tree.SelectedNode.Index);
             }
             else
             {
@@ -337,7 +348,7 @@ void TreeSelectionChanged(Object sender, EventArgs e)
             {
                 item.Enabled = (Tree.SelectedNode != null);
             }
-            if (watchMode) watchMenuItem.Enabled = (Tree.SelectedNode != null && Tree.SelectedNode.Level == 1);
+            if (watchMode) watchMenuItem.Enabled = (Tree.SelectedNode != null && Tree.SelectedNode.Level == 1 && Tree.SelectedNode.NextNode != null);
         }
 
         void TreeExpanding(Object sender, TreeViewAdvEventArgs e)

External/Plugins/FlashDebugger/Controls/WatchUI.cs

@@ -17,7 +17,7 @@ namespace FlashDebugger.Controls
     public class WatchUI : DockPanelControl
     {
         private DataTreeControl treeControl;
-        private List<String> watches;
+        private List<string> watches;
 
         public WatchUI()
         {
@@ -39,23 +39,25 @@ private void TreeControlResize(Object sender, EventArgs e)
             this.treeControl.Tree.Columns[1].Width = w - 8;
         }
 
-        public bool AddElement(String item)
+        public bool AddElement(string item)
         {
             if (watches.Contains(item)) return false;
             watches.Add(item);
+            treeControl.Nodes.Insert(watches.Count - 1, GetExpressionNode(item));
             UpdateElements();
             return true;
         }
 
         public void RemoveElement(string item)
         {
-            watches.Remove(item);
-            UpdateElements();
+            if (watches.Remove(item))
+                UpdateElements();
         }
 
         public void RemoveElement(int itemN)
         {
-            if (itemN < watches.Count) RemoveElement(watches[itemN]);
+            if (itemN < watches.Count) watches.RemoveAt(itemN);
+            treeControl.Nodes.RemoveAt(itemN);
         }
 
         public bool ReplaceElement(string oldItem, string newItem)
@@ -67,7 +69,7 @@ public bool ReplaceElement(string oldItem, string newItem)
             else
             {
                 watches[itemN] = newItem;
-                UpdateElements();
+                treeControl.Nodes[itemN] = GetExpressionNode(newItem);
             }
 
             return true;
@@ -78,36 +80,16 @@ public void Clear()
             watches.Clear();
             treeControl.Nodes.Clear();
         }
-
+        
         public void UpdateElements()
         {
             treeControl.Tree.BeginUpdate();
             treeControl.SaveState();
 
             treeControl.Nodes.Clear();
-            foreach (String item in watches)
+            foreach (string item in watches)
             {
-                DataNode node; // todo, introduce new Node types.
-                try
-                {
-                    IASTBuilder builder = new ASTBuilder(false);
-                    ValueExp exp = builder.parse(new java.io.StringReader(item));
-                    var ctx = new ExpressionContext(PluginMain.debugManager.FlashInterface.Session, PluginMain.debugManager.FlashInterface.GetFrames()[PluginMain.debugManager.CurrentFrame]);
-                    var obj = exp.evaluate(ctx);
-                    if (obj is Variable)
-                        node = new VariableNode((Variable)obj);
-                    else if (obj is Value)
-                        node = new ValueNode(item, (Value)obj);
-                    else
-                        node = new ScalarNode(item, obj.toString());
-                    node.Tag = item;
-                }
-                catch (Exception ex)
-                {
-                    node = new ErrorNode(item, ex);
-                }
-                node.Text = item;
-                treeControl.AddNode(node);
+                treeControl.AddNode(GetExpressionNode(item));
             }
 
             treeControl.AddNode(new ValueNode(TextHelper.GetString("Label.AddExpression")));
@@ -116,5 +98,31 @@ public void UpdateElements()
             treeControl.Enabled = true;
         }
 
+        private DataNode GetExpressionNode(string item)
+        {
+            DataNode node;
+            try
+            {
+                IASTBuilder builder = new ASTBuilder(false);
+                ValueExp exp = builder.parse(new java.io.StringReader(item));
+                var ctx = new ExpressionContext(PluginMain.debugManager.FlashInterface.Session, PluginMain.debugManager.FlashInterface.GetFrames()[PluginMain.debugManager.CurrentFrame]);
+                var obj = exp.evaluate(ctx);
+                if (obj is Variable)
+                    node = new VariableNode((Variable)obj);
+                else if (obj is Value)
+                    node = new ValueNode(item, (Value)obj);
+                else
+                    node = new ScalarNode(item, obj.toString());
+                node.Tag = item;
+            }
+            catch (Exception ex)
+            {
+                node = new ErrorNode(item, ex);
+            }
+            node.Text = item;
+
+            return node;
+        }
+
     }
 }