Merge branch 'next' into translationHotkeys

Author: INOPIAE

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

RetailCoder.VBE/App.cs

@@ -84,6 +84,11 @@ public void Startup()
         {
             CleanReloadConfig();
 
+            foreach (var project in _vbe.VBProjects.Cast<VBProject>())
+            {
+                _parser.State.AddProject(project);
+            }
+
             _appMenus.Initialize();
             _appMenus.Localize();
 
@@ -94,6 +99,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 +114,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:

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;
                 }
 

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,10 +394,18 @@ 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();
         }
 
+        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;

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)

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(Rubberduck.UI.RubberduckUI.CommonHotkey_KeyNotRegistered);
+                Debug.WriteLine("Hotkey ({0}) not registered.", key);
+                //throw new Win32Exception("HotKey was not registered.");
             }
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);

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));
         }
     }
 }

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)

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; }
 

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs

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