if property is named after a type, usages of the type resolve as usages of the property - but type references resolve correctly. Excel crashes on exit for some reason.

retailcoder · retailcoder · commit 76a7275c9655 · 2015-06-23T02:08:51.000-04:00
diff --git a/RetailCoder.VBE/UI/RefactorMenu.cs b/RetailCoder.VBE/UI/RefactorMenu.cs
@@ -179,6 +179,10 @@ public void FindAllReferences()
             var selection = IDE.ActiveCodePane.GetSelection();
             var progress = new ParsingProgressPresenter();
             var result = progress.Parse(_parser, IDE.ActiveVBProject);
+            if (result == null)
+            {
+                return; // bug/todo: something's definitely wrong, exception thrown in resolver code
+            }
 
             var declarations = result.Declarations.Items
                                      .Where(item => item.DeclarationType != DeclarationType.ModuleOption)
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -50,7 +50,18 @@ public Declaration(QualifiedMemberName qualifiedName, string parentScope,
 
         public void AddReference(IdentifierReference reference)
         {
-            if (!_references.Select(r => r.Context).Contains(reference.Context))
+            if (reference.Declaration.Context == reference.Context)
+            {
+                return;
+            }
+
+            if (reference.Context.Parent != _context 
+                && !_references.Select(r => r.Context).Contains(reference.Context)
+                && !_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);
             }
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceListener.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceListener.cs
@@ -33,7 +33,8 @@ public IdentifierReferenceListener(QualifiedModuleName qualifiedModuleName, Decl
             _moduleTypes = new HashSet<DeclarationType>(new[]
             {
                 DeclarationType.Module, 
-                DeclarationType.Class
+                DeclarationType.Class,
+                DeclarationType.Project
             });
 
             _memberTypes = new HashSet<DeclarationType>(new[]
@@ -154,7 +155,8 @@ public override void EnterWithStmt(VBAParser.WithStmtContext context)
                     {
                         // object variable is a built-in Collection class instance
                         qualifier = _declarations.Items.Single(item => item.IsBuiltIn
-                            && item.IdentifierName == collectionContext.GetText());
+                            && item.IdentifierName == collectionContext.GetText()
+                            && item.DeclarationType == DeclarationType.Class);
                         reference = CreateReference(baseTypeContext, qualifier);
                     }
                 }
@@ -206,7 +208,7 @@ private Declaration ResolveType(VBAParser.ComplexTypeContext context)
             {
                 return _declarations[identifier.GetText()].SingleOrDefault(item =>
                     item.ProjectName == libraryName
-                    && item.DeclarationType == DeclarationType.Class);
+                    && _moduleTypes.Contains(item.DeclarationType));
             }
 
             return null;
@@ -244,13 +246,15 @@ private Declaration ResolveType(Declaration parent)
             // look in current project first.
             var result = _declarations[parent.AsTypeName].SingleOrDefault(item =>
                 _moduleTypes.Contains(item.DeclarationType)
-                && item.ProjectName == _currentScope.ProjectName);
+                && item.ProjectName == _currentScope.ProjectName
+                && _moduleTypes.Contains(item.DeclarationType));
 
             if (result == null)
             {
-                // look in all projects (including VbaStdLib library.
+                // look in all projects (including VbaStdLib library).
                 result = _declarations[parent.AsTypeName].SingleOrDefault(item =>
-                    _moduleTypes.Contains(item.DeclarationType));
+                    _moduleTypes.Contains(item.DeclarationType)
+                    && _moduleTypes.Contains(item.DeclarationType));
             }
 
             return result;
