Merge pull request #1293 from retailcoder/next

retailcoder · retailcoder · commit 2edb6557d7e1 · 2016-04-03T04:19:48.000-04:00
more parser fixes
diff --git a/RetailCoder.VBE/API/ParserState.cs b/RetailCoder.VBE/API/ParserState.cs
@@ -65,12 +65,18 @@ public void Initialize(VBE vbe)
             _parser = new RubberduckParser(vbe, _state, _attributeParser);
         }
 
+        /// <summary>
+        /// Blocking call, for easier unit-test code
+        /// </summary>
         public void Parse()
         {
             // blocking call
             _parser.Parse();
         }
 
+        /// <summary>
+        /// Begins asynchronous parsing
+        /// </summary>
         public void BeginParse()
         {
             // non-blocking call
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/Common/Dispatch/VBProjectsEventsSink.cs b/RetailCoder.VBE/Common/Dispatch/VBProjectsEventsSink.cs
@@ -8,20 +8,26 @@ public class VBProjectsEventsSink : _dispVBProjectsEvents
         public event EventHandler<DispatcherEventArgs<VBProject>> ProjectAdded;
         public void ItemAdded(VBProject VBProject)
         {
-            OnDispatch(ProjectAdded, VBProject);
+            if (VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)
+            {
+                OnDispatch(ProjectAdded, VBProject);
+            }
         }
 
         public event EventHandler<DispatcherEventArgs<VBProject>> ProjectRemoved;
         public void ItemRemoved(VBProject VBProject)
         {
-            OnDispatch(ProjectRemoved, VBProject);
+            if (VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)
+            {
+                OnDispatch(ProjectRemoved, VBProject);
+            }
         }
 
         public event EventHandler<DispatcherRenamedEventArgs<VBProject>> ProjectRenamed;
         public void ItemRenamed(VBProject VBProject, string OldName)
         {
             var handler = ProjectRenamed;
-            if (handler != null)
+            if (handler != null && VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)
             {
                 handler.Invoke(this, new DispatcherRenamedEventArgs<VBProject>(VBProject, OldName));
             }
@@ -30,7 +36,10 @@ public void ItemRenamed(VBProject VBProject, string OldName)
         public event EventHandler<DispatcherEventArgs<VBProject>> ProjectActivated;
         public void ItemActivated(VBProject VBProject)
         {
-            OnDispatch(ProjectActivated, VBProject);
+            if (VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)
+            {
+                OnDispatch(ProjectActivated, VBProject);
+            }
         }
 
         private void OnDispatch(EventHandler<DispatcherEventArgs<VBProject>> dispatched, VBProject project)
diff --git a/RetailCoder.VBE/Common/Hotkeys/Hotkey.cs b/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);
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/DeclarationFinder.cs b/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 =
diff --git a/Rubberduck.Parsing/Symbols/DeclarationSymbolsListener.cs b/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)
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
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
diff --git a/Rubberduck.VBEEditor/ActiveCodePaneEditor.cs b/Rubberduck.VBEEditor/ActiveCodePaneEditor.cs
diff --git a/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs
diff --git a/Rubberduck.VBEEditor/Extensions/VbeExtensions.cs b/Rubberduck.VBEEditor/Extensions/VbeExtensions.cs
diff --git a/Rubberduck.VBEEditor/QualifiedModuleName.cs b/Rubberduck.VBEEditor/QualifiedModuleName.cs

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,18 @@ public void Initialize(VBE vbe)`
`65`	`65`	`_parser = new RubberduckParser(vbe, _state, _attributeParser);`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ /// <summary>`
	`69`	`+ /// Blocking call, for easier unit-test code`
	`70`	`+ /// </summary>`
`68`	`71`	`public void Parse()`
`69`	`72`	`{`
`70`	`73`	`// blocking call`
`71`	`74`	`_parser.Parse();`
`72`	`75`	`}`
`73`	`76`
	`77`	`+ /// <summary>`
	`78`	`+ /// Begins asynchronous parsing`
	`79`	`+ /// </summary>`
`74`	`80`	`public void BeginParse()`
`75`	`81`	`{`
`76`	`82`	`// non-blocking call`
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
`@@ -8,20 +8,26 @@ public class VBProjectsEventsSink : _dispVBProjectsEvents`
`8`	`8`	`public event EventHandler<DispatcherEventArgs<VBProject>> ProjectAdded;`
`9`	`9`	`public void ItemAdded(VBProject VBProject)`
`10`	`10`	`{`
`11`		`- OnDispatch(ProjectAdded, VBProject);`
	`11`	`+ if (VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)`
	`12`	`+ {`
	`13`	`+ OnDispatch(ProjectAdded, VBProject);`
	`14`	`+ }`
`12`	`15`	`}`
`13`	`16`
`14`	`17`	`public event EventHandler<DispatcherEventArgs<VBProject>> ProjectRemoved;`
`15`	`18`	`public void ItemRemoved(VBProject VBProject)`
`16`	`19`	`{`
`17`		`- OnDispatch(ProjectRemoved, VBProject);`
	`20`	`+ if (VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)`
	`21`	`+ {`
	`22`	`+ OnDispatch(ProjectRemoved, VBProject);`
	`23`	`+ }`
`18`	`24`	`}`
`19`	`25`
`20`	`26`	`public event EventHandler<DispatcherRenamedEventArgs<VBProject>> ProjectRenamed;`
`21`	`27`	`public void ItemRenamed(VBProject VBProject, string OldName)`
`22`	`28`	`{`
`23`	`29`	`var handler = ProjectRenamed;`
`24`		`- if (handler != null)`
	`30`	`+ if (handler != null && VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)`
`25`	`31`	`{`
`26`	`32`	`handler.Invoke(this, new DispatcherRenamedEventArgs<VBProject>(VBProject, OldName));`
`27`	`33`	`}`
`@@ -30,7 +36,10 @@ public void ItemRenamed(VBProject VBProject, string OldName)`
`30`	`36`	`public event EventHandler<DispatcherEventArgs<VBProject>> ProjectActivated;`
`31`	`37`	`public void ItemActivated(VBProject VBProject)`
`32`	`38`	`{`
`33`		`- OnDispatch(ProjectActivated, VBProject);`
	`39`	`+ if (VBProject.Protection == vbext_ProjectProtection.vbext_pp_none)`
	`40`	`+ {`
	`41`	`+ OnDispatch(ProjectActivated, VBProject);`
	`42`	`+ }`
`34`	`43`	`}`
`35`	`44`
`36`	`45`	`private void OnDispatch(EventHandler<DispatcherEventArgs<VBProject>> dispatched, VBProject project)`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ private void HookKey(Keys key, uint shift)`
`83`	`83`	`var success = User32.RegisterHotKey(_hWndVbe, hookId, shift, (uint)key);`
`84`	`84`	`if (!success)`
`85`	`85`	`{`
`86`		`- throw new Win32Exception("HotKey was not registered.");`
	`86`	`+ Debug.WriteLine("Hotkey ({0}) not registered.", key);`
	`87`	`+ //throw new Win32Exception("HotKey was not registered.");`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`HotkeyInfo = new HotkeyInfo(hookId, Combo);`
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`	`{`