Fixes #934; at least, looks like it.

Author: retailcoder

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -75,7 +75,7 @@ public ObservableCollection<CodeExplorerProjectViewModel> Projects
         private void ParserState_StateChanged(object sender, ParserStateEventArgs e)
         {
             IsBusy = e.State == ParserState.Parsing;
-            if (e.State != ParserState.Resolving) // ParserState.Parsed state is too volatile
+            if (e.State != ParserState.Parsed) // ParserState.Parsed state is too volatile
             {
                 return;
             }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -29,7 +29,7 @@ public Declaration(QualifiedMemberName qualifiedName, Declaration parentDeclarat
         {
             _qualifiedName = qualifiedName;
             _parentDeclaration = parentDeclaration;
-            _parentScope = parentScope;
+            _parentScope = parentScope ?? string.Empty;
             _identifierName = qualifiedName.MemberName;
             _asTypeName = asTypeName;
             _isSelfAssigned = isSelfAssigned;
@@ -467,7 +467,8 @@ public bool Equals(Declaration other)
                 && other.IdentifierName == IdentifierName
                 && other.DeclarationType == DeclarationType
                 && other.Scope == Scope
-                && other.ParentScope == ParentScope;
+                && other.ParentScope == ParentScope
+                && other.Selection.Equals(Selection);
         }
 
         public override bool Equals(object obj)
@@ -477,7 +478,17 @@ public override bool Equals(object obj)
 
         public override int GetHashCode()
         {
-            return string.Concat(QualifiedName.QualifiedModuleName.ProjectHashCode, _identifierName, _declarationType, Scope, _parentScope).GetHashCode();
+            unchecked
+            {
+                var hash = 17;
+                hash = hash*23 + QualifiedName.QualifiedModuleName.ProjectHashCode;
+                hash = hash*23 + _identifierName.GetHashCode();
+                hash = hash*23 + _declarationType.GetHashCode();
+                hash = hash*23 + Scope.GetHashCode();
+                hash = hash*23 + _parentScope == null ? 0 : _parentScope.GetHashCode();
+                hash = hash*23 + _selection.GetHashCode();
+                return hash;
+            }
         }
     }
 }

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -210,6 +210,11 @@ private Declaration ResolveType(VBAParser.ComplexTypeContext context)
 
         private Declaration ResolveType(Declaration parent)
         {
+            if (parent != null && parent.DeclarationType == DeclarationType.UserDefinedType)
+            {
+                return parent;
+            }
+
             if (parent == null || parent.AsTypeName == null)
             {
                 return null;

Rubberduck.VBEEditor/Selection.cs

@@ -1,6 +1,8 @@
-namespace Rubberduck.VBEditor
+using System;
+
+namespace Rubberduck.VBEditor
 {
-    public struct Selection
+    public struct Selection : IEquatable<Selection>
     {
         public Selection(int startLine, int startColumn, int endLine, int endColumn)
         {
@@ -65,9 +67,35 @@ public bool Contains(Selection selection)
 
         public int LineCount { get { return _endLine - _startLine + 1; } }
 
+        public bool Equals(Selection other)
+        {
+            return other.StartLine == StartLine
+                   && other.EndLine == EndLine
+                   && other.StartColumn == StartColumn
+                   && other.EndColumn == EndColumn;
+        }
+
         public override string ToString()
         {
             return string.Format("Start: L{0}C{1} End: L{2}C{3}", _startLine, _startColumn, _endLine, _endColumn);
         }
+
+        public override bool Equals(object obj)
+        {
+            return Equals((Selection) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hash = 17;
+                hash = hash*23 + StartLine;
+                hash = hash*23 + EndLine;
+                hash = hash*23 + StartColumn;
+                hash = hash*23 + EndColumn;
+                return hash;
+            }
+        }
     }
 }