Handle Is clause with variable

Author: BZngr

Rubberduck.Inspections/Concrete/UnreachableCaseInspection/UCIRangeClauseFilter.cs

@@ -110,39 +110,34 @@ public bool ContainsFilters
         }
 
         //IUCIRangeClauseFilter
-        public void Add(IUCIRangeClauseFilter filterToAdd)
+        public void Add(IUCIRangeClauseFilter filter)
         {
-            var itf = (UCIRangeClauseFilter<T>)filterToAdd;
-            if (itf.TryGetIsLTValue(out T isLT))
+            var newFilter = (UCIRangeClauseFilter<T>)filter;
+            if (newFilter.TryGetIsLTValue(out T isLT))
             {
                 AddIsClauseImpl(isLT, CompareTokens.LT);
             }
-            if (itf.TryGetIsGTValue(out T isGT))
+            if (newFilter.TryGetIsGTValue(out T isGT))
             {
                 AddIsClauseImpl(isGT, CompareTokens.GT);
             }
 
-            //var ranges = itf.RangeValues;
-            foreach (var tuple in itf.RangeValues)
+            foreach (var tuple in newFilter.RangeValues)
             {
                 AddValueRangeImpl(tuple.Item1, tuple.Item2);
             }
 
-            //var varRanges = itf.VariableRanges;
-            foreach (var val in itf.VariableRanges)
+            foreach (var val in newFilter.VariableRanges)
             {
                 _variableRanges.Add(val);
-                //AddValueRangeImpl(tuple.Item1, tuple.Item2);
             }
 
-            //var relOps = itf.RelationalOps;
-            foreach (var op in itf.RelationalOps)
+            foreach (var op in newFilter.RelationalOps)
             {
                 AddRelationalOpImpl(op);
             }
 
-            //var singleVals = itf.SingleValues;
-            foreach (var val in itf.SingleValues)
+            foreach (var val in newFilter.SingleValues)
             {
                 AddSingleValueImpl(val);
             }
@@ -151,7 +146,14 @@ public void Add(IUCIRangeClauseFilter filterToAdd)
         //IUCIRangeClauseFilter
         public void AddIsClause(IUCIValue value, string opSymbol)
         {
-            AddIsClauseImpl(_tConverter(value), opSymbol);
+            if (value.ParsesToConstantValue)
+            {
+                AddIsClauseImpl(_tConverter(value), opSymbol);
+            }
+            else
+            {
+                AddRelationalOpImpl(value.ValueText);
+            }
         }
 
         //IUCIRangeClauseFilter

RubberduckTests/Inspections/UnreachableCaseInspectionTests.cs

@@ -449,6 +449,7 @@ public void UciUnit_AddRangeClauses(string firstCase, string filterTypeName, str
         [TestCase("Is_<>_100#", "Double", "IsLT=100,IsGT=100")]
         [TestCase("Is_<>_True", "Boolean", "RelOp=Is <> True")]
         [TestCase(@"Is_<>_""100""", "Long", "IsLT=100,IsGT=100")]
+        [TestCase("Is_>_x", "Long", "IsLT=x")]
         [Category("Inspections")]
         public void UciUnit_AddIsClauses(string firstCase, string filterTypeName, string expectedRangeClauses)
         {
@@ -465,6 +466,7 @@ public void UciUnit_AddIsClauses(string firstCase, string filterTypeName, string
             Assert.AreEqual(expectedResult.First().ToString(), UUT.ToString());
         }
 
+        [TestCase("IsLT=z,Single=45", "IsLT=z", "Single=45")]
         [TestCase("Single=z,Single=45", "Single=z", "Single=45")]
         [TestCase("Range=20:x,Single=45", "Range=20:x", "Single=45")]
         [TestCase("IsLT=45,Range=20:70", "IsLT=45", "Range=45:70")]
@@ -2055,6 +2057,38 @@ End Select
             CheckActualResultsEqualsExpected(inputCode, unreachable: 2);
         }
 
+        [TestCase("<")]
+        [TestCase(">")]
+        [TestCase("<=")]
+        [TestCase(">=")]
+        [TestCase("<>")]
+        [TestCase("=")]
+        [Category("Inspections")]
+        public void UciFunctional_IsStmtVariables(string opSymbol)
+        {
+            string inputCode =
+@"
+        private const START As Long = 10
+        private const FINISH As Long = 3
+
+        Sub Foo(x As Long, y As Long, z As Long)
+        Select Case z
+            Case 95
+            'OK
+            Case Is <opSymbol> x
+            'OK
+            Case -START To FINISH 
+            'OK
+            Case Is <opSymbol> y 
+            'Unreachable
+        End Select
+
+        End Sub";
+
+            inputCode = inputCode.Replace("<opSymbol>", opSymbol);
+            CheckActualResultsEqualsExpected(inputCode, unreachable: 1);
+        }
+
         private static void CheckActualResultsEqualsExpected(string inputCode, int unreachable = 0, int mismatch = 0, int caseElse = 0)
         {
             var expected = new Dictionary<string, int>
@@ -2260,6 +2294,5 @@ private string RestoreModifieStringForRelationalOps(string modified)
             clauseExpression = clauseExpression.Replace(" @ ", " = ");
             return clauseExpression;
         }
-
     }
 }