refactor

src/SharpIDE.Godot/Features/SolutionExplorer/FileIconHelper.cs

@@ -0,0 +1,63 @@
+using Godot;
+
+namespace SharpIDE.Godot.Features.SolutionExplorer;
+
+public static class FileIconHelper
+{
+    private static readonly Texture2D _csIcon = ResourceLoader.Load<Texture2D>("uid://do0edciarrnp0");
+    private static readonly Texture2D _razorIcon = ResourceLoader.Load<Texture2D>("uid://cff7jlvj2tlg2");
+    private static readonly Texture2D _jsonIcon = ResourceLoader.Load<Texture2D>("uid://csrwpjk77r731");
+    private static readonly Texture2D _jsIcon = ResourceLoader.Load<Texture2D>("uid://cpdobpjrm2suc");
+    private static readonly Texture2D _htmlIcon = ResourceLoader.Load<Texture2D>("uid://q0cktiwdkt1e");
+    private static readonly Texture2D _cssIcon = ResourceLoader.Load<Texture2D>("uid://b6m4rm5u8hd1c");
+    private static readonly Texture2D _txtIcon = ResourceLoader.Load<Texture2D>("uid://b6bpjhs2o1j2l");
+    private static readonly Texture2D _genericFileIcon = ResourceLoader.Load<Texture2D>("uid://bile1h6sq0l08");
+    private static readonly Texture2D _mdFileIcon = ResourceLoader.Load<Texture2D>("uid://8i2y6xjdjno3");
+    private static readonly Texture2D _editorConfigFileIcon = ResourceLoader.Load<Texture2D>("uid://5t83l7c7f3g6");
+    private static readonly Texture2D _gitignoreFileIcon = ResourceLoader.Load<Texture2D>("uid://qhtsnkua67ds");
+    private static readonly Texture2D _imageFileIcon = ResourceLoader.Load<Texture2D>("uid://73nvtvnx1tie");
+    private static readonly Texture2D _fSharpIcon = ResourceLoader.Load<Texture2D>("uid://xa0ntrn7vvbr");
+    private static readonly Texture2D _xmlIcon = ResourceLoader.Load<Texture2D>("uid://p5jl3uv51irw");
+    private static readonly Texture2D _csprojIcon = ResourceLoader.Load<Texture2D>("uid://cqt30ma6xgder");
+    
+    private static readonly Texture2D _propsFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://fa7tdmldi206");
+    private static readonly Texture2D _configFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://brsdisqgeah5n");
+    private static readonly Texture2D _targetsFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://xy5ad1lc24lv");
+    private static readonly Texture2D _unknownFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://7rqmyeiy4y82");
+
+    public static (Texture2D Icon, Texture2D? OverlayIcon) GetIconForFileExtension(string fileExtension)
+    {
+        var texture = fileExtension switch
+        {
+            ".cs" => _csIcon,
+            ".razor" or ".cshtml" => _razorIcon,
+            ".json" => _jsonIcon,
+            ".js" => _jsIcon,
+            ".html" or ".htm" => _htmlIcon,
+            ".css" => _cssIcon,
+            ".txt" => _txtIcon,
+            ".props" or ".config" or ".targets" or ".resx" => _genericFileIcon,
+            ".md" => _mdFileIcon,
+            ".editorconfig" => _editorConfigFileIcon,
+            ".gitignore" => _gitignoreFileIcon,
+            ".png" or ".jpg" or ".jpeg" or ".gif" or ".bmp" or ".svg" or ".ico" or ".avif" or ".webp" => _imageFileIcon,
+            ".fs" => _fSharpIcon,
+            ".xml" or ".nuspec" => _xmlIcon,
+            ".csproj" => _csprojIcon,
+            _ => _genericFileIcon
+        };
+        var overlayTexture = fileExtension switch
+        {
+            ".props" => _propsFileOverlayIcon,
+            ".config" or ".resx" => _configFileOverlayIcon,
+            ".targets" => _targetsFileOverlayIcon,
+            _ => null
+        };
+        if (overlayTexture is null && texture == _genericFileIcon)
+        {
+            overlayTexture = _unknownFileOverlayIcon;
+        }
+        
+        return (texture, overlayTexture);
+    }
+}

src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.FileIcons.cs

@@ -1,63 +1,23 @@
 using Godot;
