renamed ProjectName to ProjectId, implemented changes to store original hashcode in Project.HelpFile

retailcoder · retailcoder · commit 8dfc3d4b448d · 2016-04-20T01:31:21.000-04:00
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -335,8 +335,8 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje
                 return;
             }
 
-            Debug.WriteLine("Project '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
-            _parser.State.RemoveProject(e.OldName);
+            Debug.WriteLine("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
+            _parser.State.RemoveProject(e.Item.HelpFile);
             _parser.State.OnParseRequested(sender);
         }
 
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.ProjectName == withEventsDeclaration.ProjectName
+                                               && item.ProjectId == withEventsDeclaration.ProjectId
                                                && 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.ProjectName == type.ProjectName && item.ParentScope == type.Scope);
+            return declarations.Where(item => item.Project != null && item.ProjectId == type.ProjectId && 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.ProjectName == implementation.ProjectName) 
+                ? matches.SingleOrDefault(m => m.ProjectId == implementation.ProjectId) 
                 : matches.First();
         }
 
diff --git a/RetailCoder.VBE/Inspections/InspectionResultBase.cs b/RetailCoder.VBE/Inspections/InspectionResultBase.cs
@@ -103,7 +103,7 @@ public override string ToString()
                 InspectionsUI.QualifiedSelectionInspection,
                 Inspection.Severity,
                 Description,
-                module.ProjectName,
+                module.ProjectId,
                 module.ComponentName,
                 QualifiedSelection.Selection.StartLine);
         }
@@ -121,7 +121,7 @@ public int CompareTo(object obj)
         public object[] ToArray()
         {
             var module = QualifiedSelection.QualifiedName;
-            return new object[] {Inspection.Severity.ToString(), Description, module.ProjectName, module.ComponentName, QualifiedSelection.Selection.StartLine };
+            return new object[] {Inspection.Severity.ToString(), Description, module.ProjectId, module.ComponentName, QualifiedSelection.Selection.StartLine };
         }
 
         public string ToCsvString()
@@ -131,7 +131,7 @@ public string ToCsvString()
                 "\"{0}\",\"{1}\",\"{2}\",\"{3}\",{4}",
                 Inspection.Severity,
                 Description,
-                module.ProjectName,
+                module.ProjectId,
                 module.ComponentName,
                 QualifiedSelection.Selection.StartLine);
         }
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.ProjectName == procedure.ProjectName)
+            var parent = modules.Where(item => item.ProjectId == procedure.ProjectId)
                         .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.ProjectName == procedure.ProjectName)
+            var parent = classes.Where(item => item.ProjectId == procedure.ProjectId)
                         .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.ProjectName == procedure.ProjectName)
+            var parent = enumerable.Where(item => item.ProjectId == procedure.ProjectId)
                         .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.ProjectName == _targetDeclaration.ProjectName
+                                                  && item.ProjectId == _targetDeclaration.ProjectId
                                                   && 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.ProjectName == _targetInterface.ProjectName
