Pull with conflicts

Author: Hosch250

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/Rubberduck.csproj

@@ -256,6 +256,7 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
+    <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="ReachFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -829,6 +830,7 @@
     </Compile>
     <Compile Include="UI\SourceControl\ChangesViewViewModel.cs" />
     <Compile Include="UI\SourceControl\CommitAction.cs" />
+    <Compile Include="UI\SourceControl\Converters\ChangeTypesToTextConverter.cs" />
     <Compile Include="UI\SourceControl\Converters\CommitActionsToTextConverter.cs" />
     <Compile Include="UI\SourceControl\Converters\CommitActionTextToEnum.cs" />
     <Compile Include="UI\FileBrowserDialogFactory.cs" />

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
 {
@@ -31,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)
             {
@@ -53,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;
@@ -108,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);
@@ -132,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();
         }