Added some error display when evaluating expressions

Neverbirth · Neverbirth · commit 2384997070c0 · 2015-02-10T18:08:39.000+01:00
diff --git a/External/Plugins/FlashDebugger/Controls/DataTree/ErrorNode.cs b/External/Plugins/FlashDebugger/Controls/DataTree/ErrorNode.cs
@@ -0,0 +1,29 @@
+﻿using System;
+using PluginCore.Localization;
+using flash.tools.debugger.expression;
+
+namespace FlashDebugger.Controls.DataTree
+{
+    public class ErrorNode : DataNode
+    {
+
+        private string _value;
+        public override string Value
+        {
+            get { return _value; }
+            set { throw new NotSupportedException(); }
+        }
+
+        public override bool IsLeaf
+        {
+            get { return true; }
+        }
+
+        public ErrorNode(string text, Exception ex)
+            : base(text)
+        {
+            _value = ex.Message;
+        }
+
+    }
+}
diff --git a/External/Plugins/FlashDebugger/Controls/DataTree/ScalarNode.cs b/External/Plugins/FlashDebugger/Controls/DataTree/ScalarNode.cs
@@ -15,18 +15,15 @@ public override string Value
             set { throw new NotSupportedException(); }
         }
 
-        public ScalarNode(string text, string value)
-            : base(text)
+        public override bool IsLeaf
         {
-            m_Value = value;
+            get { return true; }
         }
 
-        public override bool IsLeaf
+        public ScalarNode(string text, string value)
+            : base(text)
         {
-            get
-            {
-                return true;
-            }
+            m_Value = value;
         }
 
     }
diff --git a/External/Plugins/FlashDebugger/Controls/DataTreeControl.cs b/External/Plugins/FlashDebugger/Controls/DataTreeControl.cs
@@ -114,9 +114,10 @@ void NameNodeTextBox_DrawText(object sender, DrawEventArgs e)
             try
             {
                 if (e.Node.NextNode == null && e.Node.Level == 1 && !addingNewExpression)
-                {
                     e.Font = new Font(e.Font, FontStyle.Italic);
-                }
+                else if (e.Node.Tag is ErrorNode)
+                    e.TextColor = e.Node.IsSelected ? Color.White : Color.Gray;
+
             }
             catch (Exception) { }
         }
@@ -248,12 +249,15 @@ void ValueNodeTextBox_DrawText(object sender, DrawEventArgs e)
         {
             try
             {
-                VariableNode node = e.Node.Tag as VariableNode;
-                FlashInterface flashInterface = PluginMain.debugManager.FlashInterface;
-                if (node != null && node.Variable != null && node.Variable.hasValueChanged(flashInterface.Session))
+                VariableNode variableNode = e.Node.Tag as VariableNode;
+                if (variableNode != null)
                 {
-                    e.TextColor = Color.Red;
+                    FlashInterface flashInterface = PluginMain.debugManager.FlashInterface;
+                    if (variableNode.Variable != null && variableNode.Variable.hasValueChanged(flashInterface.Session))
+                        e.TextColor = Color.Red;
                 }
+                else if (e.Node.Tag is ErrorNode)
+                    e.TextColor = e.Node.IsSelected ? Color.White : Color.Gray;
             }
             catch (NullReferenceException) { }
         }
diff --git a/External/Plugins/FlashDebugger/Controls/DataTreeModel.cs b/External/Plugins/FlashDebugger/Controls/DataTreeModel.cs
@@ -33,7 +33,7 @@ private Node FindNode(Node root, string path, StringBuilder nodePath)
             int initialLength = nodePath.Length;
             foreach (Node node in root.Nodes)
             {
-                nodePath = nodePath.Append(node.Text);
+                nodePath.Append(node.Text);
                 if (path == nodePath.ToString()) return node;
                 nodePath.Append(".");
                 if (path.StartsWith(nodePath.ToString()))
diff --git a/External/Plugins/FlashDebugger/Controls/WatchUI.cs b/External/Plugins/FlashDebugger/Controls/WatchUI.cs
@@ -102,9 +102,9 @@ public void UpdateElements()
                         node = new ScalarNode(item, obj.toString());
                     node.Tag = item;
                 }
