caleb-brown/unity-atoms
1
0
Fork 0
mirror of https://github.com/unity-atoms/unity-atoms.git synced 2025-01-21 23:58:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Changed the AddStackTrace method to be conditional (from one of your initial suggestions).

Browse Source 
- Removed the implicit conversion operator in StackTraceEntry and is instead using ToString explicitly when needed.
- Improved implementation of GetFirstLine
- Simplified Equals implementation of the StackTraceEntry class
This commit is contained in:
AdamRamberg 2020-05-21 17:40:57 +02:00
parent 09493101fa
commit 2ca682f9b6
6 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/Core/Editor/Editors/StackTraceEditor.cs
View File

@ -107,8 +107,7 @@ namespace UnityAtoms.Editor
{
field.isReadOnly = true;
field.multiline = true;
field.value = selectedStackTraceId != -1 ? stackTraces[selectedStackTraceId] : "";
field.value = selectedStackTraceId != -1 ? stackTraces[selectedStackTraceId] : "";
field.value = selectedStackTraceId != -1 ? stackTraces[selectedStackTraceId].ToString() : "";
field.style.borderLeftWidth = 0;
field.style.borderRightWidth = 0;
field.style.borderTopWidth = 0;

6
Packages/Core/Editor/Extensions/StringExtensions.cs
View File

@ -44,6 +44,10 @@ namespace UnityAtoms
return new string(a);
}
public static string GetFirstLine(this string str) => str.Split(new[] { '\r', '\n' }).FirstOrDefault();
public static string GetFirstLine(this string str)
{
var indexFirstNewLineChar = str.IndexOfAny(new char[] { '\r', '\n' });
return indexFirstNewLineChar == -1 ? str : str.Substring(0, indexFirstNewLineChar);
}
}
}

7
Packages/Core/Runtime/Events/AtomEvent.cs
View File

@ -61,13 +61,8 @@ namespace UnityAtoms
/// <param name="item">The value associated with the Event.</param>
public void Raise(T item)
{
#if UNITY_EDITOR
if (AtomPreferences.IsDebugModeEnabled)
{
StackTraces.AddStackTrace(GetInstanceID(), StackTraceEntry.Create(item));
}
#endif
StackTraces.AddStackTrace(GetInstanceID(), StackTraceEntry.Create(item));
base.Raise();
_onEvent?.Invoke(item);
AddToReplayBuffer(item);

7
Packages/Core/Runtime/Events/AtomEventBase.cs
View File

@ -18,12 +18,7 @@ namespace UnityAtoms
public virtual void Raise()
{
#if UNITY_EDITOR
if (AtomPreferences.IsDebugModeEnabled)
{
StackTraces.AddStackTrace(GetInstanceID(), StackTraceEntry.Create());
}
#endif
StackTraces.AddStackTrace(GetInstanceID(), StackTraceEntry.Create());
OnEventNoValue?.Invoke();
}

21
Packages/Core/Runtime/StackTrace/StackTraceEntry.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using UnityEngine;
namespace UnityAtoms
@ -34,24 +35,14 @@ namespace UnityAtoms
}
}
public static StackTraceEntry Create(object obj) => new StackTraceEntry(Environment.StackTrace, obj);
public static StackTraceEntry Create(object obj, int skipFrames = 0) => new StackTraceEntry(new StackTrace(skipFrames).ToString(), obj);
public static StackTraceEntry Create() => new StackTraceEntry(Environment.StackTrace);
public static StackTraceEntry Create(int skipFrames = 0) => new StackTraceEntry(new StackTrace(skipFrames).ToString());
public override bool Equals(object obj)
{
if (obj == null) return false;
public override bool Equals(object obj) => Equals(obj as StackTraceEntry);
if (obj is StackTraceEntry)
{
return Equals(obj as StackTraceEntry);
}
return false;
}
public bool Equals(StackTraceEntry other) => other._id == _id;
public bool Equals(StackTraceEntry other) => other?._id == _id;
public override int GetHashCode() => _id.GetHashCode();
@ -60,7 +51,5 @@ namespace UnityAtoms
_constructedWithValue ?
$"{_frameCount} [{(_value == null ? "null" : _value.ToString())}] {_stackTrace}" :
$"{_frameCount} {_stackTrace}";
public static implicit operator string(StackTraceEntry trace) => trace.ToString();
}
}

10
Packages/Core/Runtime/StackTrace/StackTraces.cs
View File

@ -1,4 +1,5 @@
#if UNITY_EDITOR
using System.Diagnostics;
using System.Collections.ObjectModel;
using System.Collections.Generic;
@ -8,7 +9,14 @@ namespace UnityAtoms
{
private static Dictionary<int, ObservableCollection<StackTraceEntry>> _stackTracesById = new Dictionary<int, ObservableCollection<StackTraceEntry>>();
public static void AddStackTrace(int id, StackTraceEntry stackTrace) => GetStackTraces(id).Insert(0, stackTrace);
[Conditional("UNITY_EDITOR")]
public static void AddStackTrace(int id, StackTraceEntry stackTrace)
{
if (AtomPreferences.IsDebugModeEnabled)
{
GetStackTraces(id).Insert(0, stackTrace);
}
}
public static void ClearStackTraces(int id) => GetStackTraces(id).Clear();