Match target project by ID, not name.

Author: comintern

Rubberduck.Core/UI/Command/AddRemoveReferencesCommand.cs

@@ -1,4 +1,5 @@
-using System.Runtime.InteropServices;
+using System.Linq;
+using System.Runtime.InteropServices;
 using NLog;
 using Rubberduck.AddRemoveReferences;
 using Rubberduck.Navigation.CodeExplorer;
@@ -37,7 +38,7 @@ protected override void OnExecute(object parameter)
             }
 
             var declaration = parameter is CodeExplorerItemViewModel explorerItem
-                ? GetDeclaration(explorerItem)
+                ? explorerItem.Declaration
                 : GetDeclaration();
 
             if (!(Declaration.GetProjectParent(declaration) is ProjectDeclaration project))
@@ -46,7 +47,8 @@ protected override void OnExecute(object parameter)
             }
 
             var dialog = _factory.Create(project);
-            var model = dialog.Show();
+
+            var model = dialog?.Show();
             if (model is null)
             {
                 return;
@@ -65,7 +67,7 @@ protected override bool EvaluateCanExecute(object parameter)
 
             if (parameter is CodeExplorerItemViewModel explorerNode)
             {
-                return GetDeclaration(explorerNode) is ProjectDeclaration;
+                return explorerNode.Declaration is ProjectDeclaration;
             }
 
             using (var project = _vbe.ActiveVBProject)
@@ -74,16 +76,6 @@ protected override bool EvaluateCanExecute(object parameter)
             }
         }
 
-        private Declaration GetDeclaration(CodeExplorerItemViewModel node)
-        {
-            while (node != null && !(node is ICodeExplorerDeclarationViewModel))
-            {
-                node = node.Parent;
-            }
-
-            return (node as ICodeExplorerDeclarationViewModel)?.Declaration;
-        }
-
         private Declaration GetDeclaration()
         {
             using (var project = _vbe.ActiveVBProject)
@@ -92,7 +84,9 @@ private Declaration GetDeclaration()
                 {
                     return null;
                 }
-                return _state.DeclarationFinder.FindProject(project.Name);
+
+                return _state.DeclarationFinder.Projects.OfType<ProjectDeclaration>()
+                    .FirstOrDefault(declaration => project.ProjectId.Equals(declaration.ProjectId));
             }           
         }
     }