-                catch
+                catch (Exception ex)
                 {
-                    node = new ValueNode(item);
+                    node = new ErrorNode(item, ex);
                 }
                 node.Text = item;
                 treeControl.AddNode(node);
diff --git a/External/Plugins/FlashDebugger/Debugger/ExpressionContext.cs b/External/Plugins/FlashDebugger/Debugger/ExpressionContext.cs
@@ -40,7 +40,7 @@ public void assign(java.lang.Object par0, Value par1)
                     throw new NotSupportedException(TextHelper.GetString("Error.NoScalar"));
             } 
             else
-                throw new NoSuchVariableException(par0);
+                throw new NoSuchVariableException(String.Format(TextHelper.GetString("Error.NoSuchVariable"), par0));
         }
 
         public Context createContext(java.lang.Object par0)
@@ -73,7 +73,7 @@ public java.lang.Object lookup(java.lang.Object par0)
                     {
                         if (v.getName().Equals(par0)) return (java.lang.Object)v;
                     }
-                    throw new NoSuchVariableException(par0);
+                    throw new NoSuchVariableException(String.Format(TextHelper.GetString("Error.NoSuchVariable"), par0));
                 }
 
                 if ((java.lang.String)par0 == "this")
@@ -105,7 +105,7 @@ public java.lang.Object lookup(java.lang.Object par0)
                     return (java.lang.Object)session.getGlobal(new java.lang.String(fullClassName));
                 }
             }
-            throw new NoSuchVariableException(par0);
+            throw new NoSuchVariableException(String.Format(TextHelper.GetString("Error.NoSuchVariable"), par0));
             //Value_.UNDEFINED;
         }
 
diff --git a/External/Plugins/FlashDebugger/FlashDebugger.csproj b/External/Plugins/FlashDebugger/FlashDebugger.csproj
@@ -99,6 +99,7 @@
   <ItemGroup>
     <Compile Include="Controls\DataTree\ContinuedDataNode.cs" />
     <Compile Include="Controls\DataTree\DataNode.cs" />
+    <Compile Include="Controls\DataTree\ErrorNode.cs" />
     <Compile Include="Controls\DataTree\ScalarNode.cs" />
     <Compile Include="Controls\DataTree\ValueNode.cs" />
     <Compile Include="Controls\DataTree\VariableNode.cs" />
diff --git a/PluginCore/PluginCore/Resources/de_DE.resX b/PluginCore/PluginCore/Resources/de_DE.resX
@@ -3543,6 +3543,10 @@ Bitte bedenken Sie, dass Sie viele Projektoptionen nicht mehr nutzen können, so
     <value>Variable could not be reevaluated</value>
     <comment>Added after 4.7.0</comment>
   </data>
+  <data name="FlashDebugger.Error.NoSuchVariable" xml:space="preserve">
+    <value>{0} could not be resolved</value>
+    <comment>Added after 4.7.1</comment>
+  </data>
   <data name="FlashDebugger.Error.NoScalar" xml:space="preserve">
     <value>Only scalar variables can be modified</value>
     <comment>Added after 4.7.0</comment>
diff --git a/PluginCore/PluginCore/Resources/en_US.resX b/PluginCore/PluginCore/Resources/en_US.resX
@@ -3548,6 +3548,10 @@ Please note that with injection enabled, you will not be able to use many projec
     <value>Variable could not be reevaluated</value>
     <comment>Added after 4.7.0</comment>
   </data>
+  <data name="FlashDebugger.Error.NoSuchVariable" xml:space="preserve">
+    <value>{0} could not be resolved</value>
+    <comment>Added after 4.7.1</comment>
+  </data>
   <data name="FlashDebugger.Error.NoScalar" xml:space="preserve">
     <value>Only scalar variables can be modified</value>
     <comment>Added after 4.7.0</comment>
