mirror of
https://github.com/goatcorp/Dalamud.git
synced 2025-12-30 20:33:40 +01:00
feat: Reword message overview
- Removes extra lines from stack trace - Use clearer-ish wording for messaging
This commit is contained in:
parent
9e405b26d2
commit
0c9176a8b6
1 changed files with 49 additions and 3 deletions
|
|
@ -1,5 +1,6 @@
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
|
@ -74,6 +75,42 @@ internal class AssertHandler : IDisposable
|
||||||
this.Shutdown();
|
this.Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string? ExtractImguiFunction(StackTrace stackTrace)
|
||||||
|
{
|
||||||
|
var frame = stackTrace.GetFrames()
|
||||||
|
.FirstOrDefault(f => f.GetMethod()?.DeclaringType?.Namespace == "Dalamud.Bindings.ImGui");
|
||||||
|
if (frame == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var method = frame.GetMethod();
|
||||||
|
if (method == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return $"{method.Name}({string.Join(", ", method.GetParameters().Select(p => p.Name))})";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static StackTrace GenerateStackTrace()
|
||||||
|
{
|
||||||
|
var trace = DiagnosticUtil.GetUsefulTrace(new StackTrace(true));
|
||||||
|
var frames = trace.GetFrames().ToList();
|
||||||
|
|
||||||
|
// Remove everything that happens in the assert context.
|
||||||
|
var lastAssertIdx = frames.FindLastIndex(f => f.GetMethod()?.DeclaringType == typeof(AssertHandler));
|
||||||
|
if (lastAssertIdx >= 0)
|
||||||
|
{
|
||||||
|
frames.RemoveRange(0, lastAssertIdx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
var firstInterfaceManagerIdx = frames.FindIndex(f => f.GetMethod()?.DeclaringType == typeof(InterfaceManager));
|
||||||
|
if (firstInterfaceManagerIdx >= 0)
|
||||||
|
{
|
||||||
|
frames.RemoveRange(firstInterfaceManagerIdx, frames.Count - firstInterfaceManagerIdx);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new StackTrace(frames);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private unsafe void OnImGuiAssert(void* pExpr, void* pFile, int line)
|
private unsafe void OnImGuiAssert(void* pExpr, void* pFile, int line)
|
||||||
{
|
{
|
||||||
var expr = Marshal.PtrToStringAnsi(new IntPtr(pExpr));
|
var expr = Marshal.PtrToStringAnsi(new IntPtr(pExpr));
|
||||||
|
|
@ -96,7 +133,7 @@ internal class AssertHandler : IDisposable
|
||||||
if (!this.ShowAsserts && !this.everShownAssertThisSession)
|
if (!this.ShowAsserts && !this.everShownAssertThisSession)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Lazy<StackTrace> stackTrace = new(() => DiagnosticUtil.GetUsefulTrace(new StackTrace(true)));
|
Lazy<StackTrace> stackTrace = new(GenerateStackTrace);
|
||||||
|
|
||||||
if (!this.EnableVerboseLogging)
|
if (!this.EnableVerboseLogging)
|
||||||
{
|
{
|
||||||
|
|
@ -151,6 +188,7 @@ internal class AssertHandler : IDisposable
|
||||||
|
|
||||||
// grab the stack trace now that we've decided to show UI.
|
// grab the stack trace now that we've decided to show UI.
|
||||||
var responsiblePlugin = Service<PluginManager>.GetNullable()?.FindCallingPlugin(stackTrace.Value);
|
var responsiblePlugin = Service<PluginManager>.GetNullable()?.FindCallingPlugin(stackTrace.Value);
|
||||||
|
var responsibleMethodCall = ExtractImguiFunction(stackTrace.Value);
|
||||||
|
|
||||||
var gitHubUrl = GetRepoUrl();
|
var gitHubUrl = GetRepoUrl();
|
||||||
var showOnGitHubButton = new TaskDialogButton
|
var showOnGitHubButton = new TaskDialogButton
|
||||||
|
|
@ -200,8 +238,16 @@ internal class AssertHandler : IDisposable
|
||||||
}
|
}
|
||||||
|
|
||||||
text += $"You may attempt to continue running the game, but Dalamud UI elements may not work " +
|
text += $"You may attempt to continue running the game, but Dalamud UI elements may not work " +
|
||||||
$"correctly, or the game may crash after resuming.\n\n" +
|
$"correctly, or the game may crash after resuming.\n\n";
|
||||||
$"{expr}\nAt: {file}:{line}";
|
|
||||||
|
if (responsibleMethodCall != null)
|
||||||
|
{
|
||||||
|
text += $"Assertion failed: {expr} when performing {responsibleMethodCall}\n{file}:{line}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
text += $"Assertion failed: {expr}\nAt: {file}:{line}";
|
||||||
|
}
|
||||||
|
|
||||||
var page = new TaskDialogPage
|
var page = new TaskDialogPage
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue