Close #1846

Author: Hosch250

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -144,7 +144,7 @@ public Declaration(
             _parentScope = parentScope ?? string.Empty;
             _identifierName = qualifiedName.MemberName;
             _asTypeName = asTypeName;
-            _isSelfAssigned = isSelfAssigned || (declarationType == DeclarationType.Variable && parentDeclaration != null && parentDeclaration.IdentifierName == ComponentName);
+            _isSelfAssigned = isSelfAssigned;
             _isWithEvents = isWithEvents;
             _accessibility = accessibility;
             _declarationType = declarationType;
@@ -464,7 +464,17 @@ public bool AsTypeIsBaseType
             }
         }
 
-        public Declaration AsTypeDeclaration { get; internal set; }
+        private Declaration _asTypeDeclaration;
+        public Declaration AsTypeDeclaration
+        {
+            get { return _asTypeDeclaration; }
+            internal set
+            {
+                _asTypeDeclaration = value;
+                IsSelfAssigned = _isSelfAssigned || (DeclarationType == DeclarationType.Variable &&
+                                 AsTypeDeclaration.DeclarationType == DeclarationType.UserDefinedType);
+            }
+        }
 
         private readonly IReadOnlyList<DeclarationType> _neverArray = new[]
         {
@@ -495,11 +505,19 @@ public bool IsSelected(QualifiedSelection selection)
                    Selection.ContainsFirstCharacter(selection.Selection);
         }
 
-        private readonly bool _isSelfAssigned;
+        private bool _isSelfAssigned;
+
         /// <summary>
         /// Gets a value indicating whether the declaration is a joined assignment (e.g. "As New xxxxx")
         /// </summary>
-        public bool IsSelfAssigned { get { return _isSelfAssigned; } }
+        public bool IsSelfAssigned
+        {
+            get { return _isSelfAssigned; }
+            private set
+            {
+                _isSelfAssigned = value;
+            }
+        }
 
         private readonly Accessibility _accessibility;
         /// <summary>

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -408,11 +408,13 @@ private void SyncComReferences(IReadOnlyList<VBProject> projects)
                     {
                         State.OnStatusMessageUpdate(ParserState.LoadingReference.ToString());
 
+                        var tightlyScopedCapture = reference;
+
                         loadTasks.Add(
                         Task.Run(() =>
                         {
                             var comReflector = new ReferencedDeclarationsCollector(State);
-                            var items = comReflector.GetDeclarationsForReference(reference);
+                            var items = comReflector.GetDeclarationsForReference(tightlyScopedCapture);
 
                             foreach (var declaration in items)
                             {