Some refactorings to improve clarity.

Author: MDoerner

Rubberduck.Parsing/Annotations/VBAParserAnnotationFactory.cs

@@ -28,18 +28,29 @@ public VBAParserAnnotationFactory()
         public IAnnotation Create(VBAParser.AnnotationContext context, QualifiedSelection qualifiedSelection)
         {
             string annotationName = context.annotationName().GetText();
-            List<string> parameters = new List<string>();
-            var argList = context.annotationArgList();
-            if (argList != null)
+            List<string> parameters = AnnotationParametersFromContext(context);
+            return CreateAnnotation(annotationName, parameters, qualifiedSelection);
+        }
+
+            private static List<string> AnnotationParametersFromContext(VBAParser.AnnotationContext context)
             {
-                parameters.AddRange(argList.annotationArg().Select(arg => arg.GetText()));
+                List<string> parameters = new List<string>();
+                var argList = context.annotationArgList();
+                if (argList != null)
+                {
+                    parameters.AddRange(argList.annotationArg().Select(arg => arg.GetText()));
+                }
+                return parameters;
             }
-            Type annotationCLRType = null;
-            if (_creators.TryGetValue(annotationName.ToUpperInvariant(), out annotationCLRType))
+
+            private IAnnotation CreateAnnotation(string annotationName, List<string> parameters, QualifiedSelection qualifiedSelection)
             {
-                return (IAnnotation)Activator.CreateInstance(annotationCLRType, qualifiedSelection, parameters);
+                Type annotationCLRType = null;
+                if (_creators.TryGetValue(annotationName.ToUpperInvariant(), out annotationCLRType))
+                {
+                    return (IAnnotation)Activator.CreateInstance(annotationCLRType, qualifiedSelection, parameters);
+                }
+                return null;
             }
-            return null;
-        }
     }
 }

Rubberduck.Parsing/Binding/DefaultBindingContext.cs

@@ -34,7 +34,6 @@ public IBoundExpression Resolve(Declaration module, Declaration parent, ParserRu
         public IExpressionBinding BuildTree(Declaration module, Declaration parent, ParserRuleContext expression, IBoundExpression withBlockVariable, StatementResolutionContext statementContext)
         {
             dynamic dynamicExpression = expression;
-            var type = expression.GetType();
             return Visit(module, parent, dynamicExpression, withBlockVariable, statementContext);
         }
 

Rubberduck.Parsing/Binding/SimpleNameDefaultBinding.cs

@@ -350,25 +350,34 @@ private bool IsValidMatch(Declaration match, string name)
             {
                 return true;
             }
-            var functionSubroutinePropertyGet = match.DeclarationType == DeclarationType.Function
-                || match.DeclarationType == DeclarationType.Procedure
-                || match.DeclarationType == DeclarationType.PropertyGet;
-            if (!functionSubroutinePropertyGet)
+            if (!IsFunctionSubroutinePropertyGet(match))
             {
                 return true;
             }
             if (((IDeclarationWithParameter)match).Parameters.Count() > 0)
             {
                 return true;
             }
-            if (match.AsTypeName != null
-                && match.AsTypeName.ToUpperInvariant() != "VARIANT"
-                && match.AsTypeName.ToUpperInvariant() != "OBJECT"
-                && match.AsTypeIsBaseType)
+            if (IsTypeDeclarationOfSpecificBaseType(match))
             {
                 return false;
             }
             return true;
         }
+
+            private static bool IsFunctionSubroutinePropertyGet(Declaration match)
+            {
+                return match.DeclarationType == DeclarationType.Function
+                        || match.DeclarationType == DeclarationType.Procedure
+                        || match.DeclarationType == DeclarationType.PropertyGet;
+            }
+
+            private static bool IsTypeDeclarationOfSpecificBaseType(Declaration match)
+            {
+                return match.AsTypeName != null
+                        && match.AsTypeName.ToUpperInvariant() != "VARIANT"
+                        && match.AsTypeName.ToUpperInvariant() != "OBJECT"
+                        && match.AsTypeIsBaseType;
+            }
     }
 }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -159,25 +159,31 @@ public Declaration(
 
             _projectId = _qualifiedName.QualifiedModuleName.ProjectId;
 
-            var @namespace = Annotations.FirstOrDefault(annotation => annotation.AnnotationType == AnnotationType.Folder);
-            string result;
-            if (@namespace == null)
-            {
-                result = _qualifiedName.QualifiedModuleName.Project == null
-                    ? _projectId
-                    : _qualifiedName.QualifiedModuleName.Project.Name;
-            }
-            else
-            {
-                var value = ((FolderAnnotation)@namespace).FolderName;
-                result = value;
-            }
-            _customFolder = result;
+            _customFolder = FolderFromAnnotations();
             _isArray = isArray;
             _asTypeContext = asTypeContext;
             _typeHint = typeHint;
         }
 
+            private string FolderFromAnnotations()
+            {
+                var @namespace = Annotations.FirstOrDefault(annotation => annotation.AnnotationType == AnnotationType.Folder);
+                string result;
+                if (@namespace == null)
+                {
+                    result = _qualifiedName.QualifiedModuleName.Project == null
+                        ? _projectId
+                        : _qualifiedName.QualifiedModuleName.Project.Name;
+                }
+                else
+                {
+                    var value = ((FolderAnnotation)@namespace).FolderName;
+                    result = value;
+                }
+                return result;
+            }
+
+
         public static Declaration GetModuleParent(Declaration declaration)
         {
             if (declaration == null)