github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugger UI Updates (#39)

Browse Source
This commit is contained in:
Matt Parker
2025-12-12 18:30:16 +10:00
committed by GitHub
parent fec6a4f0d5
commit b5fbf0bef8
6 changed files with 182 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.cs
View File

@@ -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);
}
});
}

40
src/SharpIDE.Godot/Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.tscn
View File

@@ -1,7 +1,9 @@
[gd_scene load_steps=2 format=3 uid="uid://bdu08nd7si641"]
[gd_scene load_steps=3 format=3 uid="uid://bdu08nd7si641"]
[ext_resource type="Script" uid="uid://dpc4fvj40e5il" path="res://Features/Debug_/Tab/SubTabs/ThreadsVariablesSubTab.cs" id="1_e3p3b"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_hwpe6"]
[node name="ThreadsVariablesSubTab" type="Control"]
layout_mode = 3
anchors_preset = 15
@@ -28,52 +30,46 @@ split_offset = 370
unique_name_in_owner = true
layout_mode = 2
[node name="ScrollContainer" type="ScrollContainer" parent="HSplitContainer/HSplitContainer/ThreadsPanel"]
[node name="ThreadsTree" type="Tree" parent="HSplitContainer/HSplitContainer/ThreadsPanel"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="ThreadsVBoxContainer" type="VBoxContainer" parent="HSplitContainer/HSplitContainer/ThreadsPanel/ScrollContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
theme_override_constants/draw_guides = 0
theme_override_styles/panel = SubResource("StyleBoxEmpty_hwpe6")
hide_root = true
[node name="StackFramesPanel" type="Panel" parent="HSplitContainer/HSplitContainer"]
unique_name_in_owner = true
layout_mode = 2
[node name="ScrollContainer" type="ScrollContainer" parent="HSplitContainer/HSplitContainer/StackFramesPanel"]
[node name="StackFramesTree" type="Tree" parent="HSplitContainer/HSplitContainer/StackFramesPanel"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="StackFramesVBoxContainer" type="VBoxContainer" parent="HSplitContainer/HSplitContainer/StackFramesPanel/ScrollContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
theme_override_constants/draw_guides = 0
theme_override_styles/panel = SubResource("StyleBoxEmpty_hwpe6")
hide_root = true
[node name="VariablesPanel" type="Panel" parent="HSplitContainer"]
unique_name_in_owner = true
layout_mode = 2
[node name="ScrollContainer" type="ScrollContainer" parent="HSplitContainer/VariablesPanel"]
[node name="VariablesTree" type="Tree" parent="HSplitContainer/VariablesPanel"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
[node name="VariablesVBoxContainer" type="VBoxContainer" parent="HSplitContainer/VariablesPanel/ScrollContainer"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
size_flags_vertical = 3
theme_override_constants/draw_guides = 0
theme_override_styles/panel = SubResource("StyleBoxEmpty_hwpe6")
hide_root = true