should not dispose and yeild

SimonCropp · SimonCropp · commit ab373cae1d01 · 2023-11-23T22:49:19.000+11:00
diff --git a/src/DiffEngine/Process/LinuxOsxProcess.cs b/src/DiffEngine/Process/LinuxOsxProcess.cs
@@ -24,13 +24,14 @@ public static bool TryTerminateProcess(int processId)
         throw new(message);
     }
 
-    public static IEnumerable<ProcessCommand> FindAll()
+    public static List<ProcessCommand> FindAll()
     {
         if (!TryRunPs(out var processList))
         {
-            yield break;
+            return [];
         }
 
+        var commands = new List<ProcessCommand>();
         using var reader = new StringReader(processList);
         reader.ReadLine();
         while (reader.ReadLine() is { } line)
@@ -40,8 +41,10 @@ public static IEnumerable<ProcessCommand> FindAll()
                 continue;
             }
 
-            yield return processCommand!.Value;
+            commands.Add(processCommand!.Value);
         }
+
+        return commands;
     }
 
     public static bool TryParse(string line, out ProcessCommand? processCommand)
diff --git a/src/DiffEngine/Process/ProcessCleanup.cs b/src/DiffEngine/Process/ProcessCleanup.cs
@@ -3,7 +3,7 @@
 public static class ProcessCleanup
 {
     static List<ProcessCommand> commands;
-    static Func<IEnumerable<ProcessCommand>> findAll;
+    static Func<List<ProcessCommand>> findAll;
     static Func<int, bool> tryTerminateProcess;
 
     static ProcessCleanup()
diff --git a/src/DiffEngine/Process/WindowsProcess.cs b/src/DiffEngine/Process/WindowsProcess.cs
@@ -23,8 +23,9 @@ public static bool TryTerminateProcess(int processId)
         return true;
     }
 
-    public static IEnumerable<ProcessCommand> FindAll()
+    public static List<ProcessCommand> FindAll()
     {
+        var commands = new List<ProcessCommand>();
         var wmiQuery =
             """
             select CommandLine, ProcessId
@@ -38,7 +39,9 @@ where CommandLine like '% %.%.%'
             var command = (string) process["CommandLine"];
             var id = (int) Convert.ChangeType(process["ProcessId"], typeof(int));
             process.Dispose();
-            yield return new(command, id);
+            commands.Add(new(command, id));
         }
+
+        return commands;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,14 @@ public static bool TryTerminateProcess(int processId)`
`24`	`24`	`throw new(message);`
`25`	`25`	`}`
`26`	`26`
`27`		`- public static IEnumerable<ProcessCommand> FindAll()`
	`27`	`+ public static List<ProcessCommand> FindAll()`
`28`	`28`	`{`
`29`	`29`	`if (!TryRunPs(out var processList))`
`30`	`30`	`{`
`31`		`- yield break;`
	`31`	`+ return [];`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ var commands = new List<ProcessCommand>();`
`34`	`35`	`using var reader = new StringReader(processList);`
`35`	`36`	`reader.ReadLine();`
`36`	`37`	`while (reader.ReadLine() is { } line)`
`@@ -40,8 +41,10 @@ public static IEnumerable<ProcessCommand> FindAll()`
`40`	`41`	`continue;`
`41`	`42`	`}`
`42`	`43`
`43`		`- yield return processCommand!.Value;`
	`44`	`+ commands.Add(processCommand!.Value);`
`44`	`45`	`}`
	`46`	`+`
	`47`	`+ return commands;`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`public static bool TryParse(string line, out ProcessCommand? processCommand)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`public static class ProcessCleanup`
`4`	`4`	`{`
`5`	`5`	`static List<ProcessCommand> commands;`
`6`		`- static Func<IEnumerable<ProcessCommand>> findAll;`
	`6`	`+ static Func<List<ProcessCommand>> findAll;`
`7`	`7`	`static Func<int, bool> tryTerminateProcess;`
`8`	`8`
`9`	`9`	`static ProcessCleanup()`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,9 @@ public static bool TryTerminateProcess(int processId)`
`23`	`23`	`return true;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static IEnumerable<ProcessCommand> FindAll()`
	`26`	`+ public static List<ProcessCommand> FindAll()`
`27`	`27`	`{`
	`28`	`+ var commands = new List<ProcessCommand>();`
`28`	`29`	`var wmiQuery =`
`29`	`30`	`"""`
`30`	`31`	`select CommandLine, ProcessId`
`@@ -38,7 +39,9 @@ where CommandLine like '% %.%.%'`
`38`	`39`	`var command = (string) process["CommandLine"];`
`39`	`40`	`var id = (int) Convert.ChangeType(process["ProcessId"], typeof(int));`
`40`	`41`	`process.Dispose();`
`41`		`- yield return new(command, id);`
	`42`	`+ commands.Add(new(command, id));`
`42`	`43`	`}`
	`44`	`+`
	`45`	`+ return commands;`
`43`	`46`	`}`
`44`	`47`	`}`