+using SharpIDE.Application.Features.SolutionDiscovery;
 
 namespace SharpIDE.Godot.Features.SolutionExplorer;
 
 public partial class SolutionExplorerPanel
 {
-    private readonly Texture2D _csIcon = ResourceLoader.Load<Texture2D>("uid://do0edciarrnp0");
-    private readonly Texture2D _razorIcon = ResourceLoader.Load<Texture2D>("uid://cff7jlvj2tlg2");
-    private readonly Texture2D _jsonIcon = ResourceLoader.Load<Texture2D>("uid://csrwpjk77r731");
-    private readonly Texture2D _jsIcon = ResourceLoader.Load<Texture2D>("uid://cpdobpjrm2suc");
-    private readonly Texture2D _htmlIcon = ResourceLoader.Load<Texture2D>("uid://q0cktiwdkt1e");
-    private readonly Texture2D _cssIcon = ResourceLoader.Load<Texture2D>("uid://b6m4rm5u8hd1c");
-    private readonly Texture2D _txtIcon = ResourceLoader.Load<Texture2D>("uid://b6bpjhs2o1j2l");
-    private readonly Texture2D _genericFileIcon = ResourceLoader.Load<Texture2D>("uid://bile1h6sq0l08");
-    private readonly Texture2D _mdFileIcon = ResourceLoader.Load<Texture2D>("uid://8i2y6xjdjno3");
-    private readonly Texture2D _editorConfigFileIcon = ResourceLoader.Load<Texture2D>("uid://5t83l7c7f3g6");
-    private readonly Texture2D _gitignoreFileIcon = ResourceLoader.Load<Texture2D>("uid://qhtsnkua67ds");
-    private readonly Texture2D _imageFileIcon = ResourceLoader.Load<Texture2D>("uid://73nvtvnx1tie");
-    private readonly Texture2D _fSharpIcon = ResourceLoader.Load<Texture2D>("uid://xa0ntrn7vvbr");
-    private readonly Texture2D _xmlIcon = ResourceLoader.Load<Texture2D>("uid://p5jl3uv51irw");
-    private readonly Texture2D _csprojIcon = ResourceLoader.Load<Texture2D>("uid://cqt30ma6xgder");
     
-    private readonly Texture2D _propsFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://fa7tdmldi206");
+}
-    private readonly Texture2D _configFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://brsdisqgeah5n");
-    private readonly Texture2D _targetsFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://xy5ad1lc24lv");
-    private readonly Texture2D _unknownFileOverlayIcon = ResourceLoader.Load<Texture2D>("uid://7rqmyeiy4y82");
 
-    private (Texture2D Icon, Texture2D? OverlayIcon) GetIconForFileExtension(string fileExtension)
+public static class SolutionExplorerExtensions
+{
+    extension(TreeItem fileItem)
     {
-        var texture = fileExtension switch
+        public void SetIconsForFileExtension(SharpIdeFile file)
         {
-            ".cs" => _csIcon,
+            var (icon, overlayIcon) = FileIconHelper.GetIconForFileExtension(file.Extension);
-            ".razor" or ".cshtml" => _razorIcon,
+            fileItem.SetIcon(0, icon);
-            ".json" => _jsonIcon,
+            // Set even if null, to support renaming files
-            ".js" => _jsIcon,
+            fileItem.SetIconOverlay(0, overlayIcon);
-            ".html" or ".htm" => _htmlIcon,
-            ".css" => _cssIcon,
-            ".txt" => _txtIcon,
-            ".props" or ".config" or ".targets" or ".resx" => _genericFileIcon,
-            ".md" => _mdFileIcon,
-            ".editorconfig" => _editorConfigFileIcon,
-            ".gitignore" => _gitignoreFileIcon,
-            ".png" or ".jpg" or ".jpeg" or ".gif" or ".bmp" or ".svg" or ".ico" or ".avif" or ".webp" => _imageFileIcon,
-            ".fs" => _fSharpIcon,
-            ".xml" or ".nuspec" => _xmlIcon,
-            ".csproj" => _csprojIcon,
-            _ => _genericFileIcon
-        };
-        var overlayTexture = fileExtension switch
-        {
-            ".props" => _propsFileOverlayIcon,
-            ".config" or ".resx" => _configFileOverlayIcon,
-            ".targets" => _targetsFileOverlayIcon,
-            _ => null
-        };
-        if (overlayTexture is null && texture == _genericFileIcon)
-        {
-            overlayTexture = _unknownFileOverlayIcon;
         }
-        
-        return (texture, overlayTexture);
     }
 }

src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs

@@ -299,16 +299,18 @@ public partial class SolutionExplorerPanel : MarginContainer
 		}
 		var fileItem = tree.CreateItem(parent, newStartingIndex);
 		fileItem.SetText(0, sharpIdeFile.Name);
-		var (icon, overlayIcon) = GetIconForFileExtension(sharpIdeFile.Extension);
+		fileItem.SetIconsForFileExtension(sharpIdeFile);
-		fileItem.SetIcon(0, icon);
-		if (overlayIcon is not null) fileItem.SetIconOverlay(0, overlayIcon);
 		fileItem.SetCustomColor(0, GetColorForGitStatus(sharpIdeFile.GitStatus));
 		fileItem.SetMetadata(0, new RefCountedContainer<SharpIdeFile>(sharpIdeFile));
 		
 		Observable.EveryValueChanged(sharpIdeFile, file => file.Name)
 			.Skip(1).SubscribeAwait(async (s, ct) =>
 			{
-				await this.InvokeAsync(() => fileItem.SetText(0, s));
+				await this.InvokeAsync(() =>
+				{
+					fileItem.SetText(0, s);
+					fileItem.SetIconsForFileExtension(sharpIdeFile);
+				});
 			}).AddTo(this);
 		
 		return fileItem;