Show InputField for exceptions to view/copy full exception

sinai-dev · sinai-dev · commit bacac929e922 · 2022-04-01T18:14:50.000+11:00
diff --git a/src/CacheObject/CacheConstructor.cs b/src/CacheObject/CacheConstructor.cs
@@ -72,13 +72,11 @@ protected override object TryEvaluate()
                 else
                     ret = Activator.CreateInstance(returnType, ArgumentUtility.EmptyArgs);
 
-                HadException = false;
                 LastException = null;
                 return ret;
             }
             catch (Exception ex)
             {
-                HadException = true;
                 LastException = ex;
                 return null;
             }
diff --git a/src/CacheObject/CacheField.cs b/src/CacheObject/CacheField.cs
@@ -32,13 +32,11 @@ protected override object TryEvaluate()
             try
             {
                 var ret = FieldInfo.GetValue(DeclaringInstance);
-                HadException = false;
                 LastException = null;
                 return ret;
             }
             catch (Exception ex)
             {
-                HadException = true;
                 LastException = ex;
                 return null;
             }
diff --git a/src/CacheObject/CacheMethod.cs b/src/CacheObject/CacheMethod.cs
@@ -45,13 +45,11 @@ protected override object TryEvaluate()
                     ret = methodInfo.Invoke(DeclaringInstance, Evaluator.TryParseArguments());
                 else 
                     ret = methodInfo.Invoke(DeclaringInstance, ArgumentUtility.EmptyArgs);
-                HadException = false;
                 LastException = null;
                 return ret;
             }
             catch (Exception ex)
             {
-                HadException = true;
                 LastException = ex;
                 return null;
             }
diff --git a/src/CacheObject/CacheObjectBase.cs b/src/CacheObject/CacheObjectBase.cs
@@ -57,7 +57,6 @@ public abstract class CacheObjectBase
         public abstract bool ShouldAutoEvaluate { get; }
         public abstract bool HasArguments { get; }
         public abstract bool CanWrite { get; }
-        public bool HadException { get; protected set; }
         public Exception LastException { get; protected set; }
 
         public virtual void SetFallbackType(Type fallbackType)
@@ -106,8 +105,8 @@ public void SetUserValue(object value)
             if (CellView != null)
                 SetDataToCell(CellView);
 
-            // If the owner's parent CacheObject is set, we are setting the value of an inspected struct.
-            // Set the inspector target as the value back to that parent cacheobject.
+            // If the owner's ParentCacheObject is set, we are setting the value of an inspected struct.
+            // Set the inspector target as the value back to that parent.
             if (Owner.ParentCacheObject != null)
                 Owner.ParentCacheObject.SetUserValue(Owner.Target);
         }
