account for enums, clean up dead code

Author: retailcoder

Rubberduck.Inspections/VariableRequiresSetAssignmentEvaluator.cs

@@ -55,7 +55,7 @@ public static bool RequiresSetAssignment(IdentifierReference reference, Rubberdu
                 return false;
             }
 
-            var isObjectVariable = declaration.IsObject();
+            var isObjectVariable = declaration.IsObject;
             var isVariant = declaration.IsUndeclared || declaration.AsTypeName == Tokens.Variant;
             if (!isObjectVariable && !isVariant)
             {
@@ -180,76 +180,5 @@ private static bool IsVariableOrParameter(Declaration item)
             return item.DeclarationType == DeclarationType.Variable
                     || item.DeclarationType == DeclarationType.Parameter;
         }
-
-        private static bool ObjectOrVariantRequiresSetAssignment(IdentifierReference objectOrVariantRef, IEnumerable<Declaration> variantAndObjectDeclarations)
-        {
-            //Not an assignment...nothing to evaluate
-            if (!objectOrVariantRef.IsAssignment)
-            {
-                return false;
-            }
-
-            if (objectOrVariantRef.Declaration.AsTypeName != Tokens.Variant)
-            {
-                return true;
-            }
-
-            //Variants can be assigned with or without 'Set' depending...
-            var letStmtContext = objectOrVariantRef.Context.GetAncestor<VBAParser.LetStmtContext>();
-
-            //A potential error is only possible for let statements: rset, lset and other type specific assignments are always let assignments; 
-            //assignemts in for each loop statements are do not require the set keyword.
-            if(letStmtContext == null)
-            {
-                return false;
-            }
-
-            //You can only new up objects.
-            if (RHSUsesNew(letStmtContext))
-            {
-                return true;
-            }
-
-            if (RHSIsLiteral(letStmtContext))
-            {
-                if(RHSIsObjectLiteral(letStmtContext))
-                {
-                    return true;
-                }
-                //All literals but the object literal potentially do not need a set assignment.
-                //We cannot get more information from the RHS and do not want false positives.
-                return false;
-            }
-
-            //If the RHS is the identifierName of one of the 'interesting' declarations, we need to use 'Set'
-            //unless the 'interesting' declaration is also a Variant
-            var rhsIdentifier = GetRHSIdentifierExpressionText(letStmtContext);
-            return variantAndObjectDeclarations.Any(dec => dec.IdentifierName == rhsIdentifier 
-                && dec.AsTypeName != Tokens.Variant
-                && dec.Attributes.HasDefaultMemberAttribute(dec.IdentifierName, out _));
-        }
-
-        private static string GetRHSIdentifierExpressionText(VBAParser.LetStmtContext letStmtContext)
-        {
-            var expression = letStmtContext.expression();
-            return expression is VBAParser.LExprContext ? expression.GetText() : string.Empty;
-        }
-
-        private static bool RHSUsesNew(VBAParser.LetStmtContext letStmtContext)
-        {
-            var expression = letStmtContext.expression();
-            return (expression is VBAParser.NewExprContext);
-        }
-
-        private static bool RHSIsLiteral(VBAParser.LetStmtContext letStmtContext)
-        {
-            return letStmtContext.expression() is VBAParser.LiteralExprContext;                   
-        }
-
-        private static bool RHSIsObjectLiteral(VBAParser.LetStmtContext letStmtContext)
-        {
-            var rhsAsLiteralExpr = letStmtContext.expression() as VBAParser.LiteralExprContext;
-            return rhsAsLiteralExpr?.literalExpression()?.literalIdentifier()?.objectLiteralIdentifier() != null;
-        }
     }
 }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -339,12 +339,13 @@ private static string CorrectlyFormatedDescription(string literalDescription)
         /// </summary>
         public bool IsEnumeratorMember => _attributes.Any(a => a.Name.EndsWith("VB_UserMemId") && a.Values.Contains("-4"));
 
-        public virtual bool IsObject()
-        {
-            return AsTypeName == Tokens.Object
-                   || (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.ClassModule) ?? false)
-                   || (!AsTypeIsBaseType && !IsArray && !DeclarationType.HasFlag(DeclarationType.UserDefinedType));
-        }
+        public virtual bool IsObject => 
+            AsTypeName == Tokens.Object
+            || (AsTypeDeclaration?.DeclarationType.HasFlag(DeclarationType.ClassModule) ?? false)
+            && !AsTypeIsBaseType 
+            && !IsArray 
+            && !DeclarationType.HasFlag(DeclarationType.UserDefinedType) 
+            && !DeclarationType.HasFlag(DeclarationType.Enumeration);
 
         public void AddReference(
             QualifiedModuleName module,

Rubberduck.Parsing/Symbols/PropertyLetDeclaration.cs

@@ -77,10 +77,7 @@ public void AddParameter(ParameterDeclaration parameter)
         /// </summary>
         public bool IsDefaultMember => Attributes.Any(a => a.Name == $"{IdentifierName}.VB_UserMemId" && a.Values.Single() == "0");
 
-        public override bool IsObject()
-        {
-            return base.IsObject()
-                   || (Parameters.OrderBy(p => p.Selection).LastOrDefault()?.IsObject() ?? false);
-        }
+        public override bool IsObject => 
+            base.IsObject || (Parameters.OrderBy(p => p.Selection).LastOrDefault()?.IsObject ?? false);
     }
 }

Rubberduck.Parsing/Symbols/PropertySetDeclaration.cs

@@ -76,10 +76,7 @@ public void AddParameter(ParameterDeclaration parameter)
         /// </summary>
         public bool IsDefaultMember => Attributes.Any(a => a.Name == $"{IdentifierName}.VB_UserMemId" && a.Values.Single() == "0");
 
-        public override bool IsObject()
-        {
-            return base.IsObject()
-                || (Parameters.OrderBy(p => p.Selection).LastOrDefault()?.IsObject() ?? false);
-        }
+        public override bool IsObject =>
+            base.IsObject || (Parameters.OrderBy(p => p.Selection).LastOrDefault()?.IsObject ?? false);
     }
 }