ProjectConfigService.GetItemsFromProjectConfig now returns a list

MBulli · Sep 27, 2023 · dc62322 · dc62322
1 parent 25a0a03
commit dc62322
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/Services/ProjectConfigService.cs b/SmartCmdArgs/SmartCmdArgs.Shared/Services/ProjectConfigService.cs
@@ -12,7 +12,7 @@ public interface IProjectConfigService
     {
         bool IsSupportedProject(IVsHierarchyWrapper project);
 
-        void GetItemsFromProjectConfig(IVsHierarchyWrapper project, List<CmdItemJson> allArgs);
+        List<CmdItemJson> GetItemsFromProjectConfig(IVsHierarchyWrapper project);
 
         void UpdateProjectConfig(IVsHierarchyWrapper project);
     }
@@ -698,17 +698,21 @@ private static bool TryGetProjectConfigHandlers(IVsHierarchyWrapper project, out
             return supportedProjects.TryGetValue(projectKind, out handler);
         }
 
-        public void GetItemsFromProjectConfig(IVsHierarchyWrapper project, List<CmdItemJson> allArgs)
+        public List<CmdItemJson> GetItemsFromProjectConfig(IVsHierarchyWrapper project)
         {
+            var result = new List<CmdItemJson>();
+
             if (TryGetProjectConfigHandlers(project, out ProjectConfigHandlers handler))
             {
                 handler.GetItemsFromConfig(
                     project.GetProject(),
-                    allArgs,
+                    result,
                     includeArgs: optionsSettings.ManageCommandLineArgs,
                     includeEnvVars: optionsSettings.ManageEnvironmentVars,
                     includeWorkDir: optionsSettings.ManageWorkingDirectories);
             }
+
+            return result;
         }
 
         public void UpdateProjectConfig(IVsHierarchyWrapper project)

diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/Services/ViewModelUpdateService.cs b/SmartCmdArgs/SmartCmdArgs.Shared/Services/ViewModelUpdateService.cs
@@ -188,7 +188,7 @@ public void UpdateCommandsForProject(IVsHierarchyWrapper project)
                 projectData = new ProjectDataJson();
 
                 Logger.Info($"Gathering commands from configurations for project '{project.GetName()}'.");
-                projectData.Items.AddRange(ReadCommandlineArgumentsFromProject(project));
+                projectData.Items.AddRange(projectConfig.GetItemsFromProjectConfig(project));
             }
 
             // push projectData to the ViewModel
@@ -197,13 +197,6 @@ public void UpdateCommandsForProject(IVsHierarchyWrapper project)
             Logger.Info($"Updated Commands for project '{project.GetName()}'.");
         }
 
-        private List<CmdItemJson> ReadCommandlineArgumentsFromProject(IVsHierarchyWrapper project)
-        {
-            var prjCmdArgs = new List<CmdItemJson>();
-            projectConfig.GetItemsFromProjectConfig(project, prjCmdArgs);
-            return prjCmdArgs;
-        }
-
         private ISet<CmdParameter> GetAllActiveItemsForProject(IVsHierarchyWrapper project)
         {
             if (!optionsSettings.ManageCommandLineArgs