Merge pull request #3379 from calumgrant/cs/nullability-warning

hvitved · web-flow · commit b03e87f62310 · 2020-04-30T08:38:28.000+02:00
C#: Remove nullability warnings
diff --git a/csharp/autobuilder/Semmle.Autobuild/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild/Autobuilder.cs
@@ -118,6 +118,24 @@ void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)> results
         /// </summary>
         public IBuildActions Actions { get; }
 
+        IEnumerable<IProjectOrSolution>? FindFiles(string extension, Func<string, ProjectOrSolution> create)
+        {
+            var matchingFiles = GetExtensions(extension).
+                Select(p => (ProjectOrSolution: create(p.Item1), DistanceFromRoot: p.Item2)).
+                Where(p => p.ProjectOrSolution.HasLanguage(this.Options.Language)).
+                ToArray();
+
+            if (matchingFiles.Length == 0)
+               return null;
+
+            if (Options.AllSolutions)
+               return matchingFiles.Select(p => p.ProjectOrSolution);
+
+            return matchingFiles.
+                Where(f => f.DistanceFromRoot == matchingFiles[0].DistanceFromRoot).
+                Select(f => f.ProjectOrSolution);
+        }
+
         /// <summary>
         /// Find all the relevant files and picks the best
         /// solution file and tools.
@@ -151,24 +169,6 @@ public Autobuilder(IBuildActions actions, AutobuildOptions options)
                     return ret;
                 }
 
-                IEnumerable<IProjectOrSolution>? FindFiles(string extension, Func<string, ProjectOrSolution> create)
-                {
-                    var matchingFiles = GetExtensions(extension).
-                        Select(p => (ProjectOrSolution: create(p.Item1), DistanceFromRoot: p.Item2)).
-                        Where(p => p.ProjectOrSolution.HasLanguage(this.Options.Language)).
-                        ToArray();
-
-                    if (matchingFiles.Length == 0)
-                        return null;
-
-                    if (options.AllSolutions)
-                        return matchingFiles.Select(p => p.ProjectOrSolution);
-
-                    return matchingFiles.
-                        Where(f => f.DistanceFromRoot == matchingFiles[0].DistanceFromRoot).
-                        Select(f => f.ProjectOrSolution);
-                }
-
                 // First look for `.proj` files
                 ret = FindFiles(".proj", f => new Project(this, f))?.ToList();
                 if (ret != null)