@@ -298,6 +302,17 @@ private Declaration Resolve(ParserRuleContext callSiteContext, Declaration local
                          ?? FindModuleScopeProcedure(identifierName, localScope, accessorType)
                          ?? FindProjectScopeDeclaration(identifierName);
 
+            if (callee == null)
+            {
+                // calls inside With block can still refer to identifiers in _currentScope
+                localScope = _currentScope;
+                identifierName = callSiteContext.GetText();
+                callee = FindLocalScopeDeclaration(identifierName, localScope)
+                         ?? FindModuleScopeDeclaration(identifierName, localScope)
+                         ?? FindModuleScopeProcedure(identifierName, localScope, accessorType)
+                         ?? FindProjectScopeDeclaration(identifierName);
+            }
+
             if (callee == null)
             {
                 return null;
@@ -321,8 +336,6 @@ private Declaration Resolve(VBAParser.ICS_S_VariableOrProcedureCallContext conte
                 return null;
             }
 
-            _isResolving = true;
-
             var identifierContext = context.ambiguousIdentifier();
             var fieldCall = context.dictionaryCallStmt();
 
@@ -360,8 +373,6 @@ private Declaration Resolve(VBAParser.ICS_S_ProcedureOrArrayCallContext context,
                 return null;
             }
 
-            _isResolving = true;
-
             var identifierContext = context.ambiguousIdentifier();
             var fieldCall = context.dictionaryCallStmt();
             // todo: understand WTF [baseType] is doing in that grammar rule...
@@ -376,8 +387,6 @@ private Declaration Resolve(VBAParser.ICS_S_MembersCallContext context, ContextA
                 return null;
             }
 
-            _isResolving = true;
-
             if (localScope == null)
             {
                 localScope = _currentScope;
@@ -403,8 +412,6 @@ private Declaration Resolve(VBAParser.ICS_S_MembersCallContext context, ContextA
                     return null;
                 }
 
-                //var memberReference = CreateReference(member.Context, member);
-                //member.AddReference(memberReference);
                 parent = member;
             }
 
@@ -417,24 +424,24 @@ private Declaration Resolve(VBAParser.ICS_S_MembersCallContext context, ContextA
             return Resolve(fieldCall, parent, hasExplicitLetStatement, isAssignmentTarget);
         }
 
-        private void Resolve(VBAParser.ICS_B_ProcedureCallContext context)
+        private Declaration Resolve(VBAParser.ICS_B_ProcedureCallContext context)
         {
             if (context == null)
             {
-                return;
+                return null;
             }
 
-            _isResolving = true;
-
             var identifierContext = context.certainIdentifier();
             var callee = Resolve(identifierContext, _currentScope);
             if (callee == null)
             {
-                return;
+                return null;
             }
 
             var reference = CreateReference(identifierContext, callee);
             callee.AddReference(reference);
+
+            return callee;
         }
 
         private Declaration Resolve(VBAParser.ImplicitCallStmt_InStmtContext callSiteContext, Declaration localScope, ContextAccessorType accessorType, bool hasExplicitLetStatement = false, bool isAssignmentTarget = false)
@@ -471,7 +478,8 @@ private Declaration FindLocalScopeDeclaration(string identifierName, Declaration
             }
 
             var parent = _declarations[identifierName].SingleOrDefault(item =>
-                item.ParentScope == localScope.Scope);
+                item.ParentScope == localScope.Scope
+                && !_moduleTypes.Contains(item.DeclarationType));
             return parent;
         }
 
@@ -490,7 +498,8 @@ private Declaration FindModuleScopeDeclaration(string identifierName, Declaratio
 
             return _declarations[identifierName].SingleOrDefault(item =>
                 item.ParentScope == localScope.ParentScope
-                && !item.DeclarationType.HasFlag(DeclarationType.Member));
+                && !item.DeclarationType.HasFlag(DeclarationType.Member)
+                && !_moduleTypes.Contains(item.DeclarationType));
         }
 
         /// <summary>
@@ -529,8 +538,9 @@ private Declaration FindProjectScopeDeclaration(string identifierName)
         {
             // assume unqualified variable call, i.e. unique declaration.
             return _declarations[identifierName].SingleOrDefault(item =>
-                item.Accessibility == Accessibility.Public
-                || item.Accessibility == Accessibility.Global);
+                (item.Accessibility == Accessibility.Public
+                || item.Accessibility == Accessibility.Global
+                || item.DeclarationType == DeclarationType.Module));
         }
 
         /// <summary>
