Fixing more warnings (#2258)

* Fixing more warnings * fixing build issues (Reverting)
microsoft · Jan 22, 2021 · bdc9747 · bdc9747
1 parent a3019d3
commit bdc9747
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/src/Sarif.Converters/Extensions.cs b/src/Sarif.Converters/Extensions.cs
@@ -22,8 +22,8 @@ public static bool HasDefaultConstructor(this Type type)
             return type.GetConstructor(
                             BindingFlags.Instance | BindingFlags.Public,
                             binder: null,
-                            types: new Type[0], // The types of the constructor arguments.
-                            modifiers: new ParameterModifier[0]) != null;
+                            types: Array.Empty<Type>(), // The types of the constructor arguments.
+                            modifiers: Array.Empty<ParameterModifier>()) != null;
         }
 
         // Enforce the convention that the converter type name is derived from the tool name.

diff --git a/src/Sarif.Multitool.Library/Rules/SarifValidationSkimmerBase.cs b/src/Sarif.Multitool.Library/Rules/SarifValidationSkimmerBase.cs
@@ -32,7 +32,7 @@ public abstract class SarifValidationSkimmerBase : Skimmer<SarifValidationContex
 
         protected override sealed ResourceManager ResourceManager => RuleResources.ResourceManager;
 
-        private readonly string[] _emptyMessageResourceNames = new string[0];
+        private readonly string[] _emptyMessageResourceNames = Array.Empty<string>();
 
         protected override IEnumerable<string> MessageResourceNames => _emptyMessageResourceNames;
 

diff --git a/src/Sarif/Baseline/ResultMatching/HeuristicMatchers/IResultMatchingComparer.cs b/src/Sarif/Baseline/ResultMatching/HeuristicMatchers/IResultMatchingComparer.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.CodeAnalysis.Sarif.Baseline.ResultMatching.HeuristicMatchers
 {
-    interface IResultMatchingComparer : IEqualityComparer<ExtractedResult>
+    internal interface IResultMatchingComparer : IEqualityComparer<ExtractedResult>
     {
         /// <summary>
         /// Checks if the result matcher applies to a particular result.

diff --git a/src/Sarif/Baseline/SarifLogBaseliner.cs b/src/Sarif/Baseline/SarifLogBaseliner.cs
@@ -8,7 +8,7 @@ namespace Microsoft.CodeAnalysis.Sarif.Baseline
 {
     internal class SarifLogBaseliner : ISarifLogBaseliner
     {
-        readonly IEqualityComparer<Result> ResultComparator;
+        private readonly IEqualityComparer<Result> ResultComparator;
 
         public SarifLogBaseliner(IEqualityComparer<Result> comparator)
         {

diff --git a/src/Sarif/Errors.cs b/src/Sarif/Errors.cs
@@ -164,7 +164,7 @@ public static void LogExceptionCreatingLogFile(IAnalysisContext context, string
                     ERR997_ExceptionCreatingLogFile,
                     ruleId: null,
                     FailureLevel.Error,
-                    exception: null,
+                    exception: exception,
                     persistExceptionStack: false,
                     messageFormat: null,
                     fileName));
@@ -208,7 +208,7 @@ public static void LogExceptionAccessingFile(IAnalysisContext context, string fi
                     ERR997_ExceptionAccessingFile,
                     ruleId: null,
                     FailureLevel.Error,
-                    exception: null,
+                    exception: exception,
                     persistExceptionStack: false,
                     messageFormat: null,
                     fileName));
@@ -307,7 +307,7 @@ public static void LogExceptionLoadingPlugin(string pluginFilePath, IAnalysisCon
                     ERR997_ExceptionLoadingPlugIn,
                     ruleId: null,
                     FailureLevel.Error,
-                    exception: null,
+                    exception: exception,
                     persistExceptionStack: false,
                     messageFormat: null,
                     pluginFilePath));

diff --git a/src/Sarif/Processors/Generic/GenericActionPipeline.cs b/src/Sarif/Processors/Generic/GenericActionPipeline.cs
@@ -7,7 +7,7 @@ namespace Microsoft.CodeAnalysis.Sarif.Processors
 {
     public class GenericActionPipeline<T> : IActionWrapper<T>
     {
-        readonly IEnumerable<IActionWrapper<T>> _stages;
+        private readonly IEnumerable<IActionWrapper<T>> _stages;
 
         public GenericActionPipeline(IEnumerable<IActionWrapper<T>> stages)
         {

diff --git a/src/Sarif/Visitors/FilteringVisitor.cs b/src/Sarif/Visitors/FilteringVisitor.cs
@@ -24,7 +24,7 @@ public class FilteringVisitor : SarifRewritingVisitor
         private readonly IncludeResultPredicate predicate;
 
         private Run currentRun;
-        bool includeReferencedObjects = true;
+        private bool includeReferencedObjects = true;
 
         private IList<Result> filteredResults;
         private IList<Artifact> filteredArtifacts;

diff --git a/src/Sarif/Writers/PrereleaseCompatibilityTransformer.cs b/src/Sarif/Writers/PrereleaseCompatibilityTransformer.cs
@@ -1852,7 +1852,6 @@ private static JToken ConvertRulesDictionaryToArray(JObject rules, Dictionary<st
             foreach (JProperty ruleEntry in rules.Properties())
             {
                 AddEntryToRuleToIndexMap(
-                    rules,
                     ruleEntry.Name,
                     (JObject)ruleEntry.Value,
                     jObjectToIndexMap,
@@ -1871,7 +1870,7 @@ private static JToken ConvertRulesDictionaryToArray(JObject rules, Dictionary<st
             return new JArray(rulesArray);
         }
 
-        private static void AddEntryToRuleToIndexMap(JObject rulesDictionary, string key, JObject rule, Dictionary<JObject, int> jObjectToIndexMap, Dictionary<string, int> ruleKeyToIndexMap)
+        private static void AddEntryToRuleToIndexMap(string key, JObject rule, Dictionary<JObject, int> jObjectToIndexMap, Dictionary<string, int> ruleKeyToIndexMap)
         {
             ruleKeyToIndexMap = ruleKeyToIndexMap ?? throw new ArgumentNullException(nameof(ruleKeyToIndexMap));
             jObjectToIndexMap = jObjectToIndexMap ?? throw new ArgumentNullException(nameof(jObjectToIndexMap));