Rubberduck.Inspections

rubberduck-vba · Nov 27, 2017 · 499ad93 · 499ad93
1 parent 26d3dfb
commit 499ad93
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/Rubberduck.Inspections/Inspector.cs b/Rubberduck.Inspections/Inspector.cs
@@ -25,7 +25,7 @@ public class Inspector : IInspector
 
             private readonly IGeneralConfigService _configService;
             private readonly List<IInspection> _inspections;
-            private readonly int AGGREGATION_THRESHOLD = 128;
+            private const int AGGREGATION_THRESHOLD = 128;
 
             public Inspector(IGeneralConfigService configService, IEnumerable<IInspection> inspections)
             {

diff --git a/Rubberduck.Inspections/QuickFixProvider.cs b/Rubberduck.Inspections/QuickFixProvider.cs
@@ -41,8 +41,10 @@ public IEnumerable<IQuickFix> QuickFixes(IInspectionResult result)
 
             return _quickFixes[result.Inspection.GetType()].Where(fix =>
             {
-                string value;
-                if (!result.Properties.TryGetValue("DisableFixes", out value)) { return true; }
+                if (!result.Properties.TryGetValue("DisableFixes", out var value))
+                {
+                    return true;
+                }
 
                 return !value.Split(',').Contains(fix.GetType().Name);
             })

diff --git a/Rubberduck.Inspections/VariableRequiresSetAssignmentEvaluator.cs b/Rubberduck.Inspections/VariableRequiresSetAssignmentEvaluator.cs
@@ -22,13 +22,22 @@ public static IEnumerable<Declaration> GetDeclarationsPotentiallyRequiringSetAss
         public static bool RequiresSetAssignment(IdentifierReference reference, RubberduckParserState state)
         {
             //Not an assignment...definitely does not require a 'Set' assignment
-            if (!reference.IsAssignment) { return false; }
+            if (!reference.IsAssignment)
+            {
+                return false;
+            }
 
             //We know for sure it DOES NOT use 'Set'
-            if (!MayRequireAssignmentUsingSet(reference.Declaration)) { return false; }
+            if (!MayRequireAssignmentUsingSet(reference.Declaration))
+            {
+                return false;
+            }
 
             //We know for sure that it DOES use 'Set'
-            if (RequiresAssignmentUsingSet(reference.Declaration)) { return true; }
+            if (RequiresAssignmentUsingSet(reference.Declaration))
+            {
+                return true;
+            }
 
             //We need to look everything to understand the RHS - the assigned reference is probably a Variant 
             var allInterestingDeclarations = GetDeclarationsPotentiallyRequiringSetAssignment(state.AllUserDeclarations);
@@ -38,11 +47,20 @@ public static bool RequiresSetAssignment(IdentifierReference reference, Rubberdu
 
         private static bool MayRequireAssignmentUsingSet(Declaration declaration)
         {
-            if (declaration.DeclarationType == DeclarationType.PropertyLet) { return false; }
+            if (declaration.DeclarationType == DeclarationType.PropertyLet)
+            {
+                return false;
+            }
 
-            if (declaration.AsTypeName == Tokens.Variant) { return true; }
+            if (declaration.AsTypeName == Tokens.Variant)
+            {
+                return true;
+            }
 
-            if (declaration.IsArray) { return false; }
+            if (declaration.IsArray)
+            {
+                return false;
+            }
 
             if (declaration.AsTypeDeclaration != null)
             {