Merge branch 'next' into CE_Context_Menu

Author: retailcoder

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -133,11 +133,22 @@ private IEnumerable<IAnnotation> FindAnnotations(int line)
         private void DeclareControlsAsMembers(IVBComponent form)
         {
             if (form.Controls == null) { return; }
-            var msFormsLib = _state.DeclarationFinder.FindProject("MSForms");
 
+            var libraryQualifier = string.Empty;
+            if (_qualifiedModuleName.ComponentType == ComponentType.UserForm)
+            {
+                var msFormsLib = _state.DeclarationFinder.FindProject("MSForms");
+                //Debug.Assert(msFormsLib != null);
+                if (msFormsLib != null)
+                {
+                    // given a UserForm component, MSForms reference is in use and cannot be removed.
+                    libraryQualifier = "MSForms.";
+                }
+            }
+            
             foreach (var control in form.Controls)
             {
-                var typeName = control.TypeName();
+                var typeName = $"{libraryQualifier}{control.TypeName()}";
                 // The as type declaration should be TextBox, CheckBox, etc. depending on the type.
                 var declaration = new Declaration(
                     _qualifiedModuleName.QualifyMemberName(control.Name),
@@ -155,11 +166,6 @@ private void DeclareControlsAsMembers(IVBComponent form)
                     null,
                     true);
 
-                if (msFormsLib != null)
-                {
-                    declaration.AsTypeDeclaration = _state.DeclarationFinder.FindClassModule(typeName, msFormsLib, true);
-                }
-
                 AddDeclaration(declaration);
             }
         }

Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs

@@ -45,11 +45,6 @@ public void Execute(IReadOnlyCollection<QualifiedModuleName> modules)
 
         private void AnnotateType(Declaration declaration)
         {
-            if (declaration.AsTypeDeclaration != null)
-            {
-                return;
-            }
-
             if (declaration.DeclarationType == DeclarationType.ClassModule || 
                 declaration.DeclarationType == DeclarationType.UserDefinedType || 
                 declaration.DeclarationType == DeclarationType.ComAlias)