Debugger UI Updates (#39)
This commit is contained in:
@@ -10,9 +10,11 @@ namespace SharpIDE.Godot.Features.Debug_.Tab.SubTabs;
|
||||
public partial class ThreadsVariablesSubTab : Control
|
||||
{
|
||||
private PackedScene _threadListItemScene = GD.Load<PackedScene>("res://Features/Debug_/Tab/SubTabs/ThreadListItem.tscn");
|
||||
private VBoxContainer _threadsVboxContainer = null!;
|
||||
private VBoxContainer _stackFramesVboxContainer = null!;
|
||||
private VBoxContainer _variablesVboxContainer = null!;
|
||||
|
||||
private Tree _threadsTree = null!;
|
||||
private Tree _stackFramesTree = null!;
|
||||
private Tree _variablesTree = null!;
|
||||
|
||||
public SharpIdeProjectModel Project { get; set; } = null!;
|
||||
// private ThreadModel? _selectedThread = null!; // null when not at a stop point
|
||||
|
||||
@@ -20,63 +22,77 @@ public partial class ThreadsVariablesSubTab : Control
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
_threadsVboxContainer = GetNode<VBoxContainer>("%ThreadsVBoxContainer");
|
||||
_stackFramesVboxContainer = GetNode<VBoxContainer>("%StackFramesVBoxContainer");
|
||||
_variablesVboxContainer = GetNode<VBoxContainer>("%VariablesVBoxContainer");
|
||||
GlobalEvents.Instance.DebuggerExecutionStopped.Subscribe(OnDebuggerExecutionStopped);
|
||||
|
||||
_threadsTree = GetNode<Tree>("%ThreadsTree");
|
||||
_stackFramesTree = GetNode<Tree>("%StackFramesTree");
|
||||
_variablesTree = GetNode<Tree>("%VariablesTree");
|
||||
GlobalEvents.Instance.DebuggerExecutionStopped.Subscribe(OnDebuggerExecutionStopped2);
|
||||
_threadsTree.ItemSelected += OnThreadSelected;
|
||||
_stackFramesTree.ItemSelected += OnStackFrameSelected;
|
||||
}
|
||||
|
||||
private async void OnThreadSelected()
|
||||
{
|
||||
var selectedItem = _threadsTree.GetSelected();
|
||||
Guard.Against.Null(selectedItem);
|
||||
var threadId = selectedItem.GetMetadata(0).AsInt32();
|
||||
var stackFrames = await _runService.GetStackFrames(threadId);
|
||||
await this.InvokeAsync(() =>
|
||||
{
|
||||
_variablesTree.Clear(); // If we select a thread that does not have stack frames, the variables would not be cleared otherwise
|
||||
_stackFramesTree.Clear();
|
||||
var root = _stackFramesTree.CreateItem();
|
||||
foreach (var (index, s) in stackFrames.Index())
|
||||
{
|
||||
var stackFrameItem = _stackFramesTree.CreateItem(root);
|
||||
if (s.IsExternalCode)
|
||||
{
|
||||
stackFrameItem.SetText(0, "[External Code]");
|
||||
}
|
||||
else
|
||||
{
|
||||
// for now, just use the raw name
|
||||
stackFrameItem.SetText(0, s.Name);
|
||||
//var managedFrameInfo = s.ManagedInfo!.Value;
|
||||
//stackFrameItem.SetText(0, $"{managedFrameInfo.ClassName}.{managedFrameInfo.MethodName}() in {managedFrameInfo.Namespace}, {managedFrameInfo.AssemblyName}");
|
||||
}
|
||||
stackFrameItem.SetMetadata(0, s.Id);
|
||||
if (index is 0) _stackFramesTree.SetSelected(stackFrameItem, 0);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private async void OnStackFrameSelected()
|
||||
{
|
||||
var selectedItem = _stackFramesTree.GetSelected();
|
||||
Guard.Against.Null(selectedItem);
|
||||
var frameId = selectedItem.GetMetadata(0).AsInt32();
|
||||
var variables = await _runService.GetVariablesForStackFrame(frameId);
|
||||
await this.InvokeAsync(() =>
|
||||
{
|
||||
_variablesTree.Clear();
|
||||
var root = _variablesTree.CreateItem();
|
||||
foreach (var variable in variables)
|
||||
{
|
||||
var variableItem = _variablesTree.CreateItem(root);
|
||||
variableItem.SetText(0, $$"""{{variable.Name}} = {{{variable.Type}}} {{variable.Value}}""");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private async Task OnDebuggerExecutionStopped(ExecutionStopInfo stopInfo)
|
||||
{
|
||||
var result = await _runService.GetInfoAtStopPoint();
|
||||
var threadScenes = result.Threads.Select(s =>
|
||||
{
|
||||
var threadListItem = _threadListItemScene.Instantiate<Control>();
|
||||
threadListItem.GetNode<Label>("Label").Text = $"{s.Id}: {s.Name}";
|
||||
return threadListItem;
|
||||
}).ToList();
|
||||
await this.InvokeAsync(() =>
|
||||
{
|
||||
_threadsVboxContainer.QueueFreeChildren();
|
||||
foreach (var scene in threadScenes)
|
||||
{
|
||||
_threadsVboxContainer.AddChild(scene);
|
||||
}
|
||||
});
|
||||
|
||||
var stoppedThreadId = stopInfo.ThreadId;
|
||||
var stoppedThread = result.Threads.SingleOrDefault(t => t.Id == stoppedThreadId);
|
||||
Guard.Against.Null(stoppedThread, nameof(stoppedThread));
|
||||
var stackFrameScenes = stoppedThread!.StackFrames.Select(s =>
|
||||
{
|
||||
var stackFrameItem = _threadListItemScene.Instantiate<Control>();
|
||||
stackFrameItem.GetNode<Label>("Label").Text = $"{s.ClassName}.{s.MethodName}() in {s.Namespace}, {s.AssemblyName}";
|
||||
return stackFrameItem;
|
||||
}).ToList();
|
||||
private async Task OnDebuggerExecutionStopped2(ExecutionStopInfo stopInfo)
|
||||
{
|
||||
var threads = await _runService.GetThreadsAtStopPoint();
|
||||
await this.InvokeAsync(() =>
|
||||
{
|
||||
_stackFramesVboxContainer.QueueFreeChildren();
|
||||
foreach (var scene in stackFrameScenes)
|
||||
_threadsTree.Clear();
|
||||
var root = _threadsTree.CreateItem();
|
||||
foreach (var thread in threads)
|
||||
{
|
||||
_stackFramesVboxContainer.AddChild(scene);
|
||||
}
|
||||
});
|
||||
|
||||
var currentFrame = stoppedThread.StackFrames.First();
|
||||
var variableScenes = currentFrame.Scopes.SelectMany(s => s.Variables).Select(v =>
|
||||
{
|
||||
var variableListItem = _threadListItemScene.Instantiate<Control>();
|
||||
variableListItem.GetNode<Label>("Label").Text = $$"""{{v.Name}} = {{{v.Type}}} {{v.Value}}""";
|
||||
return variableListItem;
|
||||
}).ToList();
|
||||
|
||||
await this.InvokeAsync(() =>
|
||||
{
|
||||
_variablesVboxContainer.QueueFreeChildren();
|
||||
foreach (var scene in variableScenes)
|
||||
{
|
||||
_variablesVboxContainer.AddChild(scene);
|
||||
var threadItem = _threadsTree.CreateItem(root);
|
||||
threadItem.SetText(0, $"@{thread.Id}: {thread.Name}");
|
||||
threadItem.SetMetadata(0, thread.Id);
|
||||
if (thread.Id == stopInfo.ThreadId) _threadsTree.SetSelected(threadItem, 0);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user