Merge branch 'next' into next

Author: comintern

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -189,25 +189,27 @@ public string PanelTitle
                     return string.Empty;
                 }
 
-                if (SelectedItem is CodeExplorerProjectViewModel)
+                if (!(SelectedItem is ICodeExplorerDeclarationViewModel))
                 {
-                    var node = (CodeExplorerProjectViewModel)SelectedItem;
-                    return node.Declaration.IdentifierName + string.Format(" - ({0})", node.Declaration.DeclarationType);
+                    return SelectedItem.Name;
                 }
 
-                if (SelectedItem is CodeExplorerComponentViewModel)
-                {
-                    var node = (CodeExplorerComponentViewModel)SelectedItem;
-                    return node.Declaration.IdentifierName + string.Format(" - ({0})", node.Declaration.DeclarationType);
-                }
+                var declaration = SelectedItem.GetSelectedDeclaration();
+                
+                var nameWithDeclarationType  = declaration.IdentifierName +
+                           string.Format(" - ({0})", RubberduckUI.ResourceManager.GetString(
+                               "DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture));
 
-                if (SelectedItem is CodeExplorerMemberViewModel)
+                if (string.IsNullOrEmpty(declaration.AsTypeName))
                 {
-                    var node = (CodeExplorerMemberViewModel)SelectedItem;
-                    return node.Declaration.IdentifierName + string.Format(" - ({0})", node.Declaration.DeclarationType);
+                    return nameWithDeclarationType;
                 }
 
-                return SelectedItem.Name;
+                var typeName = declaration.HasTypeHint
+                    ? Declaration.TypeHintToTypeName[declaration.TypeHint]
+                    : declaration.AsTypeName;
+
+                return nameWithDeclarationType + ": " + typeName;
             }
         }
 

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -740,8 +740,8 @@
 
         <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="DimGray">
 
-            <ScrollViewer Background="WhiteSmoke" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-                <StackPanel Orientation="Vertical" MinHeight="48" Background="WhiteSmoke">
+            <ScrollViewer Background="WhiteSmoke" VerticalScrollBarVisibility="Auto">
+                <WrapPanel Orientation="Vertical" MinHeight="48" Background="WhiteSmoke">
 
                     <Grid Margin="4" HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
@@ -776,7 +776,7 @@
                                 CommandParameter="{Binding SelectedItem}"
                                 Content="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_FindAllReferencesText}" />
                     </WrapPanel>
-                </StackPanel>
+                </WrapPanel>
             </ScrollViewer>
         </Border>
     </Grid>

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

@@ -51,7 +51,7 @@ public void SetSelectionText(Declaration declaration)
                 if (selection.HasValue) { SetSelectionText(selection.Value); }
                 _selectionButton.TooltipText = _selectionButton.Caption;
             }
-            else if (declaration != null)
+            else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.ClassModule && declaration.DeclarationType != DeclarationType.ProceduralModule)
             {
                 var typeName = declaration.HasTypeHint
                     ? Declaration.TypeHintToTypeName[declaration.TypeHint]
@@ -63,6 +63,28 @@ public void SetSelectionText(Declaration declaration)
                     declaration.IdentifierName,
                     RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
                     string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + typeName);
+
+                _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)
+                {
+                    var typeName = declaration.HasTypeHint
+                        ? Declaration.TypeHintToTypeName[declaration.TypeHint]
+                        : declaration.AsTypeName;
+
+                    _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 : ": " + typeName);
+                }
                 _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
                     ? _selectionButton.Caption
                     : declaration.DescriptionString;