Expose utility method for building a disabled skimmers set. (#2787)

* make the code for building the disabled skimmers set into public utility code * fixups * buildFix * fix pr comment
microsoft · Apr 19, 2024 · 1ddaf2a · 1ddaf2a
1 parent a61cf94
commit 1ddaf2a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/ReleaseHistory.md b/ReleaseHistory.md
@@ -19,6 +19,7 @@
   `System.Diagnostics.Debug` 4.3.0,
   `System.IO.FileSystem.Primitives` 4.3.0,
   `System.Text.Encoding.Extensions` 4.3.0.
+* NEW: Expose `MultithreadedAnalyzeCommandBase.BuildDisabledSkimmersSet`, a utility function which extracts a disabled skimmer set from a `TContext`.
 
 ## **v4.5.0 [Sdk](https://www.nuget.org/packages/Sarif.Sdk/v4.5.0) | [Driver](https://www.nuget.org/packages/Sarif.Driver/v4.5.0) | [Converters](https://www.nuget.org/packages/Sarif.Converters/v4.5.0)  | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/v4.5.0) | [Multitool Library](https://www.nuget.org/packages/Sarif.Multitool.Library/v4.5.0)
 * DEP: Downgrade `System.Text.Encoding.CodePages` from 8.0.0 to 4.3.0 in `Sarif`.

diff --git a/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs b/src/Sarif.Driver/Sdk/MultithreadedAnalyzeCommandBase.cs
@@ -1075,6 +1075,21 @@ private static SupportedPlatform GetCurrentRunningOS()
                 ThrowExitApplicationException(ExitReason.NoRulesLoaded);
             }
 
+            ISet<string> disabledSkimmers = BuildDisabledSkimmersSet(context, skimmers);
+
+            if (disabledSkimmers.Count == skimmers.Count())
+            {
+                Errors.LogAllRulesExplicitlyDisabled(context);
+                ThrowExitApplicationException(ExitReason.NoRulesLoaded);
+            }
+
+            this.CheckIncompatibleRules(skimmers, context, disabledSkimmers);
+
+            MultithreadedAnalyzeTargets(context, skimmers, disabledSkimmers);
+        }
+
+        public static ISet<string> BuildDisabledSkimmersSet(TContext context, IEnumerable<Skimmer<TContext>> skimmers)
+        {
             var disabledSkimmers = new SortedSet<string>();
 
             foreach (Skimmer<TContext> skimmer in skimmers)
@@ -1108,15 +1123,7 @@ private static SupportedPlatform GetCurrentRunningOS()
                 }
             }
 
-            if (disabledSkimmers.Count == skimmers.Count())
-            {
-                Errors.LogAllRulesExplicitlyDisabled(context);
-                ThrowExitApplicationException(ExitReason.NoRulesLoaded);
-            }
-
-            this.CheckIncompatibleRules(skimmers, context, disabledSkimmers);
-
-            MultithreadedAnalyzeTargets(context, skimmers, disabledSkimmers);
+            return disabledSkimmers;
         }
 
         protected virtual TContext DetermineApplicabilityAndAnalyze(TContext context,