+                                .Where(item => item.ProjectId == _targetInterface.ProjectId
                                         && 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.ProjectName == interfaceImplementation.ProjectName
+                                                    .Where(item => item.ProjectId == interfaceImplementation.ProjectId
                                                            && 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.ProjectName == TargetDeclaration.ProjectName
+                                       && d.ProjectId == TargetDeclaration.ProjectId
                                        && 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.ProjectName == _model.TargetDeclaration.ProjectName &&
+                                                        .Where(item => item.ProjectId == _model.TargetDeclaration.ProjectId &&
                                                                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,7 +12,6 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI;
 using Rubberduck.VBEditor;
-using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Refactorings.Rename
 {
@@ -78,7 +77,7 @@ private Declaration FindDeclarationForIdentifier()
             {
                 var targetReference = reference;
                 var potentialDeclarations = _model.Declarations.Where(item => !item.IsBuiltIn
-                                                         && item.ProjectName == targetReference.Declaration.ProjectName
+                                                         && item.ProjectId == targetReference.Declaration.ProjectId
                                                          && ((item.Context != null
                                                          && item.Context.Start.Line <= targetReference.Selection.StartLine
                                                          && item.Context.Stop.Line >= targetReference.Selection.EndLine)
@@ -149,7 +148,7 @@ private void Rename()
             {
                 // properties can have more than 1 member.
                 var members = _model.Declarations.Named(_model.Target.IdentifierName)
-                    .Where(item => item.ProjectName == _model.Target.ProjectName
+                    .Where(item => item.ProjectId == _model.Target.ProjectId
                         && item.ComponentName == _model.Target.ComponentName
                         && item.DeclarationType.HasFlag(DeclarationType.Property));
                 foreach (var member in members)
@@ -212,7 +211,7 @@ private void RenameProject()
         {
             try
             {
-                var project = _state.Projects.SingleOrDefault(p => p.ProjectName() == _model.Target.ProjectName);
+                var project = _state.Projects.SingleOrDefault(p => p.HelpFile == _model.Target.ProjectId);
                 if (project != null)
                 {
                     project.Name = _model.NewName;
@@ -251,7 +250,7 @@ private void RenameDeclaration(Declaration target, string newName)
             else
             {
                 var members = _model.Declarations.Named(target.IdentifierName)
-                    .Where(item => item.ProjectName == target.ProjectName
+                    .Where(item => item.ProjectId == target.ProjectId
                         && 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.ProjectName == _model.TargetDeclaration.ProjectName &&
+                                                        .Where(item => item.ProjectId == _model.TargetDeclaration.ProjectId &&
                                                                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
@@ -61,7 +61,7 @@ private Declaration GetTarget()
                     return _state.AllUserDeclarations
                         .FirstOrDefault(item => item.IdentifierName == control.Name &&
                                                 item.ComponentName == Vbe.SelectedVBComponent.Name &&
-                                                Vbe.ActiveVBProject.ProjectName() == item.ProjectName);
+                                                Vbe.ActiveVBProject.HelpFile == item.ProjectId);
                 }
             }
 
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/ProjectExplorerRefactorRenameCommand.cs
@@ -51,7 +51,7 @@ private Declaration GetTarget()
             
             return _state.AllUserDeclarations.SingleOrDefault(
                     t => t.IdentifierName == Vbe.SelectedVBComponent.Name &&
-                            t.ProjectName == Vbe.ActiveVBProject.ProjectName() &&
+                            t.ProjectId == Vbe.ActiveVBProject.HelpFile &&
                             new[]
                                 {
                                     DeclarationType.Class,
diff --git a/RetailCoder.VBE/UI/Command/ShowParserErrorsCommand.cs b/RetailCoder.VBE/UI/Command/ShowParserErrorsCommand.cs
@@ -71,12 +71,12 @@ private SearchResultsViewModel CreateViewModel()
 
         private Declaration FindModuleDeclaration(VBComponent component)
         {
-            var projectName = component.ProjectName();
+            var projectId = component.Collection.Parent.HelpFile;
 
             var project = _state.AllUserDeclarations.SingleOrDefault(item => 
-                item.DeclarationType == DeclarationType.Project && item.ProjectName == projectName);
+                item.DeclarationType == DeclarationType.Project && item.ProjectId == projectId);
 
-            var result = _state.AllUserDeclarations.SingleOrDefault(item => item.ProjectName == component.Collection.Parent.ProjectName()
+            var result = _state.AllUserDeclarations.SingleOrDefault(item => item.ProjectId == component.Collection.Parent.HelpFile
                                                              && item.QualifiedName.QualifiedModuleName.ComponentName == component.Name
                                                              && (item.DeclarationType == DeclarationType.Class || item.DeclarationType == DeclarationType.Module));
 
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -20,25 +20,26 @@ namespace Rubberduck.Parsing.Symbols
     public class Declaration : IEquatable<Declaration>
     {
         public Declaration(
-            QualifiedMemberName qualifiedName, 
-            Declaration parentDeclaration, 
+            QualifiedMemberName qualifiedName,
+            Declaration parentDeclaration,
             Declaration parentScope,
-            string asTypeName, 
+            string asTypeName,
             bool isSelfAssigned,
             bool isWithEvents,
-            Accessibility accessibility, 
-            DeclarationType declarationType, 
-            ParserRuleContext context, 
-            Selection selection, 
+            Accessibility accessibility,
+            DeclarationType declarationType,
+            ParserRuleContext context,
+            Selection selection,
             bool isBuiltIn = true,
-            IEnumerable<IAnnotation> annotations = null, 
+            IEnumerable<IAnnotation> annotations = null,
             Attributes attributes = null)
             : this(
-                qualifiedName, parentDeclaration, parentScope == null ? null : parentScope.Scope, asTypeName, isSelfAssigned, isWithEvents,
+                qualifiedName, parentDeclaration, parentScope == null ? null : parentScope.Scope, asTypeName,
+                isSelfAssigned, isWithEvents,
                 accessibility, declarationType, context, selection, isBuiltIn, annotations, attributes)
         {
             _parentScopeDeclaration = parentScope;
-       }
+        }
 
         public Declaration(
             QualifiedMemberName qualifiedName, 
@@ -85,14 +86,14 @@ public Declaration(
             _annotations = annotations;
             _attributes = attributes ?? new Attributes();
 
-            _projectName = _qualifiedName.QualifiedModuleName.ProjectName;
+            _projectId = _qualifiedName.QualifiedModuleName.ProjectId;
 
             var @namespace = Annotations.FirstOrDefault(annotation => annotation.AnnotationType == AnnotationType.Folder);
             string result;
             if (@namespace == null)
             {
                 result = _qualifiedName.QualifiedModuleName.Project == null
-                    ? _projectName
+                    ? _projectId
                     : _qualifiedName.QualifiedModuleName.Project.Name;
             }
             else
@@ -305,11 +306,11 @@ public void AddMemberCall(IdentifierReference reference)
         /// </remarks>
         public VBProject Project { get { return _qualifiedName.QualifiedModuleName.Project; } }
 
-        private readonly string _projectName;
+        private readonly string _projectId;
         /// <summary>
-        /// Gets the name of the VBProject the declaration is made in.
+        /// Gets a unique identifier for the VBProject the declaration is made in.
         /// </summary>
-        public string ProjectName { get { return _projectName; } }
+        public string ProjectId { get { return _projectId; } }
 
         /// <summary>
         /// Gets the name of the VBComponent the declaration is made in.
@@ -560,7 +561,7 @@ public string CustomFolder
         public bool Equals(Declaration other)
         {
             return other != null
-                && other.ProjectName == ProjectName
+                && other.ProjectId == ProjectId
                 && other.IdentifierName == IdentifierName
                 && other.DeclarationType == DeclarationType
                 && other.Scope == Scope
diff --git a/Rubberduck.Parsing/Symbols/DeclarationFinder.cs b/Rubberduck.Parsing/Symbols/DeclarationFinder.cs
@@ -101,7 +101,7 @@ public Declaration FindProject(Declaration currentScope, string name)
             try
             {
                 result = MatchName(name).SingleOrDefault(project => project.DeclarationType == DeclarationType.Project 
-                    && (currentScope == null || project.ProjectName == currentScope.ProjectName));
+                    && (currentScope == null || project.ProjectId == currentScope.ProjectId));
             }
             catch (InvalidOperationException exception)
             {
diff --git a/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs b/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs
@@ -71,11 +71,9 @@ public DeclarationSymbolsListener(
 
         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,
+                projectQualifiedName.QualifyMemberName(project.Name),
+                null, (Declaration) null, project.Name, false, false, Accessibility.Implicit, DeclarationType.Project, null,
                 Selection.Home, false);
             return declaration;
         }
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
diff --git a/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs
diff --git a/Rubberduck.VBEEditor/QualifiedModuleName.cs b/Rubberduck.VBEEditor/QualifiedModuleName.cs
diff --git a/Rubberduck.VBEEditor/VBEHost/CorelDRAWApp.cs b/Rubberduck.VBEEditor/VBEHost/CorelDRAWApp.cs
diff --git a/RubberduckTests/Grammar/ResolverTests.cs b/RubberduckTests/Grammar/ResolverTests.cs

Original file line number	Diff line number	Diff line change
`@@ -335,8 +335,8 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje`
`335`	`335`	`return;`
`336`	`336`	`}`
`337`	`337`
`338`		`- Debug.WriteLine("Project '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);`
`339`		`- _parser.State.RemoveProject(e.OldName);`
	`338`	`+ Debug.WriteLine("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);`
	`339`	`+ _parser.State.RemoveProject(e.Item.HelpFile);`
`340`	`340`	`_parser.State.OnParseRequested(sender);`
`341`	`341`	`}`
`342`	`342`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public override string ToString()`
`103`	`103`	`InspectionsUI.QualifiedSelectionInspection,`
`104`	`104`	`Inspection.Severity,`
`105`	`105`	`Description,`
`106`		`- module.ProjectName,`
	`106`	`+ module.ProjectId,`
`107`	`107`	`module.ComponentName,`
`108`	`108`	`QualifiedSelection.Selection.StartLine);`
`109`	`109`	`}`
`@@ -121,7 +121,7 @@ public int CompareTo(object obj)`
`121`	`121`	`public object[] ToArray()`
`122`	`122`	`{`
`123`	`123`	`var module = QualifiedSelection.QualifiedName;`
`124`		`- return new object[] {Inspection.Severity.ToString(), Description, module.ProjectName, module.ComponentName, QualifiedSelection.Selection.StartLine };`
	`124`	`+ return new object[] {Inspection.Severity.ToString(), Description, module.ProjectId, module.ComponentName, QualifiedSelection.Selection.StartLine };`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`public string ToCsvString()`
`@@ -131,7 +131,7 @@ public string ToCsvString()`
`131`	`131`	`"\"{0}\",\"{1}\",\"{2}\",\"{3}\",{4}",`
`132`	`132`	`Inspection.Severity,`
`133`	`133`	`Description,`
`134`		`- module.ProjectName,`
	`134`	`+ module.ProjectId,`
`135`	`135`	`module.ComponentName,`
`136`	`136`	`QualifiedSelection.Selection.StartLine);`
`137`	`137`	`}`
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.ProjectName == _targetInterface.ProjectName`
	`209`	`+ .Where(item => item.ProjectId == _targetInterface.ProjectId`
`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.ProjectName == _model.TargetDeclaration.ProjectName &&`
	`276`	`+ .Where(item => item.ProjectId == _model.TargetDeclaration.ProjectId &&`
`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,7 +12,6 @@`
`12`	`12`	`using Rubberduck.Parsing.VBA;`
`13`	`13`	`using Rubberduck.UI;`
`14`	`14`	`using Rubberduck.VBEditor;`
`15`		`-using Rubberduck.VBEditor.Extensions;`
`16`	`15`
`17`	`16`	`namespace Rubberduck.Refactorings.Rename`
`18`	`17`	`{`
`@@ -78,7 +77,7 @@ private Declaration FindDeclarationForIdentifier()`
`78`	`77`	`{`
`79`	`78`	`var targetReference = reference;`
`80`	`79`	`var potentialDeclarations = _model.Declarations.Where(item => !item.IsBuiltIn`
`81`		`- && item.ProjectName == targetReference.Declaration.ProjectName`
	`80`	`+ && item.ProjectId == targetReference.Declaration.ProjectId`
`82`	`81`	`&& ((item.Context != null`
`83`	`82`	`&& item.Context.Start.Line <= targetReference.Selection.StartLine`
`84`	`83`	`&& item.Context.Stop.Line >= targetReference.Selection.EndLine)`
`@@ -149,7 +148,7 @@ private void Rename()`
`149`	`148`	`{`
`150`	`149`	`// properties can have more than 1 member.`
`151`	`150`	`var members = _model.Declarations.Named(_model.Target.IdentifierName)`
`152`		`- .Where(item => item.ProjectName == _model.Target.ProjectName`
	`151`	`+ .Where(item => item.ProjectId == _model.Target.ProjectId`
`153`	`152`	`&& item.ComponentName == _model.Target.ComponentName`
`154`	`153`	`&& item.DeclarationType.HasFlag(DeclarationType.Property));`
`155`	`154`	`foreach (var member in members)`
`@@ -212,7 +211,7 @@ private void RenameProject()`
`212`	`211`	`{`
`213`	`212`	`try`
`214`	`213`	`{`
`215`		`- var project = _state.Projects.SingleOrDefault(p => p.ProjectName() == _model.Target.ProjectName);`
	`214`	`+ var project = _state.Projects.SingleOrDefault(p => p.HelpFile == _model.Target.ProjectId);`
`216`	`215`	`if (project != null)`
`217`	`216`	`{`
`218`	`217`	`project.Name = _model.NewName;`
`@@ -251,7 +250,7 @@ private void RenameDeclaration(Declaration target, string newName)`
`251`	`250`	`else`
`252`	`251`	`{`
`253`	`252`	`var members = _model.Declarations.Named(target.IdentifierName)`
`254`		`- .Where(item => item.ProjectName == target.ProjectName`
	`253`	`+ .Where(item => item.ProjectId == target.ProjectId`
`255`	`254`	`&& item.ComponentName == target.ComponentName`
`256`	`255`	`&& item.DeclarationType.HasFlag(DeclarationType.Property));`
`257`	`256`