Update OsSettingsResolver.cs

Author: SimonCropp

src/DiffEngine/OsSettingsResolver.cs

@@ -26,18 +26,21 @@ public static bool Resolve(
         [NotNullWhen(true)] out string? path,
         [NotNullWhen(true)] out LaunchArguments? launchArguments)
     {
-        if (TryResolveForOs(osSupport.Windows, out path, out launchArguments, OSPlatform.Windows))
+        if (TryResolveForOs(osSupport.Windows, out path, OSPlatform.Windows))
         {
+            launchArguments = osSupport.Windows.LaunchArguments;
             return true;
         }
 
-        if (TryResolveForOs(osSupport.Linux, out path, out launchArguments, OSPlatform.Linux))
+        if (TryResolveForOs(osSupport.Linux, out path, OSPlatform.Linux))
         {
+            launchArguments = osSupport.Linux.LaunchArguments;
             return true;
         }
 
-        if (TryResolveForOs(osSupport.Osx, out path, out launchArguments, OSPlatform.OSX))
+        if (TryResolveForOs(osSupport.Osx, out path, OSPlatform.OSX))
         {
+            launchArguments = osSupport.Osx.LaunchArguments;
             return true;
         }
 
@@ -47,12 +50,10 @@ public static bool Resolve(
     }
 
     static bool TryResolveForOs(
-        OsSettings? os,
+        [NotNullWhen(true)] OsSettings? os,
         [NotNullWhen(true)] out string? path,
-        [NotNullWhen(true)] out LaunchArguments? launchArguments,
         OSPlatform platform)
     {
-        launchArguments = null;
         path = null;
 
         if (os == null || !RuntimeInformation.IsOSPlatform(platform))
@@ -74,21 +75,18 @@ static bool TryResolveForOs(
                 }
                 else
                 {
-                    launchArguments = null;
                     path = null;
                     return false;
                 }
                 if (WildcardFileFinder.TryFind(basePath, out path))
                 {
-                    launchArguments = os.LaunchArguments;
                     return true;
                 }
             }
         }
 
         if (TryFindExe(os.ExeName, os.SearchDirectories, out path))
         {
-            launchArguments = os.LaunchArguments;
             return true;
         }