fix: Fixing file resolution and improving project browser performance.

Author: joelday

src/DarkId.Papyrus.DebugAdapterProxy/Program.cs

@@ -105,7 +105,8 @@ static async Task<Dictionary<ObjectIdentifier, string>> ResolveSources(Options o
                 var project = await projectLoader.LoadProject(options.ProjectPath);
 
                 var programOptions = new ProgramOptionsBuilder().WithProject(project).Build();
-                return await fileSystem.ResolveSourceFiles(programOptions.Sources);
+                var includes = await fileSystem.ResolveSourceFileIncludes(programOptions.Sources);
+                return includes.ResolveSourceFiles();
             }
             else if (!string.IsNullOrEmpty(options.DefaultScriptSourceFolder) && !string.IsNullOrEmpty(options.DefaultAdditionalImports))
             {
@@ -137,7 +138,7 @@ static async Task<Dictionary<ObjectIdentifier, string>> ResolveSources(Options o
                     loggerFactory.CreateLogger<CreationKitProgramOptionsProvider>());
 
                 var programOptions = programOptionsProvider.GetAmbientProgramOptions();
-                return await fileSystem.ResolveSourceFiles(programOptions.Sources);
+                return (await fileSystem.ResolveSourceFileIncludes(programOptions.Sources)).ResolveSourceFiles();
             }
 
             return new Dictionary<ObjectIdentifier, string>();

src/DarkId.Papyrus.LanguageService/Program/PapyrusProgram.cs

@@ -82,9 +82,10 @@ public Task<string> GetFlagsFilePath()
             return _fileSystem.ResolveFlagsFile(_options);
         }
 
-        public async Task ResolveSources()
+        public async Task<Dictionary<SourceInclude, Dictionary<ObjectIdentifier, string>>> ResolveSources()
         {
-            var newFiles = await _fileSystem.ResolveSourceFiles(_options.Sources);
+            var includes = await _fileSystem.ResolveSourceFileIncludes(_options.Sources);
+            var newFiles = includes.ResolveSourceFiles();
 
             lock (_lock)
             {
@@ -111,6 +112,8 @@ public async Task ResolveSources()
 
                 Task.WaitAll(fileSyncTask, filePathSyncTask);
             }
+
+            return includes;
         }
 
         public void Dispose()

src/DarkId.Papyrus.LanguageService/Program/ProgramExtensions.cs

@@ -65,10 +65,11 @@ public static async Task<Dictionary<SourceInclude, Dictionary<ObjectIdentifier,
             foreach (var include in includedFiles)
             {
                 var filePaths = new Dictionary<ObjectIdentifier, string>();
+                var includePath = Path.GetFullPath(include.Item1.Path);
 
                 foreach (var fullPath in include.Item2)
                 {
-                    var relativePath = fullPath.Substring(include.Item1.Path.Length + 1);
+                    var relativePath = fullPath.Substring(includePath.Length + 1);
                     var identifier = ObjectIdentifier.FromScriptFilePath(relativePath);
 
                     filePaths.Add(identifier, fullPath);
@@ -80,15 +81,23 @@ public static async Task<Dictionary<SourceInclude, Dictionary<ObjectIdentifier,
             return results;
         }
 
-        public static async Task<Dictionary<ObjectIdentifier, string>> ResolveSourceFiles(this IFileSystem fileSystem, ProgramSources sources)
+        public static Dictionary<ObjectIdentifier, string> ResolveSourceFiles(this Dictionary<SourceInclude, Dictionary<ObjectIdentifier, string>> includes)
         {
             var results = new Dictionary<ObjectIdentifier, string>();
+            var fileIdentifiers = new Dictionary<string, ObjectIdentifier>();
 
-            foreach (var include in await fileSystem.ResolveSourceFileIncludes(sources))
+            foreach (var include in includes)
             {
                 foreach (var identifierFile in include.Value)
                 {
+                    if (fileIdentifiers.ContainsKey(identifierFile.Value))
+                    {
+                        results.Remove(identifierFile.Key);
+                        fileIdentifiers.Remove(identifierFile.Value);
+                    }
+
                     results[identifierFile.Key] = identifierFile.Value;
+                    fileIdentifiers[identifierFile.Value] = identifierFile.Key;
                 }
             }
 

src/DarkId.Papyrus.Server/Features/ProjectInfosHandler.cs

@@ -21,26 +21,29 @@ namespace DarkId.Papyrus.Server.Features
     public class ProjectInfosHandler : IProjectInfosHandler
     {
         private readonly ProjectManager _projectManager;
-        private readonly IFileSystem _fileSystem;
         private readonly ILogger _logger;
 
-        public ProjectInfosHandler(ProjectManager projectManager, IFileSystem fileSystem, ILogger<ProjectInfosHandler> logger)
+        public ProjectInfosHandler(ProjectManager projectManager, ILogger<ProjectInfosHandler> logger)
         {
             _projectManager = projectManager;
-            _fileSystem = fileSystem;
             _logger = logger;
         }
 
         public Task<ProjectInfos> Handle(ProjectInfosParams request, CancellationToken cancellationToken)
         {
             return Task.FromResult(new ProjectInfos()
             {
-                Projects = new Container<ProjectInfo>(_projectManager.Projects.Select(p =>
+                Projects = new Container<ProjectInfo>(_projectManager.Projects.AsParallel().AsOrdered().Select(p =>
                 {
+                    if (p.Sources == null)
+                    {
+                        p.ResolveSources();
+                    }
+
                     return new ProjectInfo()
                     {
                         Name = p.Name,
-                        SourceIncludes = new Container<ProjectInfoSourceInclude>(_fileSystem.ResolveSourceFileIncludes(p.Program.Options.Sources).WaitForResult().Select(include =>
+                        SourceIncludes = new Container<ProjectInfoSourceInclude>(p.Sources != null ? p.Sources.Select(include =>
                         {
                             var name = !string.IsNullOrEmpty(include.Key.Path) ? Path.GetFileName(include.Key.Path) : "Scripts";
 
@@ -55,7 +58,7 @@ public Task<ProjectInfos> Handle(ProjectInfosParams request, CancellationToken c
                                     FilePath = script.Value
                                 }))
                             };
-                        }))
+                        }) : Enumerable.Empty<ProjectInfoSourceInclude>())
                     };
                 }))
             }); 

src/DarkId.Papyrus.Server/ProjectHost.cs

@@ -55,6 +55,7 @@ private void HandleScriptFileChanged(object sender, ScriptFileChangedEventArgs e
         }
 
         public string Name => _name;
+        public Dictionary<SourceInclude, Dictionary<ObjectIdentifier, string>> Sources { get; private set; }
 
         public PapyrusProgram Program
         {
@@ -72,7 +73,7 @@ public void ResolveSources()
             lock (_lock)
             {
                 _logger.LogInformation("Resolving script files for {0}...", Name);
-                _program.ResolveSources().Wait();
+                Sources = _program.ResolveSources().WaitForResult();
 
                 _logger.LogInformation("Done");
             }

src/papyrus-lang-vscode/package.json

@@ -203,7 +203,7 @@
             "papyrus-views": [
                 {
                     "id": "papyrus-projects",
-                    "name": "Project Browser"
+                    "name": "Project Explorer"
                 }
             ]
         }