Forgot about the parameter count thing, paramarrays.

Author: comintern

Rubberduck.Parsing/ComReflection/ComMember.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using Rubberduck.Parsing.Symbols;
@@ -75,17 +76,16 @@ private void LoadParameters(FUNCDESC funcDesc, ITypeInfo info)
             int count;
             info.GetNames(Index, names, 255, out count);
 
-            for (var index = 0; index < funcDesc.cParams; index++)
+            for (var index = 0; index < count - 1; index++)
             {
                 var paramPtr = new IntPtr(funcDesc.lprgelemdescParam.ToInt64() + Marshal.SizeOf(typeof(ELEMDESC)) * index);
                 var elemDesc = (ELEMDESC)Marshal.PtrToStructure(paramPtr, typeof(ELEMDESC));
                 var param = new ComParameter(elemDesc, info, names[index + 1]);
                 Parameters.Add(param);
-                //TODO:
-                //if (parameters.Any() && memberDescriptor.cParamsOpt == -1)
-                //{
-                //    parameters.Last().IsParamArray = true;
-                //}
+            }
+            if (Parameters.Any() && funcDesc.cParamsOpt == -1)
+            {
+                Parameters.Last().IsParamArray = true;
             }
         }
 

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -151,7 +151,7 @@ public Declaration(
             _accessibility = accessibility;
             _declarationType = declarationType;
             _selection = selection;
-            _context = context;
+            Context = context;
             _isBuiltIn = isBuiltIn;
             _annotations = annotations;
             _attributes = attributes ?? new Attributes();
@@ -162,6 +162,7 @@ public Declaration(
             _isArray = isArray;
             _asTypeContext = asTypeContext;
             _typeHint = typeHint;
+            Debug.Assert(!string.IsNullOrEmpty(_qualifiedName.MemberName)); 
         }
 
         public Declaration(ComEnumeration enumeration, Declaration parent, QualifiedModuleName module) : this(
@@ -180,7 +181,7 @@ public Declaration(ComEnumeration enumeration, Declaration parent, QualifiedModu
                 null,
                 true,
                 null,
-                new Attributes()) { }
+                new Attributes()) { Debug.Assert(module != null && !string.IsNullOrEmpty(_qualifiedName.MemberName)); }
 
         public Declaration(ComEnumerationMember member, Declaration parent, QualifiedModuleName module) : this(
                 new QualifiedMemberName(module, member.Name),
@@ -195,15 +196,14 @@ public Declaration(ComEnumerationMember member, Declaration parent, QualifiedMod
                 null,
                 Selection.Home,
                 false,
-                null,
-                true) { }
+                null) { Debug.Assert(module != null && !string.IsNullOrEmpty(_qualifiedName.MemberName)); }
 
         public Declaration(ComField field, Declaration parent, QualifiedModuleName module)
             : this(
-                new QualifiedMemberName(module, field.Name),
+                new QualifiedMemberName(module, string.IsNullOrEmpty(field.Name) ? "Foo" : field.Name),
                 parent,
                 parent,
-                field.Name,
+                string.IsNullOrEmpty(field.Name) ? "Foo" : field.Name,
                 null,
                 false,
                 false,
@@ -212,8 +212,7 @@ public Declaration(ComField field, Declaration parent, QualifiedModuleName modul
                 null,
                 Selection.Home,
                 false,
-                null,
-                true) { }
+                null) { Debug.Assert(module != null && !string.IsNullOrEmpty(_qualifiedName.MemberName)); }
 
         private string FolderFromAnnotations()
             {
@@ -285,18 +284,7 @@ public bool IsTypeSpecified
         private readonly QualifiedMemberName _qualifiedName;
         public QualifiedMemberName QualifiedName { get { return _qualifiedName; } }
 
-        private ParserRuleContext _context;
-        public ParserRuleContext Context
-        {
-            get
-            {
-                return _context;
-            }
-            set
-            {
-                _context = value;
-            }
-        }
+        public ParserRuleContext Context { get; set; }
 
         private ConcurrentBag<IdentifierReference> _references = new ConcurrentBag<IdentifierReference>();
         public IEnumerable<IdentifierReference> References
@@ -391,24 +379,6 @@ public void AddReference(
                     annotations));
         }
 
-        //public void AddReference(IdentifierReference reference)
-        //{
-        //    if (reference == null || reference.Declaration.Context == reference.Context)
-        //    {
-        //        return;
-        //    }
-        //    if (reference.Context.Parent != _context
-        //        && !_references.Select(r => r.Context).Contains(reference.Context.Parent)
-        //        && !_references.Any(r => r.QualifiedModuleName == reference.QualifiedModuleName
-        //            && r.Selection.StartLine == reference.Selection.StartLine
-        //            && r.Selection.EndLine == reference.Selection.EndLine
-        //            && r.Selection.StartColumn == reference.Selection.StartColumn
-        //            && r.Selection.EndColumn == reference.Selection.EndColumn))
-        //    {
-        //        _references.Add(reference);
-        //    }
-        //}
-
         public void AddMemberCall(IdentifierReference reference)
         {
             if (reference == null || reference.Declaration == null || reference.Declaration.Context == reference.Context)
@@ -459,7 +429,7 @@ public string ProjectName
 
         public object[] ToArray()
         {
-            return new object[] { this.ProjectName, this.CustomFolder, this.ComponentName, this.DeclarationType.ToString(), this.Scope, this.IdentifierName, this.AsTypeName };
+            return new object[] { ProjectName, CustomFolder, ComponentName, DeclarationType.ToString(), Scope, IdentifierName, AsTypeName };
         }
 
 
@@ -548,7 +518,7 @@ internal set
             DeclarationType.PropertyLet,
             DeclarationType.PropertyLet,
             DeclarationType.UserDefinedType,
-            DeclarationType.Constant,
+            DeclarationType.Constant
         };
 
         public bool IsSelected(QualifiedSelection selection)