Close #1731

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -7,7 +7,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
-using Rubberduck.SmartIndenter;
 using Rubberduck.UI;
 using Rubberduck.UI.Command.MenuItems;
 using System;
@@ -18,6 +17,7 @@
 using System.Runtime.InteropServices.ComTypes;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Rubberduck.UI.SourceControl;
 
 namespace Rubberduck
 {
@@ -29,10 +29,11 @@ public sealed class App : IDisposable
         private readonly IRubberduckParser _parser;
         private AutoSave.AutoSave _autoSave;
         private IGeneralConfigService _configService;
-        private IAppMenu _appMenus;
+        private readonly IAppMenu _appMenus;
         private RubberduckCommandBar _stateBar;
-        private readonly IIndenter _indenter;
         private IRubberduckHooks _hooks;
+        private bool _handleSinkEvents = true;
+        private readonly BranchesViewViewModel _branchesVM;
 
         private readonly Logger _logger;
 
@@ -52,8 +53,8 @@ public App(VBE vbe, IMessageBox messageBox,
             IGeneralConfigService configService,
             IAppMenu appMenus,
             RubberduckCommandBar stateBar,
-            IIndenter indenter,
-            IRubberduckHooks hooks)
+            IRubberduckHooks hooks,
+            SourceControlDockablePresenter sourceControlPresenter)
         {
             _vbe = vbe;
             _messageBox = messageBox;
@@ -62,10 +63,16 @@ public App(VBE vbe, IMessageBox messageBox,
             _autoSave = new AutoSave.AutoSave(_vbe, _configService);
             _appMenus = appMenus;
             _stateBar = stateBar;
-            _indenter = indenter;
             _hooks = hooks;
             _logger = LogManager.GetCurrentClassLogger();
 
+            var sourceControlPanel = (SourceControlPanel) sourceControlPresenter.Window();
+            var panelVM = (SourceControlViewViewModel) sourceControlPanel.ViewModel;
+            _branchesVM = (BranchesViewViewModel) panelVM.TabItems.Single(t => t.ViewModel.Tab == SourceControlTab.Branches).ViewModel;
+
+            _branchesVM.MergeStarted += _branchesVM_MergeStarted;
+            _branchesVM.MergeCompleted += _branchesVM_MergeCompleted;
+
             _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
             _configService.LanguageChanged += ConfigServiceLanguageChanged;
@@ -87,6 +94,22 @@ public App(VBE vbe, IMessageBox messageBox,
             UiDispatcher.Initialize();
         }
 
+        private void _branchesVM_MergeCompleted(object sender, EventArgs e)
+        {
+            _handleSinkEvents = true;
+
+            // update cache
+            _parser.State.RemoveProject(_vbe.ActiveVBProject.HelpFile);
+            _parser.State.AddProject(_vbe.ActiveVBProject);
+
+            _parser.State.OnParseRequested(this);
+        }
+
+        private void _branchesVM_MergeStarted(object sender, EventArgs e)
+        {
+            _handleSinkEvents = false;
+        }
+
         private void State_StatusMessageUpdate(object sender, RubberduckStatusMessageEventArgs e)
         {
             var message = e.Message;
@@ -168,6 +191,8 @@ public void Shutdown()
         #region sink handlers. todo: move to another class
         async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
             {
                 _logger.Debug("Locked project '{0}' was removed.", e.Item.Name);
@@ -205,6 +230,8 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
 
         async void sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             _logger.Debug("Project '{0}' was added.", e.Item.Name);
             if (e.Item.Protection == vbext_ProjectProtection.vbext_pp_locked)
             {
@@ -260,6 +287,8 @@ private void RegisterComponentsEventSink(VBComponents components, string project
 
         async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -271,6 +300,8 @@ async void sink_ComponentSelected(object sender, DispatcherEventArgs<VBComponent
 
         async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -283,6 +314,8 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
 
         async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -294,6 +327,8 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>
 
         async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -305,6 +340,8 @@ async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent
 
         async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -316,6 +353,8 @@ async void sink_ComponentAdded(object sender, DispatcherEventArgs<VBComponent> e
 
         async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -327,6 +366,8 @@ async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponen
 
         async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProject> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -342,6 +383,8 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje
 
         async void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -395,13 +438,20 @@ private void LoadConfig()
         }
 
         private bool _disposed;
+
         public void Dispose()
         {
             if (_disposed)
             {
                 return;
             }
 
+            if (_branchesVM != null)
+            {
+                _branchesVM.MergeStarted -= _branchesVM_MergeStarted;
+                _branchesVM.MergeCompleted -= _branchesVM_MergeCompleted;
+            }
+
             if (_hooks != null)
             {
                 _hooks.MessageReceived -= _hooks_MessageReceived;

RetailCoder.VBE/UI/Command/MenuItems/UiDispatcher.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using System.Windows.Threading;
 
 namespace Rubberduck.UI.Command.MenuItems
 {

RetailCoder.VBE/UI/SourceControl/BranchesView.xaml

@@ -201,7 +201,7 @@
                                 <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_SourceLabel}"
                                            FontWeight="SemiBold"
                                            Margin="0,0,0,5" />
-                                <ComboBox ItemsSource="{Binding Branches}"
+                                <ComboBox ItemsSource="{Binding LocalBranches}"
                                           SelectedItem="{Binding SourceBranch, Mode=TwoWay}" />
                             </StackPanel>
                             <Image Source="{StaticResource MergeArrowImage}"
@@ -213,7 +213,7 @@
                                 <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=SourceControl_DestinationLabel}"
                                            FontWeight="SemiBold"
                                            Margin="0,0,0,5" />
-                                <ComboBox ItemsSource="{Binding Branches}"
+                                <ComboBox ItemsSource="{Binding LocalBranches}"
                                           SelectedItem="{Binding DestinationBranch, Mode=TwoWay}" />
                             </StackPanel>
                         </Grid>

RetailCoder.VBE/UI/SourceControl/BranchesViewViewModel.cs

@@ -279,17 +279,22 @@ private void CreateBranchCancel()
 
         private void MergeBranchOk()
         {
+            OnMergeStarted();
+
             try
             {
                 Provider.Merge(SourceBranch, DestinationBranch);
             }
             catch (SourceControlException ex)
             {
                 RaiseErrorEvent(ex.Message, ex.InnerException.Message, NotificationType.Error);
+                OnMergeCompleted();
+                return;
             }
 
             DisplayMergeBranchesGrid = false;
             RaiseErrorEvent(RubberduckUI.SourceControl_MergeStatus, string.Format(RubberduckUI.SourceControl_SuccessfulMerge, SourceBranch, DestinationBranch), NotificationType.Info);
+            OnMergeCompleted();
         }
 
         private void MergeBranchCancel()
@@ -423,5 +428,25 @@ private void RaiseErrorEvent(string message, string innerMessage, NotificationTy
                 handler(this, new ErrorEventArgs(message, innerMessage, notificationType));
             }
         }
+        
+        public event EventHandler<EventArgs> MergeStarted;
+        private void OnMergeStarted()
+        {
+            var handler = MergeStarted;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
+        }
+
+        public event EventHandler<EventArgs> MergeCompleted;
+        private void OnMergeCompleted()
+        {
+            var handler = MergeCompleted;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
+        }
     }
 }