fix detecting Godot project on the first solution opening #114

JetBrains · Oct 18, 2023 · b97a874 · b97a874
1 parent 29cdb8b
commit b97a874
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/resharper/src/ProjectModel/GodotTracker.cs b/resharper/src/ProjectModel/GodotTracker.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using JetBrains.ProjectModel;
+using JetBrains.ProjectModel.Tasks;
 using JetBrains.Rd.Base;
 using JetBrains.ReSharper.Feature.Services.Protocol;
 using JetBrains.Rider.Model.Godot.FrontendBackend;
@@ -11,19 +12,23 @@ namespace JetBrains.ReSharper.Plugins.Godot.ProjectModel
     public class GodotTracker
     {
         public VirtualFileSystemPath MainProjectBasePath { get; private set; }
-        public GodotTracker(ISolution solution, ILogger logger)
+        public GodotTracker(ISolution solution, ILogger logger, ISolutionLoadTasksScheduler tasksScheduler)
         {
             var model = solution.GetProtocolSolution().GetGodotFrontendBackendModel();
-
-            foreach (var project in solution.GetTopLevelProjects().Where(project => project.IsGodotProject()))
-            {
-                var file = project.Location.Combine("project.godot");
-                if (!file.ExistsFile) continue;
-                MainProjectBasePath = file.Directory;
-                logger.Verbose($"Godot MainProjectBasePath: {file.Directory}");
-                model.MainProjectBasePath.SetValue(MainProjectBasePath.FullPath);
-                break;
-            }
+            tasksScheduler.EnqueueTask(new SolutionLoadTask("UnityTechnologyDescriptionCollector",
+                SolutionLoadTaskKinds.Done,
+                () =>
+                {
+                    foreach (var project in solution.GetTopLevelProjects().Where(project => project.IsGodotProject()))
+                    {
+                        var file = project.Location.Combine("project.godot");
+                        if (!file.ExistsFile) continue;
+                        MainProjectBasePath = file.Directory;
+                        logger.Verbose($"Godot MainProjectBasePath: {file.Directory}");
+                        model.MainProjectBasePath.SetValue(file.Directory.FullPath);
+                        break;
+                    }
+                }));
         }
     }
 }
diff --git a/resharper/src/ZoneMarker.cs b/resharper/src/ZoneMarker.cs
@@ -1,14 +1,11 @@
 using JetBrains.Application.BuildScript.Application.Zones;
-using JetBrains.DocumentModel;
-using JetBrains.ProjectModel;
-using JetBrains.ReSharper.Resources.Shell;
+using JetBrains.Rider.Backend.Env;
 using JetBrains.Rider.Backend.Product;
-using JetBrains.Rider.Model;
 
 namespace JetBrains.ReSharper.Plugins.Godot
 {
     [ZoneMarker]
-    public class ZoneMarker : IRequire<IRiderProductEnvironmentZone>, IRequire<IProjectModelZone>, IRequire<IRiderModelZone>, IRequire<IDocumentModelZone>, IRequire<PsiFeaturesImplZone>
+    public class ZoneMarker : IRequire<IRiderProductEnvironmentZone>, IRequire<IRiderFeatureZone>
     {
     }
 }