Merge pull request #1298 from retailcoder/next

retailcoder · retailcoder · commit ece3a5d18c88 · 2016-04-03T14:18:15.000-04:00
replaced Project.Equals with ProjectName.Equals everywhere
diff --git a/RetailCoder.VBE/Common/DeclarationExtensions.cs b/RetailCoder.VBE/Common/DeclarationExtensions.cs
@@ -354,7 +354,7 @@ public static IEnumerable<Declaration> FindEventProcedures(this IEnumerable<Decl
             var handlerNames = events.Select(e => withEventsDeclaration.IdentifierName + '_' + e.IdentifierName);
 
             return items.Where(item => item.Project != null 
-                                               && item.Project.Equals(withEventsDeclaration.Project)
+                                               && item.ProjectName == withEventsDeclaration.ProjectName
                                                && item.ParentScope == withEventsDeclaration.ParentScope
                                                && item.DeclarationType == DeclarationType.Procedure
                                                && handlerNames.Any(name => item.IdentifierName == name))
@@ -363,7 +363,7 @@ public static IEnumerable<Declaration> FindEventProcedures(this IEnumerable<Decl
 
         private static IEnumerable<Declaration> GetTypeMembers(this IEnumerable<Declaration> declarations, Declaration type)
         {
-            return declarations.Where(item => item.Project != null && item.Project.Equals(type.Project) && item.ParentScope == type.Scope);
+            return declarations.Where(item => item.Project != null && item.ProjectName == type.ProjectName && item.ParentScope == type.Scope);
         }
 
             /// <summary>
@@ -394,7 +394,7 @@ public static Declaration FindInterfaceMember(this IEnumerable<Declaration> decl
             var matches = members.Where(m => !m.IsBuiltIn && implementation.IdentifierName == m.ComponentName + '_' + m.IdentifierName).ToList();
 
             return matches.Count > 1 
-                ? matches.SingleOrDefault(m => m.Project == implementation.Project) 
+                ? matches.SingleOrDefault(m => m.ProjectName == implementation.ProjectName) 
                 : matches.First();
         }
 
diff --git a/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs b/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs
@@ -83,7 +83,7 @@ private bool IsPublicModuleMember(IEnumerable<Declaration> modules, Declaration
                 return false;
             }
 
-            var parent = modules.Where(item => item.Project == procedure.Project)
+            var parent = modules.Where(item => item.ProjectName == procedure.ProjectName)
                         .SingleOrDefault(item => item.IdentifierName == procedure.ComponentName);
 
             return parent != null;
@@ -102,7 +102,7 @@ private bool IsClassLifeCycleHandler(IEnumerable<Declaration> classes, Declarati
                 return false;
             }
 
-            var parent = classes.Where(item => item.Project == procedure.Project)
+            var parent = classes.Where(item => item.ProjectName == procedure.ProjectName)
                         .SingleOrDefault(item => item.IdentifierName == procedure.ComponentName);
 
             return parent != null;
@@ -118,7 +118,7 @@ private bool IsInterfaceMember(IEnumerable<Declaration> declarations, IEnumerabl
         {
             // get the procedure's parent module
             var enumerable = classes as IList<Declaration> ?? classes.ToList();
-            var parent = enumerable.Where(item => item.Project == procedure.Project)
+            var parent = enumerable.Where(item => item.ProjectName == procedure.ProjectName)
                         .SingleOrDefault(item => item.IdentifierName == procedure.ComponentName);
 
             if (parent == null)
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs
@@ -49,7 +49,7 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel
             InterfaceName = "I" + TargetDeclaration.IdentifierName;
 
             _members = declarations.Where(item => !item.IsBuiltIn
-                                                  && item.Project == _targetDeclaration.Project
+                                                  && item.ProjectName == _targetDeclaration.ProjectName
                                                   && item.ComponentName == _targetDeclaration.ComponentName
                                                   && (item.Accessibility == Accessibility.Public || item.Accessibility == Accessibility.Implicit)
                                                   && MemberTypes.Contains(item.DeclarationType))
diff --git a/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs b/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs
@@ -206,7 +206,7 @@ private IEnumerable<Declaration> GetInterfaceMembers()
         private IEnumerable<Declaration> GetImplementedMembers()
         {
             return _declarations.FindInterfaceImplementationMembers()
-                                .Where(item => item.Project.Equals(_targetInterface.Project)
+                                .Where(item => item.ProjectName == _targetInterface.ProjectName
                                         && item.ComponentName == _targetClass.IdentifierName
                                         && item.IdentifierName.StartsWith(_targetInterface.ComponentName + "_")
                                         && !item.Equals(_targetClass))
diff --git a/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/RetailCoder.VBE/Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs
@@ -148,7 +148,7 @@ private void UpdateSignature(Declaration targetVariable)
             UpdateSignature(interfaceImplementation, targetVariable);
 
             var interfaceImplementations = _declarations.FindInterfaceImplementationMembers()
-                                                    .Where(item => item.Project.Equals(interfaceImplementation.Project)
+                                                    .Where(item => item.ProjectName == interfaceImplementation.ProjectName
                                                            && item.IdentifierName == interfaceImplementation.ComponentName + "_" + interfaceImplementation.IdentifierName
                                                            && !item.Equals(functionDeclaration));
 
diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersModel.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersModel.cs
@@ -67,7 +67,7 @@ private IEnumerable<Declaration> GetParameters()
 
             return Declarations.Where(d => d.DeclarationType == DeclarationType.Parameter
                                        && d.ComponentName == TargetDeclaration.ComponentName
-                                       && d.Project.Equals(TargetDeclaration.Project)
+                                       && d.ProjectName == TargetDeclaration.ProjectName
                                        && targetSelection.Contains(d.Selection))
                               .OrderBy(item => item.Selection.StartLine)
                               .ThenBy(item => item.Selection.StartColumn);
diff --git a/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs b/RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs
@@ -273,7 +273,7 @@ private void AdjustSignatures()
             }
 
             var interfaceImplementations = _model.Declarations.FindInterfaceImplementationMembers()
-                                                        .Where(item => item.Project.Equals(_model.TargetDeclaration.Project) &&
+                                                        .Where(item => item.ProjectName == _model.TargetDeclaration.ProjectName &&
                                                                item.IdentifierName == _model.TargetDeclaration.ComponentName + "_" + _model.TargetDeclaration.IdentifierName);
             foreach (var interfaceImplentation in interfaceImplementations)
             {
diff --git a/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs b/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs
@@ -12,6 +12,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Refactorings.Rename
 {
@@ -77,7 +78,7 @@ private Declaration FindDeclarationForIdentifier()
             {
                 var targetReference = reference;
                 var potentialDeclarations = _model.Declarations.Where(item => !item.IsBuiltIn
-                                                         && item.Project.Equals(targetReference.Declaration.Project)
+                                                         && item.ProjectName == targetReference.Declaration.ProjectName
                                                          && ((item.Context != null
                                                          && item.Context.Start.Line <= targetReference.Selection.StartLine
                                                          && item.Context.Stop.Line >= targetReference.Selection.EndLine)
@@ -148,7 +149,7 @@ private void Rename()
             {
                 // properties can have more than 1 member.
                 var members = _model.Declarations.Named(_model.Target.IdentifierName)
-                    .Where(item => item.Project == _model.Target.Project
+                    .Where(item => item.ProjectName == _model.Target.ProjectName
                         && item.ComponentName == _model.Target.ComponentName
                         && item.DeclarationType.HasFlag(DeclarationType.Property));
                 foreach (var member in members)
@@ -211,7 +212,7 @@ private void RenameProject()
         {
             try
             {
-                var project = _state.Projects.SingleOrDefault(p => p == _model.Target.Project);
+                var project = _state.Projects.SingleOrDefault(p => p.ProjectName() == _model.Target.ProjectName);
                 if (project != null)
                 {
                     project.Name = _model.NewName;
@@ -250,7 +251,7 @@ private void RenameDeclaration(Declaration target, string newName)
             else
             {
                 var members = _model.Declarations.Named(target.IdentifierName)
-                    .Where(item => item.Project == target.Project
+                    .Where(item => item.ProjectName == target.ProjectName
                         && item.ComponentName == target.ComponentName
                         && item.DeclarationType.HasFlag(DeclarationType.Property));
 
diff --git a/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs b/RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs
@@ -182,7 +182,7 @@ private void AdjustSignatures()
             }
 
             var interfaceImplementations = _model.Declarations.FindInterfaceImplementationMembers()
-                                                        .Where(item => item.Project.Equals(_model.TargetDeclaration.Project) &&
+                                                        .Where(item => item.ProjectName == _model.TargetDeclaration.ProjectName &&
                                                                item.IdentifierName == _model.TargetDeclaration.ComponentName + "_" + _model.TargetDeclaration.IdentifierName);
             foreach (var interfaceImplentation in interfaceImplementations)
             {
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs
@@ -7,6 +7,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.UI.Refactorings;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
@@ -55,7 +56,7 @@ private Declaration GetTarget()
                     return _state.AllUserDeclarations
                         .FirstOrDefault(item => item.IdentifierName == control.Name &&
                                                 item.ComponentName == Vbe.SelectedVBComponent.Name &&
-                                                Vbe.ActiveVBProject.Equals(item.Project));
+                                                Vbe.ActiveVBProject.ProjectName() == item.ProjectName);
                 }
             }
 
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs
@@ -7,6 +7,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.UI.Refactorings;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
@@ -50,7 +51,7 @@ private Declaration GetTarget()
             
             return _state.AllUserDeclarations.SingleOrDefault(
                     t => t.IdentifierName == Vbe.SelectedVBComponent.Name &&
-                            t.Project == Vbe.ActiveVBProject &&
+                            t.ProjectName == Vbe.ActiveVBProject.ProjectName() &&
                             new[]
                                 {
                                     DeclarationType.Class,
diff --git a/RetailCoder.VBE/UI/Command/ShowParserErrorsCommand.cs b/RetailCoder.VBE/UI/Command/ShowParserErrorsCommand.cs
@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Controls;
+using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.UI.Command
 {
@@ -61,7 +62,7 @@ private SearchResultsViewModel CreateViewModel()
 
         private Declaration FindModuleDeclaration(VBComponent component)
         {
-            return _state.AllUserDeclarations.Single(item => item.Project == component.Collection.Parent
+            return _state.AllUserDeclarations.Single(item => item.ProjectName == component.Collection.Parent.ProjectName()
                                                              && item.QualifiedName.QualifiedModuleName.Component == component 
                                                              && (item.DeclarationType == DeclarationType.Class || item.DeclarationType == DeclarationType.Module));
         }
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -534,7 +534,7 @@ public string CustomFolder
         public bool Equals(Declaration other)
         {
             return other != null
-                && other.Project == Project
+                && other.ProjectName == ProjectName
                 && other.IdentifierName == IdentifierName
                 && other.DeclarationType == DeclarationType
                 && other.Scope == Scope
diff --git a/Rubberduck.Parsing/Symbols/DeclarationFinder.cs b/Rubberduck.Parsing/Symbols/DeclarationFinder.cs
@@ -18,12 +18,12 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<Co
                 .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
-            })
+                {
+                    IdentifierName = declaration.Project != null && 
+                        declaration.DeclarationType == DeclarationType.Project
+                            ? declaration.Project.Name
+                            : declaration.IdentifierName
+                })
                 .ToDictionary(grouping => grouping.Key.IdentifierName, grouping => grouping.ToArray());
         }
 
@@ -83,7 +83,7 @@ public Declaration FindProject(Declaration currentScope, string name)
             try
             {
                 result = MatchName(name).SingleOrDefault(project => project.DeclarationType == DeclarationType.Project 
-                    && (currentScope == null || project.Project == currentScope.Project));
+                    && (currentScope == null || project.ProjectName == currentScope.ProjectName));
             }
             catch (InvalidOperationException exception)
             {
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
@@ -340,15 +340,15 @@ private Declaration ResolveInScopeType(string identifier, Declaration scope)
                 return matches.Single();
             }
 
-            if (matches.Count(match => match.Project == scope.Project) == 1)
+            if (matches.Count(match => match.ProjectName == scope.ProjectName) == 1)
             {
-                return matches.Single(match => match.Project == scope.Project);
+                return matches.Single(match => match.ProjectName == scope.ProjectName);
             }
 
             // more than one matching identifiers found.
             // if it matches a UDT or enum in the current scope, resolve to that type.
             var sameScopeUdt = matches.Where(declaration =>
-                declaration.Project == scope.Project
+                declaration.ProjectName == scope.ProjectName
                 && (declaration.DeclarationType == DeclarationType.UserDefinedType
                 || declaration.DeclarationType == DeclarationType.Enumeration)
                 && declaration.ParentDeclaration.Equals(scope))
@@ -395,15 +395,15 @@ private Declaration ResolveType(Declaration parent)
             var result = matches.Where(item =>
                 (item.DeclarationType == DeclarationType.UserDefinedType
                 || item.DeclarationType == DeclarationType.Enumeration)
-                && item.Project == _currentScope.Project
+                && item.ProjectName == _currentScope.ProjectName
                 && item.ComponentName == _currentScope.ComponentName)
             .ToList();
 
             if (!result.Any())
             {
                 result = matches.Where(item =>
                     _moduleTypes.Contains(item.DeclarationType)
-                    && item.Project == _currentScope.Project)
+                    && item.ProjectName == _currentScope.ProjectName)
                 .ToList();                
             }
 
@@ -1111,7 +1111,7 @@ private Declaration FindModuleScopeDeclaration(string identifierName, Declaratio
         private bool IsLocalEvent(Declaration item, Declaration localScope)
         {
             return item.DeclarationType == DeclarationType.Event
-                   && localScope.Project == _currentScope.Project
+                   && localScope.ProjectName == _currentScope.ProjectName
                    && localScope.ComponentName == _currentScope.ComponentName;
         }
 
@@ -1297,7 +1297,7 @@ private static bool IsProcedure(Declaration item, Declaration localScope)
         {
             var isProcedure = item.DeclarationType == DeclarationType.Procedure
                               || item.DeclarationType == DeclarationType.Function;
-            var isSameModule = item.Project == localScope.Project
+            var isSameModule = item.ProjectName == localScope.ProjectName
                                && item.ComponentName == localScope.ComponentName;
             return isProcedure && isSameModule;
         }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ private IEnumerable<Declaration> GetInterfaceMembers()`
`206`	`206`	`private IEnumerable<Declaration> GetImplementedMembers()`
`207`	`207`	`{`
`208`	`208`	`return _declarations.FindInterfaceImplementationMembers()`
`209`		`- .Where(item => item.Project.Equals(_targetInterface.Project)`
	`209`	`+ .Where(item => item.ProjectName == _targetInterface.ProjectName`
`210`	`210`	`&& item.ComponentName == _targetClass.IdentifierName`
`211`	`211`	`&& item.IdentifierName.StartsWith(_targetInterface.ComponentName + "_")`
`212`	`212`	`&& !item.Equals(_targetClass))`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ private void AdjustSignatures()`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`var interfaceImplementations = _model.Declarations.FindInterfaceImplementationMembers()`
`276`		`- .Where(item => item.Project.Equals(_model.TargetDeclaration.Project) &&`
	`276`	`+ .Where(item => item.ProjectName == _model.TargetDeclaration.ProjectName &&`
`277`	`277`	`item.IdentifierName == _model.TargetDeclaration.ComponentName + "_" + _model.TargetDeclaration.IdentifierName);`
`278`	`278`	`foreach (var interfaceImplentation in interfaceImplementations)`
`279`	`279`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Rubberduck.Parsing.VBA;`
`13`	`13`	`using Rubberduck.UI;`
`14`	`14`	`using Rubberduck.VBEditor;`
	`15`	`+using Rubberduck.VBEditor.Extensions;`
`15`	`16`
`16`	`17`	`namespace Rubberduck.Refactorings.Rename`
`17`	`18`	`{`
`@@ -77,7 +78,7 @@ private Declaration FindDeclarationForIdentifier()`
`77`	`78`	`{`
`78`	`79`	`var targetReference = reference;`
`79`	`80`	`var potentialDeclarations = _model.Declarations.Where(item => !item.IsBuiltIn`
`80`		`- && item.Project.Equals(targetReference.Declaration.Project)`
	`81`	`+ && item.ProjectName == targetReference.Declaration.ProjectName`
`81`	`82`	`&& ((item.Context != null`
`82`	`83`	`&& item.Context.Start.Line <= targetReference.Selection.StartLine`
`83`	`84`	`&& item.Context.Stop.Line >= targetReference.Selection.EndLine)`
`@@ -148,7 +149,7 @@ private void Rename()`
`148`	`149`	`{`
`149`	`150`	`// properties can have more than 1 member.`
`150`	`151`	`var members = _model.Declarations.Named(_model.Target.IdentifierName)`
`151`		`- .Where(item => item.Project == _model.Target.Project`
	`152`	`+ .Where(item => item.ProjectName == _model.Target.ProjectName`
`152`	`153`	`&& item.ComponentName == _model.Target.ComponentName`
`153`	`154`	`&& item.DeclarationType.HasFlag(DeclarationType.Property));`
`154`	`155`	`foreach (var member in members)`
`@@ -211,7 +212,7 @@ private void RenameProject()`
`211`	`212`	`{`
`212`	`213`	`try`
`213`	`214`	`{`
`214`		`- var project = _state.Projects.SingleOrDefault(p => p == _model.Target.Project);`
	`215`	`+ var project = _state.Projects.SingleOrDefault(p => p.ProjectName() == _model.Target.ProjectName);`
`215`	`216`	`if (project != null)`
`216`	`217`	`{`
`217`	`218`	`project.Name = _model.NewName;`
`@@ -250,7 +251,7 @@ private void RenameDeclaration(Declaration target, string newName)`
`250`	`251`	`else`
`251`	`252`	`{`
`252`	`253`	`var members = _model.Declarations.Named(target.IdentifierName)`
`253`		`- .Where(item => item.Project == target.Project`
	`254`	`+ .Where(item => item.ProjectName == target.ProjectName`
`254`	`255`	`&& item.ComponentName == target.ComponentName`
`255`	`256`	`&& item.DeclarationType.HasFlag(DeclarationType.Property));`
`256`	`257`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private void AdjustSignatures()`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`var interfaceImplementations = _model.Declarations.FindInterfaceImplementationMembers()`
`185`		`- .Where(item => item.Project.Equals(_model.TargetDeclaration.Project) &&`
	`185`	`+ .Where(item => item.ProjectName == _model.TargetDeclaration.ProjectName &&`
`186`	`186`	`item.IdentifierName == _model.TargetDeclaration.ComponentName + "_" + _model.TargetDeclaration.IdentifierName);`
`187`	`187`	`foreach (var interfaceImplentation in interfaceImplementations)`
`188`	`188`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Rubberduck.Parsing.VBA;`
`8`	`8`	`using Rubberduck.Refactorings.Rename;`
`9`	`9`	`using Rubberduck.UI.Refactorings;`
	`10`	`+using Rubberduck.VBEditor.Extensions;`
`10`	`11`
`11`	`12`	`namespace Rubberduck.UI.Command.Refactorings`
`12`	`13`	`{`
`@@ -55,7 +56,7 @@ private Declaration GetTarget()`
`55`	`56`	`return _state.AllUserDeclarations`
`56`	`57`	`.FirstOrDefault(item => item.IdentifierName == control.Name &&`
`57`	`58`	`item.ComponentName == Vbe.SelectedVBComponent.Name &&`
`58`		`- Vbe.ActiveVBProject.Equals(item.Project));`
	`59`	`+ Vbe.ActiveVBProject.ProjectName() == item.ProjectName);`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`