fixed bug with defaultMember logic

rubberduck-vba · Jan 22, 2018 · 97c224d · 97c224d
1 parent 1a13a0d
commit 97c224d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Rubberduck.Inspections/VariableRequiresSetAssignmentEvaluator.cs b/Rubberduck.Inspections/VariableRequiresSetAssignmentEvaluator.cs
@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Windows.Forms;
 
 namespace Rubberduck.Inspections
 {

diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -342,7 +342,8 @@ private static string CorrectlyFormatedDescription(string literalDescription)
         public virtual bool IsObject()
         {
             return AsTypeName == Tokens.Object
-                   || (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.ClassModule) ?? false);
+                   || (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.ClassModule) ?? false)
+                   || (!AsTypeIsBaseType && !IsArray && !DeclarationType.HasFlag(DeclarationType.UserDefinedType));
         }
 
         public void AddReference(

diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
@@ -194,7 +194,7 @@ private void ResolveLabel(ParserRuleContext context, string label)
             {
                 var module = boundExpression.ReferencedDeclaration.AsTypeDeclaration;
                 var members = _declarationFinder.Members(module);
-                defaultMember = (IParameterizedDeclaration)members.SingleOrDefault(m => m is IParameterizedDeclaration && m.Attributes.HasDefaultMemberAttribute());
+                defaultMember = (IParameterizedDeclaration)members.FirstOrDefault(m => m is IParameterizedDeclaration && m.Attributes.HasDefaultMemberAttribute() && (isAssignmentTarget ? m.DeclarationType.HasFlag(DeclarationType.Procedure) : m.DeclarationType.HasFlag(DeclarationType.Function)));
             }
             _boundExpressionVisitor.AddIdentifierReferences(boundExpression, _qualifiedModuleName, _currentScope, _currentParent, isAssignmentTarget && (defaultMember == null || (!defaultMember.Parameters.Any() || defaultMember.Parameters.All(p => p.IsOptional)) || isSetAssignment), hasExplicitLetStatement);
         }

diff --git a/RubberduckTests/QuickFixes/UseSetKeywordForObjectAssignmentQuickFixTests.cs b/RubberduckTests/QuickFixes/UseSetKeywordForObjectAssignmentQuickFixTests.cs
@@ -57,16 +57,16 @@ public void ObjectVariableNotSet_ForPropertyGetAssignment_ReturnsResults()
         {
             var expectedResultCount = 1;
             var input = @"
-Private example As MyObject
+Private m_example As MyObject
 Public Property Get Example() As MyObject
-    Example = example
+    Example = m_example
 End Property
 ";
             var expectedCode =
                 @"
-Private example As MyObject
+Private m_example As MyObject
 Public Property Get Example() As MyObject
-    Set Example = example
+    Set Example = m_example
 End Property
 ";