ref. #4037

Author: retailcoder

Rubberduck.CodeAnalysis/Inspections/Concrete/VariableRequiresSetAssignmentEvaluator.cs

@@ -93,23 +93,17 @@ public static bool RequiresSetAssignment(IdentifierReference reference, IDeclara
             }
 
             // todo resolve expression return type
+            var project = Declaration.GetProjectParent(reference.ParentScoping);
+            var module = Declaration.GetModuleParent(reference.ParentScoping);
 
-
-            //var memberRefs = declarationFinderProvider.DeclarationFinder.IdentifierReferences(reference.ParentScoping.QualifiedName);
-            //var lastRef = memberRefs.LastOrDefault(r => r.IsAssignment && !Equals(r, reference) && r.Context.GetAncestor<VBAParser.LetStmtContext>() == letStmtContext);
-            //if (lastRef?.Declaration.AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.ClassModule) ?? false)
-            //{
-            //    // the last reference in the expression is referring to an object type
-            //    return true;
-            //}
-            //if (lastRef?.Declaration.AsTypeName == Tokens.Object)
-            //{
-            //    return true;
-            //}
+            var simpleName = expression.GetDescendent<VBAParser.SimpleNameExprContext>();
+            if (simpleName != null)
+            {
+                return declarationFinderProvider.DeclarationFinder.MatchName(simpleName.identifier().GetText())
+                    .Any(d => AccessibilityCheck.IsAccessible(project, module, reference.ParentScoping, d) && d.IsObject);
+            }
 
             // is the reference referring to something else in scope that's a object?
-            var project = Declaration.GetProjectParent(reference.ParentScoping);
-            var module = Declaration.GetModuleParent(reference.ParentScoping);
             return declarationFinderProvider.DeclarationFinder.MatchName(expression.GetText())
                 .Any(decl => (decl.DeclarationType.HasFlag(DeclarationType.ClassModule) || Tokens.Object.Equals(decl.AsTypeName))
                 && AccessibilityCheck.IsAccessible(project, module, reference.ParentScoping, decl));

RubberduckTests/Inspections/ObjectVariableNotSetInspectionTests.cs

@@ -163,7 +163,7 @@ public void ObjectVariableNotSet_GivenVariantVariableAssignedRange_ReturnsResult
             var input =
 @"
 Private Sub TestSub(ByRef testParam As Variant)
-    testParam = Range(""A1:C1"")    
+    testParam = Range(""A1:C1"")
 End Sub";
             AssertInputCodeYieldsExpectedInspectionResultCount(input, expectResultCount, "Excel.1.8.xml");
         }
@@ -196,7 +196,6 @@ Dim target As Variant
         }
 
         [Test]
-        [Ignore("Broken by COM collector fix, is failing case for default member resolution.  See #4037")]
         [Category("Inspections")]
         public void ObjectVariableNotSet_GivenObjectVariableNotSet_ReturnsResult()
         {
@@ -215,7 +214,6 @@ Dim target As Range
         }
 
         [Test]
-        [Ignore("Broken by COM collector fix, is failing case for default member resolution. See #4037")]
         [Category("Inspections")]
         public void ObjectVariableNotSet_GivenObjectVariableNotSet_Ignored_DoesNotReturnResult()
         {
@@ -235,7 +233,6 @@ Dim target As Range
         }
 
         [Test]
-        [Ignore("Broken by COM collector fix, is failing case for default member resolution. See #4037")]
         [Category("Inspections")]
         public void ObjectVariableNotSet_GivenSetObjectVariable_ReturnsNoResult()
         {