Merge pull request #1294 from retailcoder/next

fixed ProjectName issues

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -84,6 +84,11 @@ public void Startup()
         {
             CleanReloadConfig();
 
+            foreach (var project in _vbe.VBProjects.Cast<VBProject>())
+            {
+                _parser.State.AddProject(project);
+            }
+
             _appMenus.Initialize();
             _appMenus.Localize();
 

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs

@@ -83,7 +83,7 @@ private static IEnumerable<CodeExplorerItemViewModel> FindFolders(IEnumerable<De
         public override BitmapImage CollapsedIcon { get { return _icon; } }
         public override BitmapImage ExpandedIcon { get { return _icon; } }
 
-        public override string Name { get { return _declaration.CustomFolder; } }
+        public override string Name { get { return _declaration.IdentifierName; } }
         public override QualifiedSelection? QualifiedSelection { get { return _declaration.QualifiedSelection; } }
     }
 }

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -87,7 +87,7 @@ private void ParserState_StateChanged(object sender, EventArgs e)
 
             Debug.WriteLine("Creating Code Explorer model...");
             var userDeclarations = _state.AllUserDeclarations
-                .GroupBy(declaration => declaration.Project)
+                .GroupBy(declaration => declaration.ProjectName)
                 .Where(grouping => grouping.Key != null)
                 .ToList();
 

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -62,7 +62,9 @@ public Declaration(QualifiedMemberName qualifiedName, Declaration parentDeclarat
             string result;
             if (string.IsNullOrEmpty(ns))
             {
-                result = _projectName;
+                result = _qualifiedName.QualifiedModuleName.Project == null
+                    ? _projectName
+                    : _qualifiedName.QualifiedModuleName.Project.Name;
             }
             else
             {

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -11,6 +11,7 @@
 using Rubberduck.Parsing.Nodes;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Parsing.VBA
 {
@@ -44,7 +45,7 @@ public sealed class RubberduckParserState
         public event EventHandler<ParseRequestEventArgs> ParseRequest;
 
         // circumvents VBIDE API's tendency to return a new instance at every parse, which breaks reference equality checks everywhere
-        private readonly IList<VBProject> _projects = new List<VBProject>();
+        private readonly IDictionary<string,VBProject> _projects = new Dictionary<string,VBProject>();
 
         private readonly ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<Declaration, byte>> _declarations =
             new ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<Declaration, byte>>();
@@ -69,21 +70,23 @@ public sealed class RubberduckParserState
 
         public void AddProject(VBProject project)
         {
-            if (!_projects.Contains(project))
+            var name = project.ProjectName();
+            if (!_projects.ContainsKey(name))
             {
-                _projects.Add(project);
+                _projects.Add(name, project);
             }
         }
 
         public void RemoveProject(VBProject project)
         {
-            if (_projects.Contains(project))
+            var name = project.ProjectName();
+            if (_projects.ContainsKey(name))
             {
-                _projects.Remove(project);
+                _projects.Remove(name);
             }
         }
 
-        public IReadOnlyList<VBProject> Projects { get { return _projects.ToList(); } }
+        public IReadOnlyList<VBProject> Projects { get { return _projects.Values.ToList(); } }
 
         public IReadOnlyList<Tuple<VBComponent, SyntaxErrorException>> ModuleExceptions
         {
@@ -304,9 +307,9 @@ public void ClearBuiltInReferences()
 
         public bool ClearDeclarations(VBComponent component)
         {
-            var projectName = component.Collection.Parent.Name;
+            var projectName = component.Collection.Parent.ProjectName();
             var keys = _declarations.Keys.Where(kvp => 
-                kvp.ProjectName == projectName && kvp.ComponentName == component.Name); // COM object references aren't reliable
+                kvp.ProjectName == projectName && kvp.ComponentName == component.Name); 
 
             var success = true;
             var declarationsRemoved = 0;

Rubberduck.VBEEditor/QualifiedMemberName.cs

@@ -23,8 +23,13 @@ public override string ToString()
 
         public override int GetHashCode()
         {
-            // note: fingers crossed here
-            return (_qualifiedModuleName.GetHashCode() + _qualifiedModuleName.ToString() + _memberName).GetHashCode();
+            unchecked
+            {
+                var hash = 17;
+                hash = hash * 23 + _qualifiedModuleName.GetHashCode();
+                hash = hash * 23 + _memberName.GetHashCode();
+                return hash;
+            }
         }
 
         public override bool Equals(object obj)

Rubberduck.VBEEditor/QualifiedModuleName.cs

@@ -81,7 +81,13 @@ public override string ToString()
 
         public override int GetHashCode()
         {
-            return _component == null ? 0 : _component.GetHashCode();
+            unchecked
+            {
+                var hash = 17;
+                hash = hash * 23 + _projectName.GetHashCode();
+                hash = hash * 23 + (_component == null ? 0 : _component.GetHashCode());
+                return hash;
+            }
         }
 
         public override bool Equals(object obj)
@@ -97,8 +103,7 @@ public override bool Equals(object obj)
                 }
 
                 var result = other.ProjectName == ProjectName
-                    && other.ComponentName == ComponentName 
-                    && other._contentHashCode == _contentHashCode;
+                    && other.ComponentName == ComponentName;
                 return result;
             }
             catch (InvalidCastException)