Fix deleted items finding projects in sub folders (#531)

Author: adegeo

snippets5000/PullRequestSimulations/data.json

@@ -63,6 +63,17 @@
       }
     ]
   },
+  {
+    "Name": "Delete - Stray CS file, other projects below",
+    "CountOfEmptyResults": 1,
+    "ExpectedResults": null,
+    "Items": [
+      {
+        "ItemType": "Delete",
+        "Path": "snippets/good/deeper-path/codefile.cs"
+      }
+    ]
+  },
   {
     "Name": "Create - New proj, find sln",
     "ExpectedResults": [

snippets5000/Snippets5000/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Test via GitHub": {
       "commandName": "Project",
-      "commandLineArgs": "--sourcepath C:\\Users\\wiwagn\\source\\docs --owner dotnet --repo docs --pullrequest 38723",
+      "commandLineArgs": "--sourcepath C:\\Users\\adegeo\\code\\dotnet-api-docs --owner dotnet --repo dotnet-api-docs --pullrequest 11502",
       "environmentVariables": {
         "ExtensionsProjs": ".csproj;.fsproj;.vbproj;.vcxproj;.sln",
         "ExtensionsCodeTriggers": ".cs;.vb;.fs;.cpp;.h;.xaml;.razor;.cshtml;.vbhtml",
@@ -21,4 +21,4 @@
       }
     }
   }
-}
+}

snippets5000/Snippets5000/PullRequestProcessor.cs

@@ -91,7 +91,7 @@ private async IAsyncEnumerable<DiscoveryResult> FindAllSolutionsAndProjects(stri
             return null;
 
         // Check for the project/solution to test with was found
-        FindProjectOrSolution(rootDir, itemPath, out string? project, out int countOfSln, out int countOfProjs, out int countOfCode, out int countOfSpecial, ref projectsFound);
+        FindProjectOrSolution(rootDir, itemPath, itemWasDeleted, out string? project, out int countOfSln, out int countOfProjs, out int countOfCode, out int countOfSpecial, ref projectsFound);
 
         // If it's a solution file, check that all the projects are referenced in it:
         if (countOfSln == 1)
@@ -134,7 +134,7 @@ private async IAsyncEnumerable<DiscoveryResult> FindAllSolutionsAndProjects(stri
         };
     }
 
-    static void FindProjectOrSolution(string rootDir, string itemDirectory, out string? project, out int countOfSln, out int countOfProjs, out int countOfCode, out int countOfSpecial, ref List<string> projectsFound)
+    static void FindProjectOrSolution(string rootDir, string itemDirectory, bool isDeleted, out string? project, out int countOfSln, out int countOfProjs, out int countOfCode, out int countOfSpecial, ref List<string> projectsFound)
     {
         project = null;
         countOfSln = 0;
@@ -146,7 +146,8 @@ static void FindProjectOrSolution(string rootDir, string itemDirectory, out stri
         // If a file is deleted, and no other content is there, the directory won't exist
         if (Directory.Exists(itemDirectory))
         {
-            foreach (var file in Directory.EnumerateFiles(itemDirectory, $"*.*", SearchOption.AllDirectories))
+            // If the item is deleted, we don't need to scan it, but we do need to scan the parents
+            foreach (var file in Directory.EnumerateFiles(itemDirectory, $"*.*", isDeleted ? SearchOption.TopDirectoryOnly : SearchOption.AllDirectories))
                 ScanFile(file, ref project, ref countOfSln, ref countOfProjs, ref countOfCode, ref countOfSpecial, ref projectsFound);
         }