Merge pull request #1934 from Hosch250/Issue1928

Display correct type for type hints

Author: retailcoder

RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs

@@ -67,7 +67,7 @@ private void FixTypeHintUsage(string hint, CodeModule module, Selection selectio
         {
             var line = module.Lines[selection.StartLine, 1];
 
-            var asTypeClause = ' ' + Tokens.As + ' ' + Declaration.TYPEHINT_TO_TYPENAME[hint];
+            var asTypeClause = ' ' + Tokens.As + ' ' + Declaration.TypeHintToTypeName[hint];
 
             string fix;
 

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

@@ -7,7 +7,6 @@
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 using Rubberduck.VBEditor;
 using ParserState = Rubberduck.Parsing.VBA.ParserState;
-using NLog;
 
 namespace Rubberduck.UI.Command.MenuItems
 {
@@ -21,7 +20,6 @@ public class RubberduckCommandBar : IDisposable
         private CommandBarButton _statusButton;
         private CommandBarButton _selectionButton;
         private CommandBar _commandbar;
-        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
         public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErrorsCommand command)
         {
@@ -32,7 +30,7 @@ public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErr
             Initialize();
         }
 
-        private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
+        private void _statusButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
         {
             if (_state.Status == ParserState.Error)
             {
@@ -43,7 +41,6 @@ private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         public void SetStatusText(string value = null)
         {
             var text = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status);
-            _logger.Debug("RubberduckCommandBar status text changes to '{0}'.", text);
             UiDispatcher.Invoke(() => _statusButton.Caption = text);
         }
 
@@ -55,31 +52,21 @@ 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),
-                    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),
-                    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;
@@ -93,8 +80,6 @@ private void SetSelectionText(QualifiedSelection selection)
 
         private void State_StateChanged(object sender, EventArgs e)
         {
-            _logger.Debug("RubberduckCommandBar handles StateChanged...");
-            
             if (_state.Status != ParserState.ResolvedDeclarations)
             {
                 SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
@@ -112,15 +97,15 @@ private void OnRefresh()
             }
         }
 
-        public void Initialize()
+        private void Initialize()
         {
             _commandbar = _vbe.CommandBars.Add("Rubberduck", MsoBarPosition.msoBarTop, false, true);
 
             _refreshButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
             ParentMenuItemBase.SetButtonImage(_refreshButton, Resources.arrow_circle_double, Resources.arrow_circle_double_mask);
             _refreshButton.Style = MsoButtonStyle.msoButtonIcon;
             _refreshButton.Tag = "Refresh";
-            _refreshButton.TooltipText =RubberduckUI.RubberduckCommandbarRefreshButtonTooltip;
+            _refreshButton.TooltipText = RubberduckUI.RubberduckCommandbarRefreshButtonTooltip;
             _refreshButton.Click += refreshButton_Click;
 
             _statusButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
@@ -136,7 +121,7 @@ public void Initialize()
             _commandbar.Visible = true;
         }
 
-        private void refreshButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
+        private void refreshButton_Click(CommandBarButton ctrl, ref bool cancelDefault)
         {
             OnRefresh();
         }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -18,7 +18,7 @@ namespace Rubberduck.Parsing.Symbols
     [DebuggerDisplay("({DeclarationType}) {Accessibility} {IdentifierName} As {AsTypeName} | {Selection}")]
     public class Declaration : IEquatable<Declaration>
     {
-        public static readonly string[] BASE_TYPES = new string[]
+        public static readonly string[] BaseTypes =
         {
                 "BOOLEAN",
                 "BYTE",
@@ -36,7 +36,7 @@ public class Declaration : IEquatable<Declaration>
                 "ANY"
         };
 
-        public static readonly IDictionary<string, string> TYPEHINT_TO_TYPENAME = new Dictionary<string, string>
+        public static readonly IDictionary<string, string> TypeHintToTypeName = new Dictionary<string, string>
         {
             { "%", Tokens.Integer },
             { "&", Tokens.Long },
@@ -460,7 +460,7 @@ public bool AsTypeIsBaseType
         {
             get
             {
-                return string.IsNullOrWhiteSpace(AsTypeName) || BASE_TYPES.Contains(_asTypeName.ToUpperInvariant());
+                return string.IsNullOrWhiteSpace(AsTypeName) || BaseTypes.Contains(_asTypeName.ToUpperInvariant());
             }
         }
 

Rubberduck.Parsing/Symbols/TypeAnnotationPass.cs

@@ -53,7 +53,7 @@ private void AnnotateType(Declaration declaration)
                 var typeContext = declaration.AsTypeContext;
                 typeExpression = typeContext.type().complexType().GetText();
             }
-            else if (!string.IsNullOrWhiteSpace(declaration.AsTypeNameWithoutArrayDesignator) && !Declaration.BASE_TYPES.Contains(declaration.AsTypeNameWithoutArrayDesignator.ToUpperInvariant()))
+            else if (!string.IsNullOrWhiteSpace(declaration.AsTypeNameWithoutArrayDesignator) && !Declaration.BaseTypes.Contains(declaration.AsTypeNameWithoutArrayDesignator.ToUpperInvariant()))
             {
                 typeExpression = declaration.AsTypeNameWithoutArrayDesignator;
             }