Skip to content

Commit f7534ae

Browse files
committed
returning built-in members now have return type info as well
1 parent ffcf30c commit f7534ae

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -278,30 +278,9 @@ private Declaration CreateMemberDeclaration(out FUNCDESC memberDescriptor, TYPEK
278278
var memberDeclarationType = GetDeclarationType(memberDescriptor, funcValueType, typeKind);
279279

280280
var asTypeName = string.Empty;
281-
if (memberDeclarationType != DeclarationType.Procedure && !TypeNames.TryGetValue(funcValueType, out asTypeName))
281+
if (memberDeclarationType != DeclarationType.Procedure)
282282
{
283-
if (funcValueType == VarEnum.VT_PTR || funcValueType == VarEnum.VT_BYREF)
284-
{
285-
try
286-
{
287-
var asTypeDesc = (TYPEDESC)Marshal.PtrToStructure(memberDescriptor.elemdescFunc.tdesc.lpValue, typeof(TYPEDESC));
288-
asTypeName = GetTypeName(asTypeDesc, info);
289-
}
290-
catch
291-
{
292-
if (!TypeNames.TryGetValue(funcValueType, out asTypeName))
293-
{
294-
asTypeName = funcValueType.ToString(); //TypeNames[VarEnum.VT_VARIANT];
295-
}
296-
}
297-
}
298-
else
299-
{
300-
if (!TypeNames.TryGetValue(funcValueType, out asTypeName))
301-
{
302-
asTypeName = funcValueType.ToString(); //TypeNames[VarEnum.VT_VARIANT];
303-
}
304-
}
283+
asTypeName = GetTypeName(memberDescriptor.elemdescFunc.tdesc, info);
305284
}
306285
var attributes = new Attributes();
307286
if (memberName == "_NewEnum" && ((FUNCFLAGS)memberDescriptor.wFuncFlags).HasFlag(FUNCFLAGS.FUNCFLAG_FNONBROWSABLE))
@@ -311,7 +290,6 @@ private Declaration CreateMemberDeclaration(out FUNCDESC memberDescriptor, TYPEK
311290
else if (memberDescriptor.memid == 0)
312291
{
313292
attributes.AddDefaultMemberAttribute(memberName);
314-
//Debug.WriteLine("Default member found: {0}.{1} ({2} / {3})", moduleDeclaration.IdentifierName, memberName, memberDeclarationType, (VarEnum)memberDescriptor.elemdescFunc.tdesc.vt);
315293
}
316294
else if (((FUNCFLAGS)memberDescriptor.wFuncFlags).HasFlag(FUNCFLAGS.FUNCFLAG_FHIDDEN))
317295
{

0 commit comments

Comments
 (0)