cleanup AddFilesFromDirectory (#4049)

microsoft · Nov 12, 2024 · 87aed30 · 87aed30
1 parent a8122b3
commit 87aed30
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs
@@ -182,19 +182,14 @@ public virtual string CopyFileOverwrite(string source, string destination, out s
 
     public virtual List<string> AddFilesFromDirectory(string directoryPath, Func<string, bool>? ignoreDirectory, bool ignoreIOExceptions)
     {
-        var fileContents = new List<string>();
+        var files = new List<string>();
 
         try
         {
-            string[] files = GetFilesInADirectory(directoryPath);
-            fileContents.AddRange(files);
+            files.AddRange(GetFilesInADirectory(directoryPath));
         }
-        catch (IOException)
+        catch (IOException) when (ignoreIOExceptions)
         {
-            if (!ignoreIOExceptions)
-            {
-                throw;
-            }
         }
 
         foreach (string subDirectoryPath in GetDirectoriesInADirectory(directoryPath))
@@ -204,14 +199,10 @@ public virtual List<string> AddFilesFromDirectory(string directoryPath, Func<str
                 continue;
             }
 
-            List<string> subDirectoryContents = AddFilesFromDirectory(subDirectoryPath, ignoreDirectory, true);
-            if (subDirectoryContents.Count > 0)
-            {
-                fileContents.AddRange(subDirectoryContents);
-            }
+            files.AddRange(AddFilesFromDirectory(subDirectoryPath, ignoreDirectory, true));
         }
 
-        return fileContents;
+        return files;
     }
 
     public static string TryConvertPathToRelative(string path, string rootDir)