Update OsSettingsResolver.cs

Author: SimonCropp

src/DiffEngine/OsSettingsResolver.cs

@@ -52,43 +52,46 @@ static bool TryResolveForOs(
         [NotNullWhen(true)] out LaunchArguments? launchArguments,
         OSPlatform platform)
     {
-        if (os != null &&
-            RuntimeInformation.IsOSPlatform(platform))
+        launchArguments = null;
+        path = null;
+
+        if (os == null || !RuntimeInformation.IsOSPlatform(platform))
+        {
+            return false;
+        }
+
+        if (os.EnvironmentVariable is not null)
         {
-            if (os.EnvironmentVariable is not null)
+            var basePath = Environment.GetEnvironmentVariable(os.EnvironmentVariable);
+            if (basePath is not null)
             {
-                var basePath = Environment.GetEnvironmentVariable(os.EnvironmentVariable);
-                if (basePath is not null)
+                if (basePath.EndsWith(os.ExeName) && File.Exists(basePath))
                 {
-                    if (basePath.EndsWith(os.ExeName) && File.Exists(basePath))
-                    {
-                    }
-                    else if (Directory.Exists(basePath))
-                    {
-                        basePath = Path.Combine(basePath, os.ExeName);
-                    }
-                    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;
+                else if (Directory.Exists(basePath))
+                {
+                    basePath = Path.Combine(basePath, os.ExeName);
+                }
+                else
+                {
+                    launchArguments = null;
+                    path = null;
+                    return false;
+                }
+                if (WildcardFileFinder.TryFind(basePath, out path))
+                {
+                    launchArguments = os.LaunchArguments;
+                    return true;
+                }
             }
         }
 
-        launchArguments = null;
-        path = null;
+        if (TryFindExe(os.ExeName, os.SearchDirectories, out path))
+        {
+            launchArguments = os.LaunchArguments;
+            return true;
+        }
+
         return false;
     }