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

open file from problem

Browse Source
This commit is contained in:
Matt Parker
2025-09-13 15:35:52 +10:00
parent 3fb602d8fc
commit b4291cb7f7
6 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SharpIDE.Godot/Features/Problems/DiagnosticMetadataContainer.cs Normal file
View File

@@ -0,0 +1,15 @@
using Godot;
using Microsoft.CodeAnalysis;
using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
namespace SharpIDE.Godot.Features.Problems;
public partial class DiagnosticMetadataContainer(Diagnostic diagnostic) : GodotObject
{
public Diagnostic Diagnostic { get; } = diagnostic;
}
public partial class ProjectContainer(SharpIdeProjectModel project) : GodotObject
{
public SharpIdeProjectModel Project { get; } = project;
}

1
src/SharpIDE.Godot/Features/Problems/DiagnosticMetadataContainer.cs.uid Normal file
View File

@@ -0,0 +1 @@
uid://bpo4ti23q3bhu

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

@@ -3,6 +3,7 @@ using Godot;
using Microsoft.CodeAnalysis;
using ObservableCollections;
using R3;
using SharpIDE.Application.Features.SolutionDiscovery;
using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
namespace SharpIDE.Godot.Features.Problems;
@@ -26,6 +27,7 @@ public partial class ProblemsPanel : Control
public override void _Ready()
{
_tree = GetNode<Tree>("%Tree");
_tree.ItemActivated += TreeOnItemActivated;
_rootItem = _tree.CreateItem();
_rootItem.SetText(0, "Problems");
Observable.EveryValueChanged(this, manager => manager.Solution)
@@ -62,6 +64,7 @@ public partial class ProblemsPanel : Control
var treeItem = tree.CreateItem(parent);
treeItem.SetText(0, e.NewItem.Value.Name);
treeItem.SetIcon(0, CsprojIcon);
treeItem.SetMetadata(0, new ProjectContainer(e.NewItem.Value));
e.NewItem.View.Value = treeItem;
Observable.EveryValueChanged(e.NewItem.Value, s => s.Diagnostics.Count).Subscribe(s => treeItem.Visible = s is not 0).AddTo(this);
@@ -83,6 +86,7 @@ public partial class ProblemsPanel : Control
{
var diagItem = tree.CreateItem(parent);
diagItem.SetText(0, e.NewItem.Value.GetMessage());
diagItem.SetMetadata(0, new DiagnosticMetadataContainer(e.NewItem.Value));
diagItem.SetIcon(0, e.NewItem.Value.Severity switch
{
DiagnosticSeverity.Error => ErrorIcon,
@@ -100,4 +104,26 @@ public partial class ProblemsPanel : Control
treeItem?.Free();
});
}
private void TreeOnItemActivated()
{
var selected = _tree.GetSelected();
var diagnosticContainer = selected.GetMetadata(0).As<DiagnosticMetadataContainer?>();
if (diagnosticContainer is null) return;
var diagnostic = diagnosticContainer.Diagnostic;
var parentTreeItem = selected.GetParent();
var projectContainer = parentTreeItem.GetMetadata(0).As<ProjectContainer?>();
if (projectContainer is null) return;
var projectModel = projectContainer.Project;
OpenDocumentContainingDiagnostic(diagnostic, projectModel);
}
private static void OpenDocumentContainingDiagnostic(Diagnostic diagnostic, SharpIdeProjectModel projectModel)
{
// TODO: probably store a flat list of all files in each project to avoid recursion
var file = projectModel.Files
.Concat(projectModel.Folders.SelectMany(f => f.GetAllFiles()))
.Single(s => s.Path == diagnostic.Location.SourceTree?.GetMappedLineSpan(diagnostic.Location.SourceSpan).Path);
GodotGlobalEvents.InvokeFileSelected(file);
}
}

5
src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs
View File

@@ -7,9 +7,6 @@ namespace SharpIDE.Godot.Features.SolutionExplorer;
public partial class SolutionExplorerPanel : MarginContainer
{
[Signal]
public delegate void FileSelectedEventHandler(SharpIdeFileGodotContainer file);
[Export]
public Texture2D CsharpFileIcon { get; set; } = null!;
[Export]
@@ -37,7 +34,7 @@ public partial class SolutionExplorerPanel : MarginContainer
if (sharpIdeFileContainer is null) return;
var sharpIdeFile = sharpIdeFileContainer.File;
Guard.Against.Null(sharpIdeFile, nameof(sharpIdeFile));
EmitSignalFileSelected(sharpIdeFileContainer);
GodotGlobalEvents.InvokeFileSelected(sharpIdeFile);
}
public void RepopulateTree()

4
src/SharpIDE.Godot/GodotGlobalEvents.cs
View File

@@ -1,4 +1,5 @@
using SharpIDE.Application.Features.Events;
using SharpIDE.Application.Features.SolutionDiscovery;
namespace SharpIDE.Godot;
@@ -12,6 +13,9 @@ public static class GodotGlobalEvents
public static event Func<bool, Task> BottomPanelVisibilityChangeRequested = _ => Task.CompletedTask;
public static void InvokeBottomPanelVisibilityChangeRequested(bool show) => BottomPanelVisibilityChangeRequested.InvokeParallelFireAndForget(show);
public static event Func<SharpIdeFile, Task> FileSelected = _ => Task.CompletedTask;
public static void InvokeFileSelected(SharpIdeFile file) => FileSelected.InvokeParallelFireAndForget(file);
}
public enum BottomPanelType

7
src/SharpIDE.Godot/IdeRoot.cs
View File

@@ -1,6 +1,7 @@
using Godot;
using Microsoft.Build.Locator;
using SharpIDE.Application.Features.Analysis;
using SharpIDE.Application.Features.SolutionDiscovery;
using SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
using SharpIDE.Godot.Features.BottomPanel;
using SharpIDE.Godot.Features.CustomControls;
@@ -39,7 +40,7 @@ public partial class IdeRoot : Control
_bottomPanelManager = GetNode<BottomPanelManager>("%BottomPanel");
_runMenuButton.Pressed += OnRunMenuButtonPressed;
_solutionExplorerPanel.FileSelected += OnSolutionExplorerPanelOnFileSelected;
GodotGlobalEvents.FileSelected += OnSolutionExplorerPanelOnFileSelected;
_fileDialog.FileSelected += OnFileSelected;
_openSlnButton.Pressed += () => _fileDialog.Visible = true;
_buildSlnButton.Pressed += OnBuildSlnButtonPressed;
@@ -61,9 +62,9 @@ public partial class IdeRoot : Control
await Singletons.BuildService.MsBuildSolutionAsync(_solutionExplorerPanel.SolutionModel.FilePath);
}
private async void OnSolutionExplorerPanelOnFileSelected(SharpIdeFileGodotContainer file)
private async Task OnSolutionExplorerPanelOnFileSelected(SharpIdeFile file)
{
await _sharpIdeCodeEdit.SetSharpIdeFile(file.File);
await _sharpIdeCodeEdit.SetSharpIdeFile(file);
}
private void OnFileSelected(string path)