Merge pull request #1946 from Hosch250/Issue1397

Refix display of type hints

Author: Hosch250

RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs

@@ -51,31 +51,18 @@ public void SetSelectionText(Declaration declaration)
                 if (selection.HasValue) { SetSelectionText(selection.Value); }
                 _selectionButton.TooltipText = _selectionButton.Caption;
             }
-            else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.ClassModule && declaration.DeclarationType != DeclarationType.ProceduralModule)
+            else if (declaration != null)
             {
+                var typeName = declaration.HasTypeHint
+                    ? Declaration.TypeHintToTypeName[declaration.TypeHint]
+                    : declaration.AsTypeName;
+
                 _selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
                     declaration.QualifiedSelection.Selection,
                     declaration.QualifiedName.QualifiedModuleName,
                     declaration.IdentifierName,
                     RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
-                    string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + declaration.AsTypeName);
-                _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
-                    ? _selectionButton.Caption
-                    : declaration.DescriptionString;
-            }
-            else if (declaration != null)
-            {
-                // todo: confirm this is what we want, and then refator
-                var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
-                if (selection.HasValue)
-                {
-                    _selectionButton.Caption = string.Format("{0}|{1}: {2} ({3}{4})",
-                        selection.Value.Selection,
-                        declaration.QualifiedName.QualifiedModuleName,
-                        declaration.IdentifierName,
-                        RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
-                    string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + declaration.AsTypeName);
-                }
+                    string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + typeName);
                 _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
                     ? _selectionButton.Caption
                     : declaration.DescriptionString;