Close #1908

Author: Hosch250

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