<s>solved</s> *circumvented* project equality problem

Author: retailcoder

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

@@ -83,7 +83,8 @@ private void HookKey(Keys key, uint shift)
             var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);
             if (!success)
             {
-                throw new Win32Exception("HotKey was not registered.");
+                Debug.WriteLine("Hotkey ({0}) not registered.", key);
+                //throw new Win32Exception("HotKey was not registered.");
             }
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -17,8 +17,14 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<Co
             _comments = comments.GroupBy(node => node.QualifiedSelection.QualifiedName)
                 .ToDictionary(grouping => grouping.Key, grouping => grouping.ToArray());
 
-            _declarationsByName = declarations.GroupBy(declaration => declaration.IdentifierName)
-                .ToDictionary(grouping => grouping.Key, grouping => grouping.ToArray());
+            _declarationsByName = declarations.GroupBy(declaration => new
+            {
+                IdentifierName = declaration.Project != null && 
+                    declaration.DeclarationType == DeclarationType.Project
+                        ? declaration.Project.Name
+                        : declaration.IdentifierName
+            })
+                .ToDictionary(grouping => grouping.Key.IdentifierName, grouping => grouping.ToArray());
         }
 
         private readonly HashSet<Accessibility> _projectScopePublicModifiers =

Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs

@@ -8,6 +8,7 @@
 using Rubberduck.Parsing.Nodes;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Parsing.Symbols
 {
@@ -37,9 +38,7 @@ public DeclarationSymbolsListener(QualifiedModuleName qualifiedName, Accessibili
             var project = _qualifiedName.Component.Collection.Parent;
             var projectQualifiedName = new QualifiedModuleName(project);
 
-            _projectDeclaration = new Declaration(
-                projectQualifiedName.QualifyMemberName(project.Name),
-                null, (Declaration)null, project.Name, false, false, Accessibility.Implicit, DeclarationType.Project, null, Selection.Home, false);
+            _projectDeclaration = CreateProjectDeclaration(projectQualifiedName, project);
 
             var key = Tuple.Create(_qualifiedName.ComponentName, declarationType);
             var moduleAttributes = attributes.ContainsKey(key)
@@ -61,6 +60,17 @@ public DeclarationSymbolsListener(QualifiedModuleName qualifiedName, Accessibili
             SetCurrentScope();
         }
 
+        private static Declaration CreateProjectDeclaration(QualifiedModuleName projectQualifiedName, VBProject project)
+        {
+            var projectName = project.ProjectName();
+
+            var declaration = new Declaration(
+                projectQualifiedName.QualifyMemberName(projectName),
+                null, (Declaration) null, projectName, false, false, Accessibility.Implicit, DeclarationType.Project, null,
+                Selection.Home, false);
+            return declaration;
+        }
+
         private string FindAnnotations()
         {
             if (_comments == null)

Rubberduck.VBEEditor/ActiveCodePaneEditor.cs

@@ -46,7 +46,6 @@ public void SetSelection(QualifiedSelection selection)
 
         public string GetLines(Selection selection)
         {
-            // ReSharper disable once UseIndexedProperty
             return Editor.get_Lines(selection.StartLine, selection.LineCount);
         }
 

Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs

@@ -7,6 +7,31 @@ namespace Rubberduck.VBEditor.Extensions
 {
     public static class ProjectExtensions
     {
+        public static string ProjectName(this VBProject project)
+        {
+            var projectName = project.Name;
+            var documentModule = project
+                .VBComponents.Cast<VBComponent>()
+                .FirstOrDefault(item => item.Type == vbext_ComponentType.vbext_ct_Document);
+
+            if (documentModule != null)
+            {
+                var hostDocumentNameProperty = documentModule.Properties.Item("Name");
+                if (hostDocumentNameProperty != null)
+                {
+                    projectName += string.Format(" ({0})", hostDocumentNameProperty.Value);
+                }
+            }
+
+            return projectName;
+        }
+
+        public static string ProjectName(this VBComponent component)
+        {
+            var project = component.Collection.Parent;
+            return project.ProjectName();
+        }
+
         public static IEnumerable<string> ComponentNames(this VBProject project)
         {
             foreach (VBComponent component in project.VBComponents)

Rubberduck.VBEEditor/QualifiedModuleName.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Vbe.Interop;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.VBEditor
 {
@@ -13,7 +14,7 @@ public QualifiedModuleName(VBProject project)
             _component = null;
             _componentName = null;
             _project = project;
-            _projectName = project.Name;
+            _projectName = project.ProjectName();
             _contentHashCode = 0;  
        }
 
@@ -24,7 +25,7 @@ public QualifiedModuleName(VBComponent component)
             _component = component;
             _componentName = component == null ? string.Empty : component.Name;
             _project = component == null ? null : component.Collection.Parent;
-            _projectName = component == null ? string.Empty : component.Collection.Parent.Name;
+            _projectName = component == null ? string.Empty : component.ProjectName();
 
             _contentHashCode = 0;
             if (component == null)
@@ -92,10 +93,10 @@ public override bool Equals(object obj)
                 var other = (QualifiedModuleName)obj;
                 if (other.Component == null)
                 {
-                    return other.Project == Project && other.ComponentName == ComponentName;
+                    return other.ProjectName == ProjectName && other.ComponentName == ComponentName;
                 }
 
-                var result = other.Project == Project // ugh. not reliable...
+                var result = other.ProjectName == ProjectName
                     && other.ComponentName == ComponentName 
                     && other._contentHashCode == _contentHashCode;
                 return result;