@@ -551,29 +561,13 @@ private Declaration FindProjectScopeDeclaration(string identifierName, string mo
 
         #region IVBAListener overrides
 
-        // avoid re-resolving identifiers
-        private bool _isResolving;
-
         public override void EnterICS_B_ProcedureCall(VBAParser.ICS_B_ProcedureCallContext context)
         {
-            if (_isResolving)
-            {
-                return;
-            }
-
             Resolve(context);
-            _isResolving = false;
         }
 
         public override void EnterICS_B_MemberProcedureCall(VBAParser.ICS_B_MemberProcedureCallContext context)
         {
-            if (_isResolving)
-            {
-                return;
-            }
-
-            _isResolving = true;
-            
             var parentScope = Resolve(context.implicitCallStmt_InStmt(), _currentScope, ContextAccessorType.GetValueOrReference);
             var parentType = ResolveType(parentScope);
 
@@ -600,47 +594,25 @@ public override void EnterICS_B_MemberProcedureCall(VBAParser.ICS_B_MemberProced
             
             var fieldCall = context.dictionaryCallStmt();
             Resolve(fieldCall, member);
-
-            _isResolving = false;
         }
 
         public override void EnterICS_S_VariableOrProcedureCall(VBAParser.ICS_S_VariableOrProcedureCallContext context)
         {
-            if (_isResolving)
-            {
-                return;
-            }
-
             Resolve(context, _currentScope);
         }
 
         public override void EnterICS_S_ProcedureOrArrayCall(VBAParser.ICS_S_ProcedureOrArrayCallContext context)
         {
-            if (_isResolving)
-            {
-                return;
-            }
-
             Resolve(context, _currentScope);
         }
 
         public override void EnterICS_S_MembersCall(VBAParser.ICS_S_MembersCallContext context)
         {
-            if (_isResolving)
-            {
-                return;
-            }
-
             Resolve(context, _currentScope);
         }
 
         public override void EnterICS_S_DictionaryCall(VBAParser.ICS_S_DictionaryCallContext context)
         {
-            if (_isResolving)
-            {
-                return;
-            }
-
             Resolve(context, _currentScope);
         }
 
@@ -674,7 +646,7 @@ public override void EnterAsTypeClause(VBAParser.AsTypeClauseContext context)
                 var collection = baseType.COLLECTION();
                 if (collection != null)
                 {
-                    type = _declarations[collection.GetText()].SingleOrDefault(item => item.IsBuiltIn);
+                    type = _declarations[collection.GetText()].SingleOrDefault(item => item.IsBuiltIn && item.DeclarationType == DeclarationType.Class);
                     reference = CreateReference(baseType, type);
                 }
             }
@@ -695,6 +667,7 @@ public override void EnterForNextStmt(VBAParser.ForNextStmtContext context)
             var identifiers = context.ambiguousIdentifier();
             var identifier = Resolve(identifiers[0], _currentScope, ContextAccessorType.AssignValue);
             
+            // each iteration counts as an assignment
             var reference = CreateReference(identifiers[0], identifier, true);
             identifier.AddReference(reference);
 
@@ -704,6 +677,91 @@ public override void EnterForNextStmt(VBAParser.ForNextStmtContext context)
             }
         }
 
