Skip to content

Commit e5a4b5f

Browse files
committed
fixed NRE's in Declaration and resolver
1 parent ffc5206 commit e5a4b5f

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Rubberduck.Parsing/Symbols/Declaration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,8 @@ public string CustomFolder
463463

464464
public bool Equals(Declaration other)
465465
{
466-
return other.Project == Project
466+
return other != null
467+
&& other.Project == Project
467468
&& other.IdentifierName == IdentifierName
468469
&& other.DeclarationType == DeclarationType
469470
&& other.Scope == Scope

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
2-
using System.CodeDom.Compiler;
32
using System.Collections.Generic;
4-
using System.Configuration;
53
using System.Linq;
64
using Antlr4.Runtime;
75
using Rubberduck.Parsing.Grammar;
@@ -637,9 +635,11 @@ private Declaration ResolveInternal(VBAParser.ICS_B_ProcedureCallContext context
637635
}
638636

639637
var reference = CreateReference(identifierContext, callee);
640-
callee.AddReference(reference);
641-
_alreadyResolved.Add(reference.Context);
642-
638+
if (reference != null)
639+
{
640+
callee.AddReference(reference);
641+
_alreadyResolved.Add(reference.Context);
642+
}
643643
return callee;
644644
}
645645

@@ -730,8 +730,11 @@ public void Resolve(VBAParser.ICS_S_MembersCallContext context)
730730
var identifierContext = ((dynamic)parent.Context).ambiguousIdentifier() as VBAParser.AmbiguousIdentifierContext;
731731

732732
var parentReference = CreateReference(identifierContext, parent);
733-
parent.AddReference(parentReference);
734-
_alreadyResolved.Add(parentReference.Context);
733+
if (parentReference != null)
734+
{
735+
parent.AddReference(parentReference);
736+
_alreadyResolved.Add(parentReference.Context);
737+
}
735738
}
736739

737740
var chainedCalls = context.iCS_S_MemberCall();

0 commit comments

Comments
 (0)