@@ -137,7 +136,7 @@ protected virtual void ProcessOnEvaluate()
         {
             var prevState = State;
 
-            if (HadException)
+            if (LastException != null)
             {
                 LastValueWasNull = true;
                 LastValueType = FallbackType;
@@ -158,7 +157,7 @@ protected virtual void ProcessOnEvaluate()
             {
                 // If we changed states (always needs IValue change)
                 // or if the value is null, and the fallback type isnt string (we always want to edit strings).
-                if (State != prevState || (State != ValueState.String && Value.IsNullOrDestroyed()))
+                if (State != prevState || (State != ValueState.String && State != ValueState.Exception && Value.IsNullOrDestroyed()))
                 {
                     // need to return IValue
                     ReleaseIValue();
@@ -206,7 +205,7 @@ protected string GetValueLabel()
                     return $"<i>{NOT_YET_EVAL} ({SignatureHighlighter.Parse(FallbackType, true)})</i>";
 
                 case ValueState.Exception:
-                    return $"<i><color=red>{LastException.ReflectionExToString()}</color></i>";
+                    return $"<i><color=#eb4034>{LastException.ReflectionExToString()}</color></i>";
 
                 // bool and number dont want the label for the value at all
                 case ValueState.Boolean:
@@ -291,36 +290,36 @@ public virtual void SetDataToCell(CacheObjectCell cell)
             switch (State)
             {
                 case ValueState.Exception:
-                    SetValueState(cell, ValueStateArgs.Default);
+                    SetValueState(cell, new(true, subContentButtonActive: true));
                     break;
                 case ValueState.Boolean:
-                    SetValueState(cell, new ValueStateArgs(false, toggleActive: true, applyActive: CanWrite));
+                    SetValueState(cell, new(false, toggleActive: true, applyActive: CanWrite));
                     break;
                 case ValueState.Number:
-                    SetValueState(cell, new ValueStateArgs(false, typeLabelActive: true, inputActive: true, applyActive: CanWrite));
+                    SetValueState(cell, new(false, typeLabelActive: true, inputActive: true, applyActive: CanWrite));
                     break;
                 case ValueState.String:
                     if (LastValueWasNull)
-                        SetValueState(cell, new ValueStateArgs(true, subContentButtonActive: true));
+                        SetValueState(cell, new(true, subContentButtonActive: true));
                     else
-                        SetValueState(cell, new ValueStateArgs(true, false, SignatureHighlighter.StringOrange, subContentButtonActive: true));
+                        SetValueState(cell, new(true, false, SignatureHighlighter.StringOrange, subContentButtonActive: true));
                     break;
                 case ValueState.Enum:
-                    SetValueState(cell, new ValueStateArgs(true, subContentButtonActive: CanWrite));
+                    SetValueState(cell, new(true, subContentButtonActive: CanWrite));
                     break;
                 case ValueState.Color:
                 case ValueState.ValueStruct:
                     if (ParseUtility.CanParse(LastValueType))
-                        SetValueState(cell, new ValueStateArgs(false, false, null, true, false, true, CanWrite, true, true));
+                        SetValueState(cell, new(false, false, null, true, false, true, CanWrite, true, true));
                     else
-                        SetValueState(cell, new ValueStateArgs(true, inspectActive: true, subContentButtonActive: true));
+                        SetValueState(cell, new(true, inspectActive: true, subContentButtonActive: true));
                     break;
                 case ValueState.Collection:
                 case ValueState.Dictionary:
-                    SetValueState(cell, new ValueStateArgs(true, inspectActive: !LastValueWasNull, subContentButtonActive: !LastValueWasNull));
+                    SetValueState(cell, new(true, inspectActive: !LastValueWasNull, subContentButtonActive: !LastValueWasNull));
                     break;
                 case ValueState.Unsupported:
-                    SetValueState(cell, new ValueStateArgs(true, inspectActive: !LastValueWasNull));
+                    SetValueState(cell, new (true, inspectActive: !LastValueWasNull));
                     break;
             }
 
@@ -368,8 +367,10 @@ protected virtual void SetValueState(CacheObjectCell cell, ValueStateArgs args)
             if (cell.InspectButton != null)
                 cell.InspectButton.Component.gameObject.SetActive(args.inspectActive && !LastValueWasNull);
 
-            // allow IValue for null strings though
-            cell.SubContentButton.Component.gameObject.SetActive(args.subContentButtonActive && (!LastValueWasNull || State == ValueState.String));
+            // set subcontent button if needed, and for null strings and exceptions
+            cell.SubContentButton.Component.gameObject.SetActive(
+                args.subContentButtonActive 
+                && (!LastValueWasNull || State == ValueState.String || State == ValueState.Exception));
         }
 
         // CacheObjectCell Apply
@@ -401,7 +402,7 @@ public virtual void OnCellSubContentToggle()
         {
             if (this.IValue == null)
             {
-                var ivalueType = InteractiveValue.GetIValueTypeForState(State);
+                Type ivalueType = InteractiveValue.GetIValueTypeForState(State);
 
                 if (ivalueType == null)
                     return;
@@ -455,6 +456,7 @@ internal static GameObject InactiveIValueHolder
                 {
                     inactiveIValueHolder = new GameObject("Temp_IValue_Holder");
                     GameObject.DontDestroyOnLoad(inactiveIValueHolder);
+                    inactiveIValueHolder.hideFlags = HideFlags.HideAndDontSave;
                     inactiveIValueHolder.transform.parent = UniversalUI.PoolHolder.transform;
                     inactiveIValueHolder.SetActive(false);
                 }
@@ -467,9 +469,20 @@ internal static GameObject InactiveIValueHolder
 
         public struct ValueStateArgs
         {
-            public ValueStateArgs(bool valueActive = true, bool valueRichText = true, Color? valueColor = null,
-                bool typeLabelActive = false, bool toggleActive = false, bool inputActive = false, bool applyActive = false,
-                bool inspectActive = false, bool subContentButtonActive = false)
+            public static ValueStateArgs Default { get; } = new(true);
+
+            public Color valueColor;
+            public bool valueActive, valueRichText, typeLabelActive, toggleActive, inputActive, applyActive, inspectActive, subContentButtonActive;
+
+            public ValueStateArgs(bool valueActive = true, 
+                bool valueRichText = true, 
+                Color? valueColor = null,
+                bool typeLabelActive = false, 
+                bool toggleActive = false, 
+                bool inputActive = false, 
+                bool applyActive = false,
+                bool inspectActive = false,
+                bool subContentButtonActive = false)
             {
                 this.valueActive = valueActive;
                 this.valueRichText = valueRichText;
@@ -481,14 +494,6 @@ public ValueStateArgs(bool valueActive = true, bool valueRichText = true, Color?
                 this.inspectActive = inspectActive;
                 this.subContentButtonActive = subContentButtonActive;
             }
-
-            public static ValueStateArgs Default => _default;
-            private static ValueStateArgs _default = new ValueStateArgs(true);
-
-            public bool valueActive, valueRichText, typeLabelActive, toggleActive,
-                inputActive, applyActive, inspectActive, subContentButtonActive;
-
-            public Color valueColor;
         }
     }
 }
diff --git a/src/CacheObject/CacheProperty.cs b/src/CacheObject/CacheProperty.cs
@@ -40,13 +40,11 @@ protected override object TryEvaluate()
                     ret = PropertyInfo.GetValue(DeclaringInstance, this.Evaluator.TryParseArguments());
                 else
                     ret = PropertyInfo.GetValue(DeclaringInstance, null);
-                HadException = false;
                 LastException = null;
                 return ret;
             }
             catch (Exception ex)
             {
-                HadException = true;
                 LastException = ex;
                 return null;
             }
diff --git a/src/CacheObject/IValues/InteractiveString.cs b/src/CacheObject/IValues/InteractiveString.cs
@@ -31,8 +31,9 @@ public override void OnBorrowed(CacheObjectBase owner)
         {
             base.OnBorrowed(owner);
 
-            inputField.Component.readOnly = !owner.CanWrite;
-            ApplyButton.Component.gameObject.SetActive(owner.CanWrite);
+            bool canWrite = owner.CanWrite && owner.State != ValueState.Exception;
+            inputField.Component.readOnly = !canWrite;
+            ApplyButton.Component.gameObject.SetActive(canWrite);
 
             SaveFilePath.Text = Path.Combine(ConfigManager.Default_Output_Path.Value, "untitled.txt");
         }
@@ -47,6 +48,9 @@ private bool IsStringTooLong(string s)
 
         public override void SetValue(object value)
         {
+            if (CurrentOwner.State == ValueState.Exception)
+                value = CurrentOwner.LastException.ToString();
+
             RealValue = value as string;
             SaveFileRow.SetActive(IsStringTooLong(RealValue));
 
diff --git a/src/CacheObject/IValues/InteractiveValue.cs b/src/CacheObject/IValues/InteractiveValue.cs
@@ -16,51 +16,45 @@ public abstract class InteractiveValue : IPooledObject
     {
         public static Type GetIValueTypeForState(ValueState state)
         {
-            switch (state)
+            return state switch
             {
-                case ValueState.String:
-                    return typeof(InteractiveString);
-                case ValueState.Enum:
-                    return typeof(InteractiveEnum);
-                case ValueState.Collection:
-                    return typeof(InteractiveList);
-                case ValueState.Dictionary:
-                    return typeof(InteractiveDictionary);
-                case ValueState.ValueStruct:
-                    return typeof(InteractiveValueStruct);
-                case ValueState.Color:
-                    return typeof(InteractiveColor);
-                default: return null;
-            }
+                ValueState.Exception or ValueState.String => typeof(InteractiveString),
+                ValueState.Enum => typeof(InteractiveEnum),
+                ValueState.Collection => typeof(InteractiveList),
+                ValueState.Dictionary => typeof(InteractiveDictionary),
+                ValueState.ValueStruct => typeof(InteractiveValueStruct),
+                ValueState.Color => typeof(InteractiveColor),
+                _ => null,
+            };
         }
 
         public GameObject UIRoot { get; set; }
         public float DefaultHeight => -1f;
 
         public virtual bool CanWrite => this.CurrentOwner.CanWrite;
 
-        public CacheObjectBase CurrentOwner => m_owner;
-        private CacheObjectBase m_owner;
+        public CacheObjectBase CurrentOwner => owner;
+        private CacheObjectBase owner;
 
         public bool PendingValueWanted;
 
         public virtual void OnBorrowed(CacheObjectBase owner)
         {
-            if (this.m_owner != null)
+            if (this.owner != null)
             {
                 ExplorerCore.LogWarning("Setting an IValue's owner but there is already one set. Maybe it wasn't cleaned up?");
                 ReleaseFromOwner();
             }
 
-            this.m_owner = owner;
+            this.owner = owner;
         }
 
         public virtual void ReleaseFromOwner()
         {
-            if (this.m_owner == null)
+            if (this.owner == null)
                 return;
 
-            this.m_owner = null;
+            this.owner = null;
         }
 
         public abstract void SetValue(object value);
diff --git a/src/Tests/TestClass.cs b/src/Tests/TestClass.cs
@@ -28,6 +28,8 @@ static TestClass()
 
         public static object LiterallyAnything = null;
 
+        public static string Exception => throw new Exception("This is a test.");
+
         // Test enumerables
         public static int[,,] MultiDimensionalArray = new int[45, 45, 45];
         public static List<object> ListOfInts;

Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,11 @@ protected override object TryEvaluate()`
`72`	`72`	`else`
`73`	`73`	`ret = Activator.CreateInstance(returnType, ArgumentUtility.EmptyArgs);`
`74`	`74`
`75`		`- HadException = false;`
`76`	`75`	`LastException = null;`
`77`	`76`	`return ret;`
`78`	`77`	`}`
`79`	`78`	`catch (Exception ex)`
`80`	`79`	`{`
`81`		`- HadException = true;`
`82`	`80`	`LastException = ex;`
`83`	`81`	`return null;`
`84`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,11 @@ protected override object TryEvaluate()`
`32`	`32`	`try`
`33`	`33`	`{`
`34`	`34`	`var ret = FieldInfo.GetValue(DeclaringInstance);`
`35`		`- HadException = false;`
`36`	`35`	`LastException = null;`
`37`	`36`	`return ret;`
`38`	`37`	`}`
`39`	`38`	`catch (Exception ex)`
`40`	`39`	`{`
`41`		`- HadException = true;`
`42`	`40`	`LastException = ex;`
`43`	`41`	`return null;`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,11 @@ protected override object TryEvaluate()`
`45`	`45`	`ret = methodInfo.Invoke(DeclaringInstance, Evaluator.TryParseArguments());`
`46`	`46`	`else`
`47`	`47`	`ret = methodInfo.Invoke(DeclaringInstance, ArgumentUtility.EmptyArgs);`
`48`		`- HadException = false;`
`49`	`48`	`LastException = null;`
`50`	`49`	`return ret;`
`51`	`50`	`}`
`52`	`51`	`catch (Exception ex)`
`53`	`52`	`{`
`54`		`- HadException = true;`
`55`	`53`	`LastException = ex;`
`56`	`54`	`return null;`
`57`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,11 @@ protected override object TryEvaluate()`
`40`	`40`	`ret = PropertyInfo.GetValue(DeclaringInstance, this.Evaluator.TryParseArguments());`
`41`	`41`	`else`
`42`	`42`	`ret = PropertyInfo.GetValue(DeclaringInstance, null);`
`43`		`- HadException = false;`
`44`	`43`	`LastException = null;`
`45`	`44`	`return ret;`
`46`	`45`	`}`
`47`	`46`	`catch (Exception ex)`
`48`	`47`	`{`
`49`		`- HadException = true;`
`50`	`48`	`LastException = ex;`
`51`	`49`	`return null;`
`52`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,9 @@ public override void OnBorrowed(CacheObjectBase owner)`
`31`	`31`	`{`
`32`	`32`	`base.OnBorrowed(owner);`
`33`	`33`
`34`		`- inputField.Component.readOnly = !owner.CanWrite;`
`35`		`- ApplyButton.Component.gameObject.SetActive(owner.CanWrite);`
	`34`	`+ bool canWrite = owner.CanWrite && owner.State != ValueState.Exception;`
	`35`	`+ inputField.Component.readOnly = !canWrite;`
	`36`	`+ ApplyButton.Component.gameObject.SetActive(canWrite);`
`36`	`37`
`37`	`38`	`SaveFilePath.Text = Path.Combine(ConfigManager.Default_Output_Path.Value, "untitled.txt");`
`38`	`39`	`}`
`@@ -47,6 +48,9 @@ private bool IsStringTooLong(string s)`
`47`	`48`
`48`	`49`	`public override void SetValue(object value)`
`49`	`50`	`{`
	`51`	`+ if (CurrentOwner.State == ValueState.Exception)`
	`52`	`+ value = CurrentOwner.LastException.ToString();`
	`53`	`+`
`50`	`54`	`RealValue = value as string;`
`51`	`55`	`SaveFileRow.SetActive(IsStringTooLong(RealValue));`
`52`	`56`