+        public override void EnterForEachStmt(VBAParser.ForEachStmtContext context)
+        {
+            var identifiers = context.ambiguousIdentifier();
+            var identifier = Resolve(identifiers[0], _currentScope);
+
+            // each iteration counts as an assignment
+            var reference = CreateReference(identifiers[0], identifier, true);
+            identifier.AddReference(reference);
+
+            if (identifiers.Count > 1)
+            {
+                identifier.AddReference(CreateReference(identifiers[1], identifier));
+            }
+        }
+
+        public override void EnterImplementsStmt(VBAParser.ImplementsStmtContext context)
+        {
+            var identifierContext = context.ambiguousIdentifier();
+            var identifier = Resolve(identifierContext, _currentScope);
+            identifier.AddReference(CreateReference(identifierContext, identifier));
+        }
+
+        public override void EnterRaiseEventStmt(VBAParser.RaiseEventStmtContext context)
+        {
+            var identifierContext = context.ambiguousIdentifier();
+            var identifier = Resolve(identifierContext, _currentScope);
+            identifier.AddReference(CreateReference(identifierContext, identifier));
+        }
+
+        public override void EnterResumeStmt(VBAParser.ResumeStmtContext context)
+        {
+            var identifierContext = context.ambiguousIdentifier();
+            var identifier = Resolve(identifierContext, _currentScope);
+            identifier.AddReference(CreateReference(identifierContext, identifier));
+        }
+
+        public override void EnterFileNumber(VBAParser.FileNumberContext context)
+        {
+            var identifierContext = context.ambiguousIdentifier();
+            if (identifierContext == null)
+            {
+                return;
+            }
+            var identifier = Resolve(identifierContext, _currentScope);
+            identifier.AddReference(CreateReference(identifierContext, identifier));
+        }
+
+        public override void EnterArgDefaultValue(VBAParser.ArgDefaultValueContext context)
+        {
+            var identifierContext = context.ambiguousIdentifier();
+            if (identifierContext == null)
+            {
+                return;
+            }
+            var identifier = Resolve(identifierContext, _currentScope);
+            identifier.AddReference(CreateReference(identifierContext, identifier));
+        }
+
+        public override void EnterFieldLength(VBAParser.FieldLengthContext context)
+        {
+            var identifierContext = context.ambiguousIdentifier();
+            if (identifierContext == null)
+            {
+                return;
+            }
+            var identifier = Resolve(identifierContext, _currentScope);
+            identifier.AddReference(CreateReference(identifierContext, identifier));
+        }
+
+        public override void EnterVsAssign(VBAParser.VsAssignContext context)
+        {
+            // named parameter reference must be scoped to called procedure
+            var callee = FindParentCall(context);
+            Resolve(context.implicitCallStmt_InStmt(), callee);
+        }
+
+        private Declaration FindParentCall(VBAParser.VsAssignContext context)
+        {
+            var calleeContext = context.Parent.Parent.Parent;
+            return Resolve(calleeContext as VBAParser.ICS_B_ProcedureCallContext)
+                   ?? Resolve(calleeContext as VBAParser.ICS_S_VariableOrProcedureCallContext, _currentScope)
+                   ?? Resolve(calleeContext as VBAParser.ICS_S_ProcedureOrArrayCallContext, _currentScope)
+                   ?? Resolve(calleeContext as VBAParser.ICS_S_MembersCallContext, _currentScope);
+        }
+
         #endregion
 
         private IdentifierReference CreateReference(ParserRuleContext callSiteContext, Declaration callee, bool isAssignmentTarget = false, bool hasExplicitLetStatement = false)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,18 @@ public Declaration(QualifiedMemberName qualifiedName, string parentScope,`
`50`	`50`
`51`	`51`	`public void AddReference(IdentifierReference reference)`
`52`	`52`	`{`
`53`		`- if (!_references.Select(r => r.Context).Contains(reference.Context))`
	`53`	`+ if (reference.Declaration.Context == reference.Context)`
	`54`	`+ {`
	`55`	`+ return;`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ if (reference.Context.Parent != _context`
	`59`	`+ && !_references.Select(r => r.Context).Contains(reference.Context)`
	`60`	`+ && !_references.Any(r => r.QualifiedModuleName == reference.QualifiedModuleName`
	`61`	`+ && r.Selection.StartLine == reference.Selection.StartLine`
	`62`	`+ && r.Selection.EndLine == reference.Selection.EndLine`
	`63`	`+ && r.Selection.StartColumn == reference.Selection.StartColumn`
	`64`	`+ && r.Selection.EndColumn == reference.Selection.EndColumn))`
`54`	`65`	`{`
`55`	`66`	`_references.Add(reference);`
`56`	`67`	`}`