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

refactor

Browse Source
This commit is contained in:
Matt Parker
2025-09-12 19:23:02 +10:00
parent 21dc0be9cf
commit 1f829314dd
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs
View File

@@ -38,33 +38,37 @@ public partial class ProblemsPanel : Control
} }
public void BindToTree(ObservableHashSet<SharpIdeProjectModel> list) public void BindToTree(ObservableHashSet<SharpIdeProjectModel> list)
{ {
var view = list.CreateView(x => var view = list.CreateView(y => new TreeItemContainer());
{ view.ObserveChanged()
var treeItem = _tree.CreateItem(_rootItem); .SubscribeAwait(async (e, ct) => await (e.Action switch
treeItem.SetText(0, x.Name); {
var projectDiagnosticsView = x.Diagnostics.CreateView(y => new TreeItemContainer()); NotifyCollectionChangedAction.Add => CreateProjectTreeItem(_tree, _rootItem, e),
projectDiagnosticsView.ObserveChanged() NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
.SubscribeAwait(async (e, ct) => await (e.Action switch _ => Task.CompletedTask
{ })).AddTo(this);
NotifyCollectionChangedAction.Add => CreateDiagnosticTreeItem(_tree, treeItem, e),
NotifyCollectionChangedAction.Remove => FreeDiagnosticTreeItem(e),
_ => Task.CompletedTask
})).AddTo(this);
Observable.EveryValueChanged(x, s => s.Diagnostics.Count)
.Subscribe(s => treeItem.Visible = s is not 0).AddTo(this);
return treeItem;
});
view.ViewChanged += OnViewChanged;
} }
private async Task FreeDiagnosticTreeItem(ViewChangedEvent<Diagnostic, TreeItemContainer> e) private async Task CreateProjectTreeItem(Tree tree, TreeItem parent, ViewChangedEvent<SharpIdeProjectModel, TreeItemContainer> e)
{ {
await this.InvokeAsync(() => await this.InvokeAsync(() =>
{ {
e.OldItem.View.Value?.Free(); var treeItem = tree.CreateItem(parent);
treeItem.SetText(0, e.NewItem.Value.Name);
e.NewItem.View.Value = treeItem;
Observable.EveryValueChanged(e.NewItem.Value, s => s.Diagnostics.Count).Subscribe(s => treeItem.Visible = s is not 0).AddTo(this);
var projectDiagnosticsView = e.NewItem.Value.Diagnostics.CreateView(y => new TreeItemContainer());
projectDiagnosticsView.ObserveChanged()
.SubscribeAwait(async (innerEvent, ct) => await (innerEvent.Action switch
{
NotifyCollectionChangedAction.Add => CreateDiagnosticTreeItem(_tree, treeItem, innerEvent),
NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
_ => Task.CompletedTask
})).AddTo(this);
}); });
} }
private async Task CreateDiagnosticTreeItem(Tree tree, TreeItem parent, ViewChangedEvent<Diagnostic, TreeItemContainer> e) private async Task CreateDiagnosticTreeItem(Tree tree, TreeItem parent, ViewChangedEvent<Diagnostic, TreeItemContainer> e)
{ {
await this.InvokeAsync(() => await this.InvokeAsync(() =>
@@ -74,14 +78,12 @@ public partial class ProblemsPanel : Control
e.NewItem.View.Value = diagItem; e.NewItem.View.Value = diagItem;
}); });
} }
private static void OnViewChanged(in SynchronizedViewChangedEventArgs<SharpIdeProjectModel, TreeItem> eventArgs) private async Task FreeTreeItem(TreeItem? treeItem)
{ {
GD.Print("View changed: " + eventArgs.Action); await this.InvokeAsync(() =>
if (eventArgs.Action == NotifyCollectionChangedAction.Remove)
{ {
var treeItem = eventArgs.OldItem.View; treeItem?.Free();
Callable.From(() => treeItem.Free()).CallDeferred(); });
}
} }
} }