replaced all instances of VBE.VBProjects with _state.Projects - this breaks 308 tests, but fixes equality checks and stabilizes lots of things.

retailcoder · retailcoder · commit f638b76c54f3 · 2016-04-02T21:56:31.000-04:00
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -94,6 +94,8 @@ public void Startup()
         #region sink handlers. todo: move to another class
         async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
+            _parser.State.RemoveProject(e.Item);
+
             Debug.WriteLine(string.Format("Project '{0}' was removed.", e.Item.Name));
             Tuple<IConnectionPoint, int> value;
             if (_componentsEventsConnectionPoints.TryGetValue(e.Item.VBComponents, out value))
@@ -107,6 +109,8 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
 
         async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
         {
+            _parser.State.AddProject(e.Item);
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 // forces menus to evaluate their CanExecute state:
diff --git a/RetailCoder.VBE/AutoSave/AutoSave.cs b/RetailCoder.VBE/AutoSave/AutoSave.cs
@@ -48,11 +48,11 @@ private void _timer_Elapsed(object sender, ElapsedEventArgs e)
             {
                 try
                 {
-                    // note: VBProject.FileName getter throws IOException if unsaved
-                    _vbe.VBProjects.OfType<VBProject>().Select(p => p.FileName).ToList();
+                    var projects = _vbe.VBProjects.OfType<VBProject>().Select(p => p.FileName).ToList();
                 }
-                catch (DirectoryNotFoundException)
+                catch (IOException)
                 {
+                    // note: VBProject.FileName getter throws IOException if unsaved
                     return;
                 }
 
diff --git a/RetailCoder.VBE/Common/DeclarationExtensions.cs b/RetailCoder.VBE/Common/DeclarationExtensions.cs
@@ -398,6 +398,14 @@ public static Declaration FindInterfaceMember(this IEnumerable<Declaration> decl
                 : matches.First();
         }
 
+        public static Declaration FindTarget(this IEnumerable<Declaration> declarations, QualifiedSelection selection)
+        {
+            var items = declarations.ToList();
+            Debug.Assert(!items.Any(item => item.IsBuiltIn));
+
+            return items.SingleOrDefault(item => item.IsSelected(selection) || item.References.Any(reference => reference.IsSelected(selection)));
+        }
+
         /// <summary>
         /// Returns the declaration contained in a qualified selection.
         /// To get the selection of a variable or field, use FindVariable(QualifiedSelection)
@@ -412,7 +420,7 @@ public static Declaration FindTarget(this IEnumerable<Declaration> declarations,
 
             var target = items
                 .Where(item => !item.IsBuiltIn)
-                .FirstOrDefault(item => item.IsSelected(selection)
+                .SingleOrDefault(item => item.IsSelected(selection)
                                      || item.References.Any(r => r.IsSelected(selection)));
 
             if (target != null && validDeclarationTypes.Contains(target.DeclarationType))
@@ -531,8 +539,7 @@ public static Declaration FindInterface(this IEnumerable<Declaration> declaratio
                         implementsStmt.GetSelection().StartColumn, reference.Selection.EndLine,
                         reference.Selection.EndColumn);
 
-                    if (reference.QualifiedModuleName.ComponentName == selection.QualifiedName.ComponentName &&
-                        reference.QualifiedModuleName.Project == selection.QualifiedName.Project &&
+                    if (reference.QualifiedModuleName.Equals(selection.QualifiedName) &&
                         completeSelection.Contains(selection.Selection))
                     {
                         return declaration;
diff --git a/RetailCoder.VBE/Inspections/MoveFieldCloserToUsageInspection.cs b/RetailCoder.VBE/Inspections/MoveFieldCloserToUsageInspection.cs
@@ -61,7 +61,7 @@ private Declaration ParentDeclaration(IdentifierReference reference)
 
             return UserDeclarations.SingleOrDefault(d =>
                         reference.ParentScoping.Equals(d) && declarationTypes.Contains(d.DeclarationType) &&
-                        d.Project == reference.QualifiedModuleName.Project);
+                        d.QualifiedName.QualifiedModuleName.Equals(reference.QualifiedModuleName));
         }
     }
 }
diff --git a/RetailCoder.VBE/Inspections/ProcedureShouldBeFunctionInspectionResult.cs b/RetailCoder.VBE/Inspections/ProcedureShouldBeFunctionInspectionResult.cs
@@ -122,8 +122,7 @@ private void UpdateCalls()
                         !d.IsBuiltIn &&
                         d.IdentifierName == procedureName &&
                         d.Context is VBAParser.SubStmtContext &&
-                        d.ComponentName == _subStmtQualifiedContext.ModuleName.ComponentName &&
-                        d.Project == _subStmtQualifiedContext.ModuleName.Project);
+                        d.QualifiedName.QualifiedModuleName.Equals(_subStmtQualifiedContext.ModuleName));
 
             if (procedure == null) { return; }
 
