Merge branch 'next' into cacheBugs

Author: Hosch250

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -177,25 +177,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;
             }
         }