Merge pull request #1782 from rubberduck-vba/next

v2.0.1b

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
 {
@@ -26,13 +26,15 @@ public sealed class App : IDisposable
         private const string FILE_TARGET_NAME = "file";
         private readonly VBE _vbe;
         private readonly IMessageBox _messageBox;
-        private readonly IRubberduckParser _parser;
+        private 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 SourceControlViewViewModel _sourceControlPanelVM;
 
         private readonly Logger _logger;
 
@@ -52,8 +54,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 +64,19 @@ 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();
+            _sourceControlPanelVM = (SourceControlViewViewModel) sourceControlPanel.ViewModel;
+            _branchesVM = (BranchesViewViewModel) _sourceControlPanelVM.TabItems.Single(t => t.ViewModel.Tab == SourceControlTab.Branches).ViewModel;
+
+            _sourceControlPanelVM.OpenRepoStarted += DisableSinkEventHandlers;
+            _sourceControlPanelVM.OpenRepoCompleted += EnableSinkEventHandlersAndUpdateCache;
+
+            _branchesVM.LoadingComponentsStarted += DisableSinkEventHandlers;
+            _branchesVM.LoadingComponentsCompleted += EnableSinkEventHandlersAndUpdateCache;
+
             _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
             _configService.LanguageChanged += ConfigServiceLanguageChanged;
@@ -87,6 +98,22 @@ public App(VBE vbe, IMessageBox messageBox,
             UiDispatcher.Initialize();
         }
 
+        private void EnableSinkEventHandlersAndUpdateCache(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 DisableSinkEventHandlers(object sender, EventArgs e)
+        {
+            _handleSinkEvents = false;
+        }
+
         private void State_StatusMessageUpdate(object sender, RubberduckStatusMessageEventArgs e)
         {
             var message = e.Message;
@@ -168,6 +195,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 +234,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 +291,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,29 +304,39 @@ 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;
             }
 
+            _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
+
             _logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
 
             _parser.State.RemoveRenamedComponent(e.Item, e.OldName);
         }
 
         async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
             }
 
+            _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) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -305,17 +348,23 @@ 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;
             }
 
+            _sourceControlPanelVM.HandleAddedComponent(e.Item);
+
             _logger.Debug("Component '{0}' was added.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
         }
 
         async void sink_ComponentActivated(object sender, DispatcherEventArgs<VBComponent> e)
         {
+            if (!_handleSinkEvents) { return; }
+
             if (!_parser.State.AllDeclarations.Any())
             {
                 return;
@@ -327,6 +376,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 +393,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 +448,36 @@ private void LoadConfig()
         }
 
         private bool _disposed;
+
         public void Dispose()
         {
             if (_disposed)
             {
                 return;
             }
 
+            if (_sourceControlPanelVM != null)
+            {
+                _sourceControlPanelVM.OpenRepoStarted -= DisableSinkEventHandlers;
+                _sourceControlPanelVM.OpenRepoCompleted -= EnableSinkEventHandlersAndUpdateCache;
+            }
+
+            if (_branchesVM != null)
+            {
+                _branchesVM.LoadingComponentsStarted -= DisableSinkEventHandlers;
+                _branchesVM.LoadingComponentsCompleted -= EnableSinkEventHandlersAndUpdateCache;
+            }
+
+            _handleSinkEvents = false;
+
+            if (_parser != null && _parser.State != null)
+            {
+                _parser.State.StateChanged -= Parser_StateChanged;
+                _parser.State.StatusMessageUpdate -= State_StatusMessageUpdate;
+                _parser.Dispose();
+                // I won't set this to null because other components may try to release things
+            }
+
             if (_hooks != null)
             {
                 _hooks.MessageReceived -= _hooks_MessageReceived;
@@ -416,13 +492,6 @@ public void Dispose()
                 _configService = null;
             }
 
-            if (_parser != null && _parser.State != null)
-            {
-                _parser.State.StateChanged -= Parser_StateChanged;
-                _parser.State.StatusMessageUpdate -= State_StatusMessageUpdate;
-                // I won't set this to null because other components may try to release things
-            }
-
             if (_stateBar != null)
             {
                 _stateBar.Refresh -= _stateBar_Refresh;
@@ -465,6 +534,8 @@ public void Dispose()
                 item.Value.Item1.Unadvise(item.Value.Item2);
             }
 
+            UiDispatcher.Shutdown();
+
             _disposed = true;
         }
     }

RetailCoder.VBE/AppMenu.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
@@ -43,6 +44,7 @@ public void Dispose()
         {
             foreach (var menu in _menus)
             {
+                menu.RemoveChildren();
                 if (menu.Item != null)
                 {
                     menu.Item.Delete();

RetailCoder.VBE/Inspections/InspectionResultBase.cs

@@ -102,7 +102,8 @@ public override string ToString()
                 InspectionsUI.QualifiedSelectionInspection,
                 Inspection.Severity,
                 Description,
-                module.ProjectId,
+                "(" + module.ProjectDisplayName + ")",
+                module.ProjectName,
                 module.ComponentName,
                 QualifiedSelection.Selection.StartLine);
         }

RetailCoder.VBE/Inspections/InspectionsUI.Designer.cs

@@ -501,7 +501,7 @@
     <value>Kontexttyp '{0}' ist nicht gültig für {1}.</value>
   </data>
   <data name="QualifiedSelectionInspection" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3}, Zeile {4}</value>
+    <value>{0}: {1} - {2} {3}.{4}, Zeile {5}</value>
   </data>
   <data name="SetObjectVariableQuickFix" xml:space="preserve">
     <value>Benutze das Schlüsselwort 'Set'</value>

RetailCoder.VBE/Inspections/InspectionsUI.de.resx

@@ -501,7 +501,7 @@
     <value>Utiliser le mot-clé 'Set'</value>
   </data>
   <data name="QualifiedSelectionInspection">
-    <value>{0}: {1} - {2},{3}, ligne {4}</value>
+    <value>{0}: {1} - {2} {3}.{4}, ligne {5}</value>
   </data>
   <data name="ObjectVariableNotSetInspectionName">
     <value>L'assignation d'une référence d'objet requiert le mot-clé 'Set'</value>

RetailCoder.VBE/Inspections/InspectionsUI.fr.resx

@@ -507,7 +507,7 @@
     <value>Context type '{0}' is not valid for {1}.</value>
   </data>
   <data name="QualifiedSelectionInspection" xml:space="preserve">
-    <value>{0}: {1} - {2}.{3}, line {4}</value>
+    <value>{0}: {1} - {2} {3}.{4}, line {5}</value>
   </data>
   <data name="ObjectVariableNotSetInspectionMeta" xml:space="preserve">
     <value>As far as Rubberduck can tell, this variable is an object variable, assigned without the 'Set' keyword. This causes run-time error 91 'Object or With block variable not set'.</value>