diff --git a/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs b/RetailCoder.VBE/Navigation/RegexSearchReplace/RegexSearchReplace.cs
@@ -100,8 +100,9 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(CodeModule module, s
         private void SetSelection(RegexSearchResult item)
         {
             var project = _vbe.ActiveVBProject;
-            foreach (var proj in _vbe.VBProjects.Cast<VBProject>())
+            foreach (var proj in _parser.State.Projects)
             {
+                // wtf?
                 project = proj;
                 break;
             }
@@ -170,14 +171,14 @@ private List<RegexSearchResult> SearchCurrentProject(string searchPattern)
         private List<RegexSearchResult> SearchOpenProjects(string searchPattern)
         {
             var results = new List<RegexSearchResult>();
+            var modules = _vbe.VBProjects.Cast<VBProject>()
+                .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)
+                .SelectMany(project => project.VBComponents.Cast<VBComponent>())
+                .Select(component => component.CodeModule);
 
-            foreach (VBProject project in _vbe.VBProjects)
+            foreach (var module in modules)
             {
-                foreach (var component in project.VBComponents.Cast<VBComponent>())
-                {
-                    var module = component.CodeModule;
-                    results.AddRange(GetResultsFromModule(module, searchPattern));
-                }
+                results.AddRange(GetResultsFromModule(module, searchPattern));
             }
 
             return results;
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs
@@ -38,8 +38,7 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel
             var candidates = declarations.Where(item => !item.IsBuiltIn && ModuleTypes.Contains(item.DeclarationType)).ToList();
 
             _targetDeclaration = candidates.SingleOrDefault(item => 
-                           item.Project == selection.QualifiedName.Project
-                        && item.QualifiedSelection.QualifiedName.ComponentName == selection.QualifiedName.ComponentName);
+                        item.QualifiedSelection.QualifiedName.Equals(selection.QualifiedName));
 
             if (_targetDeclaration == null)
             {
diff --git a/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs b/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs
@@ -47,8 +47,7 @@ public void Refactor(QualifiedSelection selection)
 
             _targetClass = _declarations.SingleOrDefault(d =>
                         !d.IsBuiltIn && d.DeclarationType == DeclarationType.Class &&
-                        d.QualifiedSelection.QualifiedName.ComponentName == selection.QualifiedName.ComponentName &&
-                        d.Project == selection.QualifiedName.Project);
+                        d.QualifiedSelection.QualifiedName.Equals(selection.QualifiedName));
 
             if (_targetClass == null || _targetInterface == null)
             {
diff --git a/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs b/RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs
@@ -211,7 +211,7 @@ private void RenameProject()
         {
             try
             {
-                var project = _model.VBE.VBProjects.Cast<VBProject>().FirstOrDefault(p => p.Name == _model.Target.IdentifierName);
+                var project = _state.Projects.SingleOrDefault(p => p == _model.Target.Project);
                 if (project != null)
                 {
                     project.Name = _model.NewName;
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs
@@ -2,6 +2,7 @@
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 using System.Runtime.InteropServices;
+using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
@@ -27,21 +28,28 @@ public override void Execute(object parameter)
         {
             if (Vbe.ActiveCodePane == null) { return; }
 
+            Declaration target;
+            if (parameter != null)
+            {
+                target = parameter as Declaration;
+            }
+            else
+            {
+                var selection = Vbe.ActiveCodePane.GetSelection();
+                target = _state.AllUserDeclarations.FindTarget(selection);
+            }
+
+            if (target == null)
+            {
+                return;
+            }
+
             using (var view = new RenameDialog())
             {
                 var factory = new RenamePresenterFactory(Vbe, view, _state, new MessageBox(), _wrapperWrapperFactory);
                 var refactoring = new RenameRefactoring(factory, Editor, new MessageBox(), _state);
 
-                var target = parameter as Declaration;
-
-                if (target == null)
-                {
-                    refactoring.Refactor();
-                }
-                else
-                {
-                    refactoring.Refactor(target);
-                }
+                refactoring.Refactor(target);
             }
         }
 
diff --git a/RetailCoder.VBE/UnitTesting/TestMethod.cs b/RetailCoder.VBE/UnitTesting/TestMethod.cs
@@ -80,12 +80,7 @@ public NavigateCodeEventArgs GetNavigationArgs()
             {
                 var moduleName = QualifiedMemberName.QualifiedModuleName;
                 var methodName = QualifiedMemberName.MemberName;
-
-                var module = _vbe.VBProjects.Cast<VBProject>()
-                    .Single(project => project == QualifiedMemberName.QualifiedModuleName.Project)
-                    .VBComponents.Cast<VBComponent>()
-                    .Single(component => component.Name == QualifiedMemberName.QualifiedModuleName.ComponentName)
-                    .CodeModule;
+                var module = moduleName.Component.CodeModule;
 
                 var startLine = module.get_ProcStartLine(methodName, vbext_ProcKind.vbext_pk_Proc);
                 var endLine = startLine + module.get_ProcCountLines(methodName, vbext_ProcKind.vbext_pk_Proc);
diff --git a/Rubberduck.Parsing/Symbols/Declaration.cs b/Rubberduck.Parsing/Symbols/Declaration.cs
@@ -550,7 +550,7 @@ public override int GetHashCode()
             unchecked
             {
                 var hash = 17;
-                hash = hash*23 + QualifiedName.QualifiedModuleName.ProjectHashCode;
+                hash = hash*23 + QualifiedName.QualifiedModuleName.GetHashCode();
                 hash = hash*23 + _identifierName.GetHashCode();
                 hash = hash*23 + _declarationType.GetHashCode();
                 hash = hash*23 + Scope.GetHashCode();
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
@@ -68,7 +68,7 @@ public IdentifierReferenceResolver(QualifiedModuleName qualifiedModuleName, Decl
             _moduleDeclaration = finder.MatchName(_qualifiedModuleName.ComponentName)
                 .SingleOrDefault(item => 
                     (item.DeclarationType == DeclarationType.Class || item.DeclarationType == DeclarationType.Module)
-                && item.Project == _qualifiedModuleName.Project && item.ComponentName == _qualifiedModuleName.ComponentName);
+                && item.QualifiedName.QualifiedModuleName.Equals(_qualifiedModuleName));
 
             SetCurrentScope();
         }
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -28,7 +29,8 @@ public RubberduckParserState State
 
         private CancellationTokenSource _central = new CancellationTokenSource();
         private CancellationTokenSource _resolverTokenSource; // linked to _central later
-        private readonly Dictionary<VBComponent, Tuple<Task, CancellationTokenSource>> _currentTasks = new Dictionary<VBComponent, Tuple<Task, CancellationTokenSource>>();
+        private readonly ConcurrentDictionary<VBComponent, Tuple<Task, CancellationTokenSource>> _currentTasks = 
+            new ConcurrentDictionary<VBComponent, Tuple<Task, CancellationTokenSource>>();
 
         private readonly Dictionary<VBComponent, IParseTree> _parseTrees = new Dictionary<VBComponent, IParseTree>();
         private readonly Dictionary<QualifiedModuleName, Dictionary<Declaration, byte>> _declarations = new Dictionary<QualifiedModuleName, Dictionary<Declaration, byte>>();
@@ -85,8 +87,7 @@ private void ReparseRequested(object sender, ParseRequestEventArgs e)
 
         public void Parse()
         {
-            var projects = _vbe.VBProjects
-                .Cast<VBProject>()
+            var projects = _state.Projects
                 .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)
                 .ToList();
 
@@ -134,8 +135,7 @@ public void Parse()
         /// </summary>
         private void ParseAll()
         {
-            var projects = _vbe.VBProjects
-                .Cast<VBProject>()
+            var projects = _state.Projects
                 .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)
                 .ToList();
 
@@ -193,8 +193,9 @@ public Task ParseAsync(VBComponent component, CancellationToken token, TokenStre
             var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(_central.Token, token);
 
             var task = new Task(() => ParseAsyncInternal(component, linkedTokenSource.Token, rewriter));
-            _currentTasks.Add(component, Tuple.Create(task, linkedTokenSource));
-            task.ContinueWith(t => _currentTasks.Remove(component)); // default also executes on cancel
+            _currentTasks.TryAdd(component, Tuple.Create(task, linkedTokenSource));
+            Tuple<Task, CancellationTokenSource> removedTask;
+            task.ContinueWith(t => _currentTasks.TryRemove(component, out removedTask)); // default also executes on cancel
 
             task.Start();
             return task;
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
@@ -43,6 +43,9 @@ 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 ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<Declaration, byte>> _declarations =
             new ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<Declaration, byte>>();
 
@@ -64,6 +67,24 @@ public sealed class RubberduckParserState
         private readonly ConcurrentDictionary<VBComponent, IDictionary<Tuple<string, DeclarationType>, Attributes>> _moduleAttributes =
             new ConcurrentDictionary<VBComponent, IDictionary<Tuple<string, DeclarationType>, Attributes>>();
 
+        public void AddProject(VBProject project)
+        {
+            if (!_projects.Contains(project))
+            {
+                _projects.Add(project);
+            }
+        }
+
+        public void RemoveProject(VBProject project)
+        {
+            if (_projects.Contains(project))
+            {
+                _projects.Remove(project);
+            }
+        }
+
+        public IReadOnlyList<VBProject> Projects { get { return _projects.ToList(); } }
+
         public IReadOnlyList<Tuple<VBComponent, SyntaxErrorException>> ModuleExceptions
         {
             get { return _moduleExceptions.Select(kvp => Tuple.Create(kvp.Key, kvp.Value)).Where(item => item.Item2 != null).ToList(); }
@@ -283,9 +304,9 @@ public void ClearBuiltInReferences()
 
         public bool ClearDeclarations(VBComponent component)
         {
-            var project = component.Collection.Parent;
+            var projectName = component.Collection.Parent.Name;
             var keys = _declarations.Keys.Where(kvp => 
-                kvp.Project == project && kvp.ComponentName == component.Name); // VBComponent reference seems to mismatch
+                kvp.ProjectName == projectName && kvp.ComponentName == component.Name); // COM object references aren't reliable
 
             var success = true;
             var declarationsRemoved = 0;
diff --git a/Rubberduck.VBEEditor/Extensions/VbeExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbeExtensions.cs
@@ -12,24 +12,14 @@ public static class VbeExtensions
         public static void SetSelection(this VBE vbe, VBProject vbProject, Selection selection, string name,
             ICodePaneWrapperFactory wrapperFactory)
         {
-            var project = vbe.VBProjects.Cast<VBProject>()
-                .SingleOrDefault(p => p.Protection != vbext_ProjectProtection.vbext_pp_locked
-                                      && ReferenceEquals(p, vbProject));
-
-            VBComponent component = null;
-            if (project != null)
-            {
-                component = project.VBComponents.Cast<VBComponent>()
-                    .SingleOrDefault(c => c.Name == name);
-            }
-
-            if (component == null)
-            {
-                return;
-            }
-
             try
             {
+                var component = vbProject.VBComponents.Cast<VBComponent>().SingleOrDefault(c => c.Name == name);
+                if (component == null)
+                {
+                    return;
+                }
+
                 var codePane = wrapperFactory.Create(component.CodeModule.CodePane);
                 codePane.Selection = selection;
             }
diff --git a/Rubberduck.VBEEditor/QualifiedModuleName.cs b/Rubberduck.VBEEditor/QualifiedModuleName.cs

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,8 @@ public void Startup()`
`94`	`94`	`#region sink handlers. todo: move to another class`
`95`	`95`	`async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)`
`96`	`96`	`{`
	`97`	`+ _parser.State.RemoveProject(e.Item);`
	`98`	`+`
`97`	`99`	`Debug.WriteLine(string.Format("Project '{0}' was removed.", e.Item.Name));`
`98`	`100`	`Tuple<IConnectionPoint, int> value;`
`99`	`101`	`if (_componentsEventsConnectionPoints.TryGetValue(e.Item.VBComponents, out value))`
`@@ -107,6 +109,8 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)`
`107`	`109`
`108`	`110`	`async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)`
`109`	`111`	`{`
	`112`	`+ _parser.State.AddProject(e.Item);`
	`113`	`+`
`110`	`114`	`if (!_parser.State.AllDeclarations.Any())`
`111`	`115`	`{`
`112`	`116`	`// forces menus to evaluate their CanExecute state:`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ private void _timer_Elapsed(object sender, ElapsedEventArgs e)`
`48`	`48`	`{`
`49`	`49`	`try`
`50`	`50`	`{`
`51`		`- // note: VBProject.FileName getter throws IOException if unsaved`
`52`		`- _vbe.VBProjects.OfType<VBProject>().Select(p => p.FileName).ToList();`
	`51`	`+ var projects = _vbe.VBProjects.OfType<VBProject>().Select(p => p.FileName).ToList();`
`53`	`52`	`}`
`54`		`- catch (DirectoryNotFoundException)`
	`53`	`+ catch (IOException)`
`55`	`54`	`{`
	`55`	`+ // note: VBProject.FileName getter throws IOException if unsaved`
`56`	`56`	`return;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private Declaration ParentDeclaration(IdentifierReference reference)`
`61`	`61`
`62`	`62`	`return UserDeclarations.SingleOrDefault(d =>`
`63`	`63`	`reference.ParentScoping.Equals(d) && declarationTypes.Contains(d.DeclarationType) &&`
`64`		`- d.Project == reference.QualifiedModuleName.Project);`
	`64`	`+ d.QualifiedName.QualifiedModuleName.Equals(reference.QualifiedModuleName));`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,9 @@ private IEnumerable<RegexSearchResult> GetResultsFromModule(CodeModule module, s`
`100`	`100`	`private void SetSelection(RegexSearchResult item)`
`101`	`101`	`{`
`102`	`102`	`var project = _vbe.ActiveVBProject;`
`103`		`- foreach (var proj in _vbe.VBProjects.Cast<VBProject>())`
	`103`	`+ foreach (var proj in _parser.State.Projects)`
`104`	`104`	`{`
	`105`	`+ // wtf?`
`105`	`106`	`project = proj;`
`106`	`107`	`break;`
`107`	`108`	`}`
`@@ -170,14 +171,14 @@ private List<RegexSearchResult> SearchCurrentProject(string searchPattern)`
`170`	`171`	`private List<RegexSearchResult> SearchOpenProjects(string searchPattern)`
`171`	`172`	`{`
`172`	`173`	`var results = new List<RegexSearchResult>();`
	`174`	`+ var modules = _vbe.VBProjects.Cast<VBProject>()`
	`175`	`+ .Where(project => project.Protection == vbext_ProjectProtection.vbext_pp_none)`
	`176`	`+ .SelectMany(project => project.VBComponents.Cast<VBComponent>())`
	`177`	`+ .Select(component => component.CodeModule);`
`173`	`178`
`174`		`- foreach (VBProject project in _vbe.VBProjects)`
	`179`	`+ foreach (var module in modules)`
`175`	`180`	`{`
`176`		`- foreach (var component in project.VBComponents.Cast<VBComponent>())`
`177`		`- {`
`178`		`- var module = component.CodeModule;`
`179`		`- results.AddRange(GetResultsFromModule(module, searchPattern));`
`180`		`- }`
	`181`	`+ results.AddRange(GetResultsFromModule(module, searchPattern));`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`return results;`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel`
`38`	`38`	`var candidates = declarations.Where(item => !item.IsBuiltIn && ModuleTypes.Contains(item.DeclarationType)).ToList();`
`39`	`39`
`40`	`40`	`_targetDeclaration = candidates.SingleOrDefault(item =>`
`41`		`- item.Project == selection.QualifiedName.Project`
`42`		`- && item.QualifiedSelection.QualifiedName.ComponentName == selection.QualifiedName.ComponentName);`
	`41`	`+ item.QualifiedSelection.QualifiedName.Equals(selection.QualifiedName));`
`43`	`42`
`44`	`43`	`if (_targetDeclaration == null)`
`45`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ public void Refactor(QualifiedSelection selection)`
`47`	`47`
`48`	`48`	`_targetClass = _declarations.SingleOrDefault(d =>`
`49`	`49`	`!d.IsBuiltIn && d.DeclarationType == DeclarationType.Class &&`
`50`		`- d.QualifiedSelection.QualifiedName.ComponentName == selection.QualifiedName.ComponentName &&`
`51`		`- d.Project == selection.QualifiedName.Project);`
	`50`	`+ d.QualifiedSelection.QualifiedName.Equals(selection.QualifiedName));`
`52`	`51`
`53`	`52`	`if (_targetClass == null \|\| _targetInterface == null)`
`54`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private void RenameProject()`
`211`	`211`	`{`
`212`	`212`	`try`
`213`	`213`	`{`
`214`		`- var project = _model.VBE.VBProjects.Cast<VBProject>().FirstOrDefault(p => p.Name == _model.Target.IdentifierName);`
	`214`	`+ var project = _state.Projects.SingleOrDefault(p => p == _model.Target.Project);`
`215`	`215`	`if (project != null)`
`216`	`216`	`{`
`217`	`217`	`project.Name = _model.NewName;`