diff --git a/PluginCore/PluginCore/Resources/eu_ES.resX b/PluginCore/PluginCore/Resources/eu_ES.resX
@@ -3535,6 +3535,10 @@ Kontutan izan injekzioa gaituz gero, ezin izanen diren proiektuaren hainbat auke
     <value>Variable could not be reevaluated</value>
     <comment>Added after 4.7.0</comment>
   </data>
+  <data name="FlashDebugger.Error.NoSuchVariable" xml:space="preserve">
+    <value>{0} could not be resolved</value>
+    <comment>Added after 4.7.1</comment>
+  </data>
   <data name="FlashDebugger.Error.NoScalar" xml:space="preserve">
     <value>Only scalar variables can be modified</value>
     <comment>Added after 4.7.0</comment>
diff --git a/PluginCore/PluginCore/Resources/ja_JP.resX b/PluginCore/PluginCore/Resources/ja_JP.resX
@@ -3548,6 +3548,10 @@ AfterSimilarAccessorMethod: 同様のアクセサメソッドの後に配置。"
     <value>Variable could not be reevaluated</value>
     <comment>Added after 4.7.0</comment>
   </data>
+  <data name="FlashDebugger.Error.NoSuchVariable" xml:space="preserve">
+    <value>{0} could not be resolved</value>
+    <comment>Added after 4.7.1</comment>
+  </data>
   <data name="FlashDebugger.Error.NoScalar" xml:space="preserve">
     <value>Only scalar variables can be modified</value>
     <comment>Added after 4.7.0</comment>
diff --git a/PluginCore/PluginCore/Resources/zh_CN.resx b/PluginCore/PluginCore/Resources/zh_CN.resx
@@ -3543,6 +3543,10 @@
     <value>Variable could not be reevaluated</value>
     <comment>Added after 4.7.0</comment>
   </data>
+  <data name="FlashDebugger.Error.NoSuchVariable" xml:space="preserve">
+    <value>{0} could not be resolved</value>
+    <comment>Added after 4.7.1</comment>
+  </data>
   <data name="FlashDebugger.Error.NoScalar" xml:space="preserve">
     <value>Only scalar variables can be modified</value>
     <comment>Added after 4.7.0</comment>

Original file line number	Diff line number	Diff line change
`@@ -15,18 +15,15 @@ public override string Value`
`15`	`15`	`set { throw new NotSupportedException(); }`
`16`	`16`	`}`
`17`	`17`
`18`		`- public ScalarNode(string text, string value)`
`19`		`- : base(text)`
	`18`	`+ public override bool IsLeaf`
`20`	`19`	`{`
`21`		`- m_Value = value;`
	`20`	`+ get { return true; }`
`22`	`21`	`}`
`23`	`22`
`24`		`- public override bool IsLeaf`
	`23`	`+ public ScalarNode(string text, string value)`
	`24`	`+ : base(text)`
