Merge branch 'next' into parserCancellationBug

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -155,168 +155,6 @@ public void Shutdown()
             }
         }
 
-        /*#region sink handlers.
-        async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
-                return;
-            }
-
-            _parser.Cancel();
-
-            var projectId = e.Item.HelpFile;
-            Debug.Assert(projectId != null);
-
-            _parser.State.RemoveProject(e.Item);
-            _parser.State.OnParseRequested(this);
-        }
-
-        async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            Logger.Debug("Project '{0}' was added.", e.Item.Name);
-            if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
-            {
-                Logger.Debug("Project is protected and will not be added to parser state.");
-                return;
-            }
-
-            _parser.State.AddProject(e.Item); // note side-effect: assigns ProjectId/HelpFile
-            var projectId = e.Item.HelpFile;
-            RegisterComponentsEventSink(e.Item.VBComponents, projectId);
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                // forces menus to evaluate their CanExecute state:
-                Parser_StateChanged(this, new ParserStateEventArgs(ParserState.Pending));
-                _stateBar.SetStatusText();
-                return;
-            }
-
-            _parser.State.OnParseRequested(sender);
-        }
-
-        async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-        }
-
-        async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel();
-
-            _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
-
-            Logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
-            
-            var projectId = e.Item.Collection.Parent.HelpFile;
-            var componentDeclaration = _parser.State.AllDeclarations.FirstOrDefault(f =>
-                        f.ProjectId == projectId &&
-                        f.DeclarationType == DeclarationType.ClassModule &&
-                        f.IdentifierName == e.OldName);
-
-            if (e.Item.Type == vbext_ComponentType.vbext_ct_Document &&
-                componentDeclaration != null &&
-
-                // according to ThunderFrame, Excel is the only one we explicitly support
-                // with two Document-component types just skip the Worksheet component
-                ((ClassModuleDeclaration) componentDeclaration).Supertypes.All(a => a.IdentifierName != "Worksheet"))
-            {
-                _parser.State.RemoveProject(projectId);
-
-                _parser.State.AddProject(e.Item.Collection.Parent);
-            }
-            else
-            {
-                _parser.State.RemoveRenamedComponent(e.Item, e.OldName);
-            }
-
-            _parser.State.OnParseRequested(this);
-        }
-
-        async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel(e.Item);
-
-            _sourceControlPanelVM.HandleRemovedComponent(e.Item);
-
-            Logger.Debug("Component '{0}' was removed.", e.Item.Name);
-            _parser.State.ClearStateCache(e.Item, true);
-        }
-
-        async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel(e.Item);
-            
-            _parser.State.OnParseRequested(sender, e.Item);
-        }
-
-        async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _sourceControlPanelVM.HandleAddedComponent(e.Item);
-
-            Logger.Debug("Component '{0}' was added.", e.Item.Name);
-            _parser.State.OnParseRequested(sender, e.Item);
-        }
-
-        async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
-        {
-            if (!_handleSinkEvents || !_vbe.IsInDesignMode()) { return; }
-
-            if (!_parser.State.AllDeclarations.Any())
-            {
-                return;
-            }
-
-            _parser.Cancel();
-
-            Logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
-
-            _parser.State.RemoveProject(e.Item.HelpFile);
-            _parser.State.AddProject(e.Item);
-
-            _parser.State.OnParseRequested(sender);
-        }
-        #endregion*/
-
         private void _stateBar_Refresh(object sender, EventArgs e)
         {
             // handles "refresh" button click on "Rubberduck" command bar

Rubberduck.SourceControl/SourceControlProviderBase.cs

@@ -212,15 +212,29 @@ private void Refresh()
                     name = selection.QualifiedName.Component.Name;
                 }
 
-                Project.RemoveAllComponents();
-                Project.ImportSourceFiles(CurrentRepository.LocalLocation);
+                try
+                {
+                    Project.LoadAllComponents(CurrentRepository.LocalLocation);
+                }
+                catch (AggregateException ex)
+                {
+                    HandleVbeSinkEvents = true;
+                    throw new SourceControlException("Unknown exception.", ex);
+                }
 
                 Project.VBE.SetSelection(selection.QualifiedName.Project, selection.Selection, name, _wrapperFactory);
             }
             else
             {
-                Project.RemoveAllComponents();
-                Project.ImportSourceFiles(CurrentRepository.LocalLocation);
+                try
+                {
+                    Project.LoadAllComponents(CurrentRepository.LocalLocation);
+                }
+                catch (AggregateException ex)
+                {
+                    HandleVbeSinkEvents = true;
+                    throw new SourceControlException("Unknown exception.", ex);
+                }
             }
 
             HandleVbeSinkEvents = true;

Rubberduck.VBEEditor/Extensions/VbProjectExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Vbe.Interop;
+using System;
+using Microsoft.Vbe.Interop;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -102,5 +103,58 @@ public static void ImportSourceFiles(this VBProject project, string filePath)
                 project.VBComponents.ImportSourceFile(file.FullName);
             }
         }
+        
+        public static void LoadAllComponents(this VBProject project, string filePath)
+        {
+            var dirInfo = new DirectoryInfo(filePath);
+
+            var files = dirInfo.EnumerateFiles()
+                                .Where(f => f.Extension == VBComponentExtensions.StandardExtension ||
+                                            f.Extension == VBComponentExtensions.ClassExtension ||
+                                            f.Extension == VBComponentExtensions.DocClassExtension ||
+                                            f.Extension == VBComponentExtensions.FormExtension
+                                            );
+
+            var exceptions = new List<Exception>();
+
+            foreach (VBComponent component in project.VBComponents)
+            {
+                try
+                {
+                    var name = component.Name;
+                    project.VBComponents.RemoveSafely(component);
+
+                    var file = files.SingleOrDefault(f => f.Name == name + f.Extension);
+                    if (file != null)
+                    {
+                        project.VBComponents.ImportSourceFile(file.FullName);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                }
+            }
+
+            foreach (var file in files)
+            {
+                try
+                {
+                    if (project.VBComponents.OfType<VBComponent>().All(v => v.Name + file.Extension != file.Name))
+                    {
+                        project.VBComponents.ImportSourceFile(file.FullName);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    exceptions.Add(ex);
+                }
+            }
+
+            if (exceptions.Count != 0)
+            {
+                throw new AggregateException(string.Empty, exceptions);
+            }
+        }
     }
 }