Remove uses of ProjectDisplayName on ProjectDeclaration except in InspectionResultFormatter

The last remaining case is rather complicated.

Author: MDoerner

Rubberduck.Core/Formatters/InspectionResultFormatter.cs

@@ -1,6 +1,5 @@
 using Rubberduck.Common;
 using Rubberduck.Parsing.Inspections.Abstract;
-using Rubberduck.Inspections.Abstract;
 using System.IO;
 using Rubberduck.Resources.Inspections;
 

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using Rubberduck.AddRemoveReferences;
@@ -193,11 +194,24 @@ private void SetName()
             _name = Declaration?.IdentifierName ?? string.Empty;
 
             // F' the flicker. Digging into the properties has some even more evil side-effects, and is a performance nightmare by comparison.
-            _displayName = Declaration?.ProjectDisplayName ?? string.Empty;
+            _displayName = DisplayName(Declaration);
 
             OnNameChanged();
         }
 
+        private string DisplayName(Declaration declaration)
+        {
+            if (declaration == null)
+            {
+                return string.Empty;
+            }
+
+            var project = _projectsProvider.Project(declaration.ProjectId);
+            return project != null 
+                ? project.ProjectDisplayName 
+                : string.Empty;
+        }
+
         private static readonly List<DeclarationType> UntrackedTypes = new List<DeclarationType>
         {
             DeclarationType.Parameter,

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesPresenterFactory.cs

@@ -147,7 +147,7 @@ public AddRemoveReferencesPresenter Create(ProjectDeclaration projectDeclaration
 
             return (model != null)
                 ? new AddRemoveReferencesPresenter(
-                    new AddRemoveReferencesDialog(new AddRemoveReferencesViewModel(model, _reconciler, _browser)))
+                    new AddRemoveReferencesDialog(new AddRemoveReferencesViewModel(model, _reconciler, _browser, _projectsProvider)))
                 : null;                 
         }
 

Rubberduck.Core/UI/AddRemoveReferences/AddRemoveReferencesViewModel.cs

@@ -13,6 +13,7 @@
 using Rubberduck.Resources;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers;
 
 namespace Rubberduck.UI.AddRemoveReferences
@@ -83,13 +84,19 @@ static AddRemoveReferencesViewModel()
         private readonly ObservableCollection<ReferenceModel> _available;
         private readonly ObservableCollection<ReferenceModel> _project;
         private readonly IReferenceReconciler _reconciler;
+        private readonly IProjectsProvider _projectsProvider;
         private readonly IFileSystemBrowserFactory _browser;
 
-        public AddRemoveReferencesViewModel(IAddRemoveReferencesModel model, IReferenceReconciler reconciler, IFileSystemBrowserFactory browser)
+        public AddRemoveReferencesViewModel(
+            IAddRemoveReferencesModel model, 
+            IReferenceReconciler reconciler, 
+            IFileSystemBrowserFactory browser,
+            IProjectsProvider projectsProvider)
         {
             Model = model;
             _reconciler = reconciler;
             _browser = browser;
+            _projectsProvider = projectsProvider;
 
             _available = new ObservableCollection<ReferenceModel>(model.References
                 .Where(reference => !reference.IsReferenced).OrderBy(reference => reference.Description));
@@ -114,9 +121,25 @@ public AddRemoveReferencesViewModel(IAddRemoveReferencesModel model, IReferenceR
             ApplyCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteApplyCommand, ApplyCanExecute);
         }
 
-        public string ProjectCaption => string.IsNullOrEmpty(Model?.Project?.IdentifierName)
-            ? RubberduckUI.References_Caption
-            : string.Format(RubberduckUI.References_CaptionTemplate, Model.Project.ProjectDisplayName);
+        public string ProjectCaption
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Model?.Project?.IdentifierName))
+                {
+                    return RubberduckUI.References_Caption;
+                }
+
+                var project = _projectsProvider.Project(Model.Project.ProjectId);
+
+                if (project == null)
+                {
+                    return RubberduckUI.References_Caption;
+                }
+
+                return project.ProjectDisplayName;
+            }
+        }
 
         /// <summary>
         /// The IAddRemoveReferencesModel for the view.

Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs

@@ -20,7 +20,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.Parsing.VBA.Extensions;
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.UI.Command;
@@ -669,7 +668,7 @@ private void ExecuteCopyResultsCommand(object parameter)
 
             var resultArray = Results.OfType<IExportable>().Select(result => result.ToArray()).ToArray();
 
-            var resource = resultArray.Count() == 1
+            var resource = resultArray.Length == 1
                 ? Resources.RubberduckUI.CodeInspections_NumberOfIssuesFound_Singular
                 : Resources.RubberduckUI.CodeInspections_NumberOfIssuesFound_Plural;
 

RubberduckTests/AddRemoveReferences/AddRemoveReferencesSetup.cs

@@ -283,7 +283,7 @@ public static AddRemoveReferencesViewModel ArrangeViewModel(
             var reconciler = ArrangeReferenceReconciler(settings, projectsProvider, out _, out libraryProvider);
             browserFactory = new Mock<IFileSystemBrowserFactory>();
 
-            return new AddRemoveReferencesViewModel(model, reconciler, browserFactory.Object);
+            return new AddRemoveReferencesViewModel(model, reconciler, browserFactory.Object, projectsProvider);
         }
 
         public static void SetupMockedOpenDialog(this Mock<IFileSystemBrowserFactory> factory, string filename, DialogResult result)

RubberduckTests/AddRemoveReferences/AddRemoveReferencesViewModelTests.cs

@@ -136,7 +136,7 @@ public void ViewModelFilters_SearchInputFiltersList(string input, int expected)
             var model = new AddRemoveReferencesModel(null, declaration, SearchReferencesList, settings);
             var reconciler = AddRemoveReferencesSetup.ArrangeReferenceReconciler(settings);
 
-            var viewModel = new AddRemoveReferencesViewModel(model, reconciler, new Mock<IFileSystemBrowserFactory>().Object);
+            var viewModel = new AddRemoveReferencesViewModel(model, reconciler, new Mock<IFileSystemBrowserFactory>().Object, null);
             viewModel.SelectedFilter = ReferenceFilter.ComTypes.ToString();
             viewModel.Search = input;