`25`	`25`	`{`
`26`		`- get`
`27`		`- {`
`28`		`- return true;`
`29`		`- }`
	`26`	`+ m_Value = value;`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,10 @@ void NameNodeTextBox_DrawText(object sender, DrawEventArgs e)`
`114`	`114`	`try`
`115`	`115`	`{`
`116`	`116`	`if (e.Node.NextNode == null && e.Node.Level == 1 && !addingNewExpression)`
`117`		`- {`
`118`	`117`	`e.Font = new Font(e.Font, FontStyle.Italic);`
`119`		`- }`
	`118`	`+ else if (e.Node.Tag is ErrorNode)`
	`119`	`+ e.TextColor = e.Node.IsSelected ? Color.White : Color.Gray;`
	`120`	`+`
`120`	`121`	`}`
`121`	`122`	`catch (Exception) { }`
`122`	`123`	`}`
`@@ -248,12 +249,15 @@ void ValueNodeTextBox_DrawText(object sender, DrawEventArgs e)`
`248`	`249`	`{`
`249`	`250`	`try`
`250`	`251`	`{`
`251`		`- VariableNode node = e.Node.Tag as VariableNode;`
`252`		`- FlashInterface flashInterface = PluginMain.debugManager.FlashInterface;`
`253`		`- if (node != null && node.Variable != null && node.Variable.hasValueChanged(flashInterface.Session))`
	`252`	`+ VariableNode variableNode = e.Node.Tag as VariableNode;`
	`253`	`+ if (variableNode != null)`
`254`	`254`	`{`
`255`		`- e.TextColor = Color.Red;`
	`255`	`+ FlashInterface flashInterface = PluginMain.debugManager.FlashInterface;`
	`256`	`+ if (variableNode.Variable != null && variableNode.Variable.hasValueChanged(flashInterface.Session))`
	`257`	`+ e.TextColor = Color.Red;`
`256`	`258`	`}`
	`259`	`+ else if (e.Node.Tag is ErrorNode)`
	`260`	`+ e.TextColor = e.Node.IsSelected ? Color.White : Color.Gray;`
`257`	`261`	`}`
`258`	`262`	`catch (NullReferenceException) { }`
`259`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private Node FindNode(Node root, string path, StringBuilder nodePath)`
`33`	`33`	`int initialLength = nodePath.Length;`
`34`	`34`	`foreach (Node node in root.Nodes)`
`35`	`35`	`{`
`36`		`- nodePath = nodePath.Append(node.Text);`
	`36`	`+ nodePath.Append(node.Text);`
`37`	`37`	`if (path == nodePath.ToString()) return node;`
`38`	`38`	`nodePath.Append(".");`
`39`	`39`	`if (path.StartsWith(nodePath.ToString()))`
Original file line number	Diff line number	Diff line change
`@@ -102,9 +102,9 @@ public void UpdateElements()`
`102`	`102`	`node = new ScalarNode(item, obj.toString());`
`103`	`103`	`node.Tag = item;`
`104`	`104`	`}`
`105`		`- catch`
	`105`	`+ catch (Exception ex)`
`106`	`106`	`{`
`107`		`- node = new ValueNode(item);`
	`107`	`+ node = new ErrorNode(item, ex);`
`108`	`108`	`}`
`109`	`109`	`node.Text = item;`
`110`	`110`	`treeControl.AddNode(node);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void assign(java.lang.Object par0, Value par1)`
`40`	`40`	`throw new NotSupportedException(TextHelper.GetString("Error.NoScalar"));`
`41`	`41`	`}`
`42`	`42`	`else`
`43`		`- throw new NoSuchVariableException(par0);`
	`43`	`+ throw new NoSuchVariableException(String.Format(TextHelper.GetString("Error.NoSuchVariable"), par0));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public Context createContext(java.lang.Object par0)`
`@@ -73,7 +73,7 @@ public java.lang.Object lookup(java.lang.Object par0)`
`73`	`73`	`{`
`74`	`74`	`if (v.getName().Equals(par0)) return (java.lang.Object)v;`
`75`	`75`	`}`
`76`		`- throw new NoSuchVariableException(par0);`
	`76`	`+ throw new NoSuchVariableException(String.Format(TextHelper.GetString("Error.NoSuchVariable"), par0));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`if ((java.lang.String)par0 == "this")`
`@@ -105,7 +105,7 @@ public java.lang.Object lookup(java.lang.Object par0)`
`105`	`105`	`return (java.lang.Object)session.getGlobal(new java.lang.String(fullClassName));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`- throw new NoSuchVariableException(par0);`
	`108`	`+ throw new NoSuchVariableException(String.Format(TextHelper.GetString("Error.NoSuchVariable"), par0));`
`109`	`109`	`//Value_.UNDEFINED;`
`110`	`110`	`}`
`111`	`111`