ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disable Utils.Show... from attempting to display Spans (#1467)

Browse source
This commit is contained in:
srkizer 2023-10-10 00:37:16 +09:00 • committed by GitHub
parent c8906c674f
commit df2474bc87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Utility/Util.cs
View file

@ -29,6 +29,7 @@ namespace Dalamud.Utility;
/// </summary>
public static class Util
{
private static readonly Type GenericSpanType = typeof(Span<>);
private static string? gitHashInternal;
private static int? gitCommitCountInternal;
private static string? gitHashClientStructsInternal;
@ -296,7 +297,10 @@ public static class Util
ImGui.TextColored(new Vector4(0.2f, 0.9f, 0.4f, 1), $"{f.Name}: ");
ImGui.SameLine();
ShowValue(addr, new List<string>(path) {f.Name}, f.FieldType, f.GetValue(obj));
if (f.FieldType.IsGenericType && f.FieldType.GetGenericTypeDefinition() == GenericSpanType)
ImGui.Text("Span preview is currently not supported.");
else
ShowValue(addr, new List<string>(path) {f.Name}, f.FieldType, f.GetValue(obj));
}
foreach (var p in obj.GetType().GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
@ -306,7 +310,10 @@ public static class Util
ImGui.TextColored(new Vector4(0.2f, 0.6f, 0.4f, 1), $"{p.Name}: ");
ImGui.SameLine();
ShowValue(addr, new List<string>(path) {p.Name}, p.PropertyType, p.GetValue(obj));
if (p.PropertyType.IsGenericType && p.PropertyType.GetGenericTypeDefinition() == GenericSpanType)
ImGui.Text("Span preview is currently not supported.");
else
ShowValue(addr, new List<string>(path) {p.Name}, p.PropertyType, p.GetValue(obj));
}
ImGui.TreePop();
@ -369,6 +376,13 @@ public static class Util
foreach (var propertyInfo in type.GetProperties().Where(p => p.GetGetMethod()?.GetParameters().Length == 0))
{
if (propertyInfo.PropertyType.IsGenericType &&
propertyInfo.PropertyType.GetGenericTypeDefinition() == GenericSpanType)
{
ImGui.TextColored(ImGuiColors.DalamudOrange, $" {propertyInfo.Name}: Span preview is currently not supported.");
continue;
}
var value = propertyInfo.GetValue(obj);
var valueType = value?.GetType();
if (valueType == typeof(IntPtr))