Fixes newly discovered bugs

Author: BZngr

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/ParseTreeValueVisitor.cs

@@ -279,9 +279,9 @@ private void GetContextValue(ParserRuleContext context, out string declaredTypeN
         private bool TryGetIdentifierReferenceForContext(ParserRuleContext context, out IdentifierReference idRef)
         {
             idRef = null;
-            var nameToMatch = context.GetText();
-            var identifierReferences = (_state.DeclarationFinder.MatchName(context.GetText()).Select(dec => dec.References)).SelectMany(rf => rf);
-            if (identifierReferences.Any(rf => rf.Context == context))
+            var identifierReferences = (_state.DeclarationFinder.MatchName(context.GetText()).Select(dec => dec.References)).SelectMany(rf => rf)
+                .Where(rf => rf.Context == context);
+            if (identifierReferences.Count() == 1)
             {
                 idRef = identifierReferences.First();
                 return true;

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/RangeClauseFilter.cs

@@ -156,6 +156,11 @@ public void Add(IRangeClauseFilter filter)
             {
                 AddSingleValueImpl(val);
             }
+
+            foreach (var val in newFilter.VariableSingleValues)
+            {
+                VariableSingleValues.Add(val);
+            }
             _descriptorIsDirty = true;
         }
 

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UnreachableCaseInspection.cs

@@ -18,7 +18,6 @@ public sealed class UnreachableCaseInspection : ParseTreeInspectionBase
         private IParseTreeValueVisitorFactory _parseTreeVisitorFactory;
         private ISelectCaseStmtContextWrapperFactory _selectStmtFactory;
         private IParseTreeValueFactory _valueFactory;
-        private IParseTreeValueVisitor _parseTreeValueVisitor;
         private enum CaseInpectionResult { Unreachable, MismatchType, CaseElse };
 
         private static Dictionary<CaseInpectionResult, string> ResultMessages = new Dictionary<CaseInpectionResult, string>()
@@ -36,16 +35,14 @@ public UnreachableCaseInspection(RubberduckParserState state) : base(state)
             _selectStmtFactory = factoriesFactory.CreateISelectStmtContextWrapperFactory();
             _valueFactory = factoriesFactory.CreateIParseTreeValueFactory();
             _parseTreeVisitorFactory = factoriesFactory.CreateIParseTreeValueVisitorFactory();
-
-            _parseTreeValueVisitor = _parseTreeVisitorFactory.Create(State, _valueFactory);
         }
 
         public override IInspectionListener Listener { get; } =
             new UnreachableCaseInspectionListener();
 
         private List<IInspectionResult> InspectionResults { set; get; } = new List<IInspectionResult>();
 
-        private ParseTreeVisitorResults ValueResults { get; } = new ParseTreeVisitorResults();
+        private ParseTreeVisitorResults ValueResults { set; get; } = new ParseTreeVisitorResults();
 
         protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
@@ -54,6 +51,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
                 .Where(result => !IsIgnoringInspectionResultFor(result.ModuleName, result.Context.Start.Line));
 
             var parseTreeValueVisitor = _parseTreeVisitorFactory.Create(State, _valueFactory);
+            ValueResults = new ParseTreeVisitorResults();
             parseTreeValueVisitor.OnValueResultCreated += ValueResults.OnNewValueResult;
 
             foreach (var qualifiedSelectCaseStmt in qualifiedSelectCaseStmts)

RubberduckTests/Inspections/UnreachableCaseInspectionTests.cs

@@ -596,6 +596,7 @@ public void UciUnit_FilterBoolean(string firstCase, string secondCase, string ex
             Assert.AreEqual(expected, filteredResults);
         }
 
+        [TestCase("Range:3:55", "Single=x.Item(2)", "Range:3:55,Single=x.Item(2)")]
         [TestCase("Range=3:55", "IsLT=6", "IsLT=6,Range=6:55")]
         [TestCase("Range=3:55", "IsGT=6", "IsGT=6,Range=3:6")]
         [TestCase("IsLT=6", "Range=1:5", "IsLT=6")]
@@ -2544,6 +2545,38 @@ Public Const MY_CONSTANT As <propertyTypeAndAssignment>
             CheckActualResultsEqualsExpected(components, unreachable: 1);
         }
 
+        [Test]
+        [Category("Inspections")]
+        public void UciFunctional_DuplicateSelectExpressionVariableInModule()
+        {
+            string inputCode =
+@"
+Sub FirstSub(x As Long)
+    Select Case x
+        Case 55
+            MsgBox CStr(x)
+        Case 56
+            MsgBox CStr(x)
+        Case 55
+            MsgBox ""Unreachable""
+    End Select
+End Sub
+
+Sub SecondSub(x As Boolean)
+    Select Case x
+        Case 55
+            MsgBox CStr(x)
+        Case 0
+            MsgBox CStr(x)
+        Case Else
+            MsgBox ""Unreachable""
+    End Select
+End Sub
+";
+
+            CheckActualResultsEqualsExpected(inputCode, unreachable: 1, caseElse: 1);
+        }
+
         private static void CheckActualResultsEqualsExpected(string inputCode, int unreachable = 0, int mismatch = 0, int caseElse = 0)
         {
             var components = new List<Tuple<string, string>>()