Remove most state from UnreachableCaseInspector

Author: MDoerner

Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseInspection/ExpressionFilter.cs

@@ -17,7 +17,7 @@ public enum VariableClauseTypes
 
     public interface IExpressionFilter
     {
-        void AddExpression(IRangeClauseExpression expression);
+        void CheckAndAddExpression(IRangeClauseExpression expression);
         void AddComparablePredicateFilter(string variable, string variableTypeName);
         bool HasFilters { get; }
         bool FiltersAllValues { get; }
@@ -172,12 +172,12 @@ public virtual IParseTreeValue SelectExpressionValue
             set
             {
                 _selectExpressionValue = value;
-                AddExpression(new IsClauseExpression(_selectExpressionValue, RelationalOperators.NEQ));
+                CheckAndAddExpression(new IsClauseExpression(_selectExpressionValue, RelationalOperators.NEQ));
             }
             get => _selectExpressionValue;
         }
 
-        public void AddExpression(IRangeClauseExpression expression)
+        public void CheckAndAddExpression(IRangeClauseExpression expression)
         {
             if (expression is null
                 || expression.ToString().Equals(string.Empty)
@@ -289,7 +289,7 @@ protected bool AddComparablePredicate(string lhs, IRangeClauseExpression express
                 if (!positiveLogic.FiltersAllValues)
                 {
                     IRangeClauseExpression predicateExpression = new IsClauseExpression(parseTreeValue, expression.OpSymbol);
-                    positiveLogic.AddExpression(predicateExpression);
+                    positiveLogic.CheckAndAddExpression(predicateExpression);
                     if (positiveLogic.FiltersAllValues)
                     {
                         AddSingleValue(_trueValue);
@@ -301,7 +301,7 @@ protected bool AddComparablePredicate(string lhs, IRangeClauseExpression express
                 {
                     IRangeClauseExpression predicateExpressionInverse
                         = new IsClauseExpression(parseTreeValue, RelationalInverse(expression.OpSymbol));
-                    negativeLogic.AddExpression(predicateExpressionInverse);
+                    negativeLogic.CheckAndAddExpression(predicateExpressionInverse);
                     if (negativeLogic.FiltersAllValues)
                     {
                         AddSingleValue(_falseValue);

Rubberduck.CodeAnalysis/Inspections/Concrete/UnreachableCaseInspection/UnreachableCaseInspection.cs

@@ -13,7 +13,6 @@
 using Rubberduck.Parsing.Symbols;
 using System;
 using Rubberduck.Inspections.Inspections.Extensions;
-using Rubberduck.JunkDrawer.Extensions;
 using Rubberduck.Parsing.VBA.DeclarationCaching;
 using Rubberduck.Parsing.VBA.Parsing;
 
@@ -145,38 +144,40 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
             var finder = DeclarationFinderProvider.DeclarationFinder;
             var parseTreeValueVisitor = CreateParseTreeValueVisitor(GetIdentifierReferenceForContextFunction(finder));
+            var selectCaseInspector = _unreachableCaseInspectorFactory.Create(GetVariableTypeNameFunction(finder));
 
             return finder.UserDeclarations(DeclarationType.Module)
                 .Where(module => module != null)
-                .SelectMany(module => DoGetInspectionResults(module.QualifiedModuleName, finder, parseTreeValueVisitor))
+                .SelectMany(module => DoGetInspectionResults(module.QualifiedModuleName, finder, parseTreeValueVisitor, selectCaseInspector))
                 .ToList();
         }
 
         protected override IEnumerable<IInspectionResult> DoGetInspectionResults(QualifiedModuleName module)
         {
             var finder = DeclarationFinderProvider.DeclarationFinder;
             var parseTreeValueVisitor = CreateParseTreeValueVisitor(GetIdentifierReferenceForContextFunction(finder));
-            return DoGetInspectionResults(module, finder, parseTreeValueVisitor);
+            var selectCaseInspector = _unreachableCaseInspectorFactory.Create(GetVariableTypeNameFunction(finder));
+            return DoGetInspectionResults(module, finder, parseTreeValueVisitor, selectCaseInspector);
         }
 
-        private IEnumerable<IInspectionResult> DoGetInspectionResults(QualifiedModuleName module, DeclarationFinder finder, IParseTreeValueVisitor parseTreeValueVisitor)
+        private IEnumerable<IInspectionResult> DoGetInspectionResults(QualifiedModuleName module, DeclarationFinder finder, IParseTreeValueVisitor parseTreeValueVisitor, IUnreachableCaseInspector selectCaseInspector)
         {
             var qualifiedSelectCaseStmts = Listener.Contexts(module)
                 // ignore filtering here to make the search space smaller
                 .Where(result => !result.IsIgnoringInspectionResultFor(finder, AnnotationName));
 
             return qualifiedSelectCaseStmts
-                .SelectMany(context => ResultsForContext(context, finder, parseTreeValueVisitor))
+                .SelectMany(context => ResultsForContext(context, parseTreeValueVisitor, selectCaseInspector))
                 .ToList();
         }
 
-        private IEnumerable<IInspectionResult> ResultsForContext(QualifiedContext<ParserRuleContext> qualifiedSelectCaseStmt, DeclarationFinder finder, IParseTreeValueVisitor parseTreeValueVisitor)
+        private IEnumerable<IInspectionResult> ResultsForContext(QualifiedContext<ParserRuleContext> qualifiedSelectCaseStmt, IParseTreeValueVisitor parseTreeValueVisitor, IUnreachableCaseInspector selectCaseInspector)
         {
             var module = qualifiedSelectCaseStmt.ModuleName;
-            var contextValues = parseTreeValueVisitor.VisitChildren(module, qualifiedSelectCaseStmt.Context);
-            var selectCaseInspector = _unreachableCaseInspectorFactory.Create(module, (VBAParser.SelectCaseStmtContext)qualifiedSelectCaseStmt.Context, contextValues, GetVariableTypeNameFunction(finder));
+            var selectStmt = (VBAParser.SelectCaseStmtContext)qualifiedSelectCaseStmt.Context;
+            var contextValues = parseTreeValueVisitor.VisitChildren(module, selectStmt);
 
-            var results = selectCaseInspector.InspectForUnreachableCases();
+            var results = selectCaseInspector.InspectForUnreachableCases(module, selectStmt, contextValues);
 
             return results
                 .Select(resultTpl => CreateInspectionResult(qualifiedSelectCaseStmt, resultTpl.context, resultTpl.resultType))