Fix bug with not loading a changed module.

Author: Hosch250

RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs

@@ -105,33 +105,29 @@ public void SetTab(SourceControlTab tab)
 
         public void AddComponent(VBComponent component)
         {
-            if (Provider == null) { return; }
+            if (Provider == null || !Provider.NotifyVBAChanges) { return; }
 
-            //_fileSystemWatcher.EnableRaisingEvents = false;
             var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == component.Name);
             if (fileStatus != null)
             {
                 Provider.AddFile(fileStatus.FilePath);
             }
-            //_fileSystemWatcher.EnableRaisingEvents = true;
         }
 
         public void RemoveComponent(VBComponent component)
         {
-            if (Provider == null) { return; }
+            if (Provider == null || !Provider.NotifyVBAChanges) { return; }
 
-            //_fileSystemWatcher.EnableRaisingEvents = false;
             var fileStatus = Provider.Status().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == component.Name);
             if (fileStatus != null)
             {
                 Provider.RemoveFile(fileStatus.FilePath, true);
             }
-            //_fileSystemWatcher.EnableRaisingEvents = true;
         }
 
         public void RenameComponent(VBComponent component, string oldName)
         {
-            if (Provider == null) { return; }
+            if (Provider == null || !Provider.NotifyVBAChanges) { return; }
 
             var fileStatus = Provider.LastKnownStatus().SingleOrDefault(stat => stat.FilePath.Split('.')[0] == oldName);
             if (fileStatus != null)
@@ -205,6 +201,7 @@ private void _fileSystemWatcher_Changed(object sender, FileSystemEventArgs e)
             if (_messageBox.Show("file changed", RubberduckUI.SourceControlPanel_Caption,
                 MessageBoxButtons.OKCancel, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1) == DialogResult.OK)
             {
+                Provider.ReloadComponent(e.Name);
                 UiDispatcher.InvokeAsync(Refresh);
             }
         }

Rubberduck.SourceControl/ISourceControlProvider.cs

@@ -12,6 +12,7 @@ public interface ISourceControlProvider
         IList<ICommit> UnsyncedLocalCommits { get; }
         IList<ICommit> UnsyncedRemoteCommits { get; }
         bool NotifyExternalFileChanges { get; }
+        bool NotifyVBAChanges { get; }
 
         event EventHandler<EventArgs> BranchChanged;
 
@@ -164,5 +165,11 @@ public interface ISourceControlProvider
         /// </summary>
         /// <returns>Collection of statuses.</returns>
         IEnumerable<IFileStatusEntry> LastKnownStatus();
+
+        /// <summary>
+        /// Reloads the component into the VBE
+        /// </summary>
+        /// <param name="fileName"></param>
+        void ReloadComponent(string fileName);
     }
 }

Rubberduck.SourceControl/SourceControlProviderBase.cs

@@ -12,7 +12,7 @@ namespace Rubberduck.SourceControl
     public abstract class SourceControlProviderBase : ISourceControlProvider
     {
         private readonly ICodePaneWrapperFactory _wrapperFactory;
-        protected VBProject Project;
+        protected readonly VBProject Project;
 
         protected SourceControlProviderBase(VBProject project)
         {
@@ -32,6 +32,7 @@ protected SourceControlProviderBase(VBProject project, IRepository repository, I
         public abstract IList<ICommit> UnsyncedLocalCommits { get; }
         public abstract IList<ICommit> UnsyncedRemoteCommits { get; }
         public bool NotifyExternalFileChanges { get; protected set; }
+        public bool NotifyVBAChanges { get; protected set; }
         public abstract IRepository Clone(string remotePathOrUrl, string workingDirectory);
         public abstract void Push();
         public abstract void Fetch(string remoteName);
@@ -116,9 +117,12 @@ public virtual void Undo(string filePath)
 
             if (File.Exists(filePath))
             {
-                var component = Project.VBComponents.Item(componentName);
+                var component = Project.VBComponents.OfType<VBComponent>().FirstOrDefault(f => f.Name == filePath.Split('.')[0]);
+
+                NotifyVBAChanges = false;
                 Project.VBComponents.RemoveSafely(component);
                 Project.VBComponents.ImportSourceFile(filePath);
+                NotifyVBAChanges = true;
             }
         }
 
@@ -142,11 +146,52 @@ protected string GetProjectNameFromDirectory(string directory)
                             .LastOrDefault(c => c != "git");
         }
 
+        public void ReloadComponent(string filePath)
+        {
+            NotifyVBAChanges = false;
+
+            var codePane = Project.VBE.ActiveCodePane;
+
+            if (codePane != null)
+            {
+                var codePaneWrapper = _wrapperFactory.Create(codePane);
+                var selection = new QualifiedSelection(new QualifiedModuleName(codePaneWrapper.CodeModule.Parent),
+                    codePaneWrapper.Selection);
+                string name = null;
+                if (selection.QualifiedName.Component != null)
+                {
+                    name = selection.QualifiedName.Component.Name;
+                }
+
+                var component = Project.VBComponents.OfType<VBComponent>().FirstOrDefault(f => f.Name == filePath.Split('.')[0]);
+                Project.VBComponents.RemoveSafely(component);
+
+                var directory = CurrentRepository.LocalLocation;
+                directory += directory.EndsWith("\\") ? string.Empty : "\\";
+                Project.VBComponents.Import(directory + filePath);
+
+                Project.VBE.SetSelection(selection.QualifiedName.Project, selection.Selection, name, _wrapperFactory);
+            }
+            else
+            {
+                var component = Project.VBComponents.OfType<VBComponent>().FirstOrDefault(f => f.Name == filePath.Split('.')[0]);
+                Project.VBComponents.RemoveSafely(component);
+
+                var directory = CurrentRepository.LocalLocation;
+                directory += directory.EndsWith("\\") ? string.Empty : "\\";
+                Project.VBComponents.Import(directory + filePath);
+            }
+
+            NotifyVBAChanges = true;
+        }
+
         private void Refresh()
         {
             //Because refreshing removes all components, we need to store the current selection,
             // so we can correctly reset it once the files are imported from the repository.
 
+            NotifyVBAChanges = false;
+
             var codePane = Project.VBE.ActiveCodePane;
 
             if (codePane != null)
@@ -170,6 +215,8 @@ private void Refresh()
                 Project.RemoveAllComponents();
                 Project.ImportSourceFiles(CurrentRepository.LocalLocation);
             }
+
+            NotifyVBAChanges = true;
         }
     }
 }