closes #5824

rubberduck-vba · Oct 12, 2021 · 8c47d89 · 8c47d89
1 parent 60c347b
commit 8c47d89
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/AssignmentNotUsedInspection.cs
@@ -83,8 +83,7 @@ protected override IEnumerable<IdentifierReference> ReferencesInModule(Qualified
 
         protected override bool IsResultReference(IdentifierReference reference, DeclarationFinder finder)
         {
-            return !(IsAssignmentOfNothing(reference)
-                        || IsPotentiallyUsedViaJump(reference, finder));
+            return !(IsAssignmentOfNothing(reference) || IsPotentiallyUsedViaJump(reference, finder));
         }
 
         protected override string ResultDescription(IdentifierReference reference)
@@ -115,8 +114,11 @@ private static IEnumerable<IdentifierReference> FindUnusedAssignmentReferences(D
                         ? FindUnusedAssignmentNodes(tree, localVariable, allAssignmentsAndReferences)
                         : allAssignmentsAndReferences.OfType<AssignmentNode>();
 
-            return unusedAssignmentNodes.Where(n => !IsDescendentOfNeverFlagNode(n))
-                                        .Select(n => n.Reference);
+            var results = unusedAssignmentNodes
+                .Where(n => !IsDescendentOfNeverFlagNode(n))
+                .Select(n => n.Reference);
+
+            return results;
         }
 
         private static IEnumerable<AssignmentNode> FindUnusedAssignmentNodes(INode node, Declaration localVariable, IEnumerable<INode> allAssignmentsAndReferences)
@@ -136,7 +138,7 @@ private static IEnumerable<AssignmentNode> FindUnusedAssignmentNodes(INode node,
                     ? assignmentExprNodes.TakeWhile(n => n != assignmentExprNodesWithReference.LastOrDefault())
                                                 ?.LastOrDefault()
                                                 ?.Nodes(new[] { typeof(AssignmentNode) })
-                    : allAssignmentsAndReferences.TakeWhile(n => n != refNode)
+                    : allAssignmentsAndReferences.TakeWhile(n => n != refNode && !IsDescendentOfNeverFlagNode(n))
                         .OfType<AssignmentNode>();
 
                 if (assignmentsPrecedingReference?.Any() ?? false)
@@ -148,7 +150,7 @@ private static IEnumerable<AssignmentNode> FindUnusedAssignmentNodes(INode node,
             return allAssignmentsAndReferences.OfType<AssignmentNode>().Except(usedAssignments);
         }
 
-        private static bool IsDescendentOfNeverFlagNode(AssignmentNode assignment)
+        private static bool IsDescendentOfNeverFlagNode(INode assignment)
         {
             return assignment.TryGetAncestorNode<BranchNode>(out _)
                 || assignment.TryGetAncestorNode<LoopNode>(out _);

diff --git a/RubberduckTests/Inspections/AssignmentNotUsedInspectionTests.cs b/RubberduckTests/Inspections/AssignmentNotUsedInspectionTests.cs
@@ -789,6 +789,26 @@ End Function
             Assert.AreEqual(expected, results.Count());
         }
 
+        [Test]
+        public void ConditionalAssignments_NotConsideredForOverwritingAssignment()
+        {
+            string code =
+$@"
+Public Function Test() As Boolean
+    Dim value As Boolean
+    value = True
+
+    If True Then
+        value = False
+    End If
+
+    Test = value
+End Function
+";
+            var results = InspectionResultsForStandardModule(code);
+            Assert.AreEqual(0, results.Count());
+        }
+
         [Test]
         public void ResumeStmt_SingleResult()
         {