Unify some duplicated codes and make them testable/mockable

Rubberduck.API/API/VBA/ParserState.cs

@@ -11,7 +11,9 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.VBEditor.ComManagement;
+using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.VBA;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.API.VBA
 {
@@ -50,11 +52,13 @@ public sealed class ParserState : IParserState, IDisposable
         private AttributeParser _attributeParser;
         private ParseCoordinator _parser;
         private VBE _vbe;
+        private IVBEEvents _vbeEvents;
+        private readonly IUiDispatcher _dispatcher;
 
         public ParserState()
         {
-            UiDispatcher.Initialize();
-            ComMessagePumper.Initialize();
+            UiContextProvider.Initialize();
+            _dispatcher = new UiDispatcher(UiContextProvider.Instance());
         }
 
         public void Initialize(Microsoft.Vbe.Interop.VBE vbe)
@@ -65,9 +69,10 @@ public void Initialize(Microsoft.Vbe.Interop.VBE vbe)
             }
 
             _vbe = new VBE(vbe);
+            _vbeEvents = VBEEvents.Initialize(_vbe);
             var declarationFinderFactory = new ConcurrentlyConstructedDeclarationFinderFactory();
             var projectRepository = new ProjectsRepository(_vbe);
-            _state = new RubberduckParserState(null, projectRepository, declarationFinderFactory);
+            _state = new RubberduckParserState(null, projectRepository, declarationFinderFactory, _vbeEvents);
             _state.StateChanged += _state_StateChanged;
 
             var exporter = new ModuleExporter();
@@ -144,7 +149,7 @@ public void Parse()
         public void BeginParse()
         {
             // non-blocking call
-            UiDispatcher.Invoke(() => _state.OnParseRequested(this));
+            _dispatcher.Invoke(() => _state.OnParseRequested(this));
         }
 
         public event Action OnParsed;
@@ -164,19 +169,19 @@ private void _state_StateChanged(object sender, EventArgs e)
             var errorHandler = OnError;
             if (_state.Status == Parsing.VBA.ParserState.Error && errorHandler != null)
             {
-                UiDispatcher.Invoke(errorHandler.Invoke);
+                _dispatcher.Invoke(errorHandler.Invoke);
             }
 
             var parsedHandler = OnParsed;
             if (_state.Status == Parsing.VBA.ParserState.Parsed && parsedHandler != null)
             {
-                UiDispatcher.Invoke(parsedHandler.Invoke);
+                _dispatcher.Invoke(parsedHandler.Invoke);
             }
 
             var readyHandler = OnReady;
             if (_state.Status == Parsing.VBA.ParserState.Ready && readyHandler != null)
             {
-                UiDispatcher.Invoke(readyHandler.Invoke);
+                _dispatcher.Invoke(readyHandler.Invoke);
             }
         }
 

Rubberduck.Core/App.cs

@@ -15,6 +15,7 @@
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 using Rubberduck.VersionCheck;
 using Application = System.Windows.Forms.Application;
 
@@ -50,8 +51,7 @@ public sealed class App : IDisposable
 
             _configService.SettingsChanged += _configService_SettingsChanged;
 
-            UiDispatcher.Initialize();
-            ComMessagePumper.Initialize();
+            UiContextProvider.Initialize();
         }
 
         private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -14,7 +14,6 @@
 using Rubberduck.UI;
 using Rubberduck.UI.CodeExplorer.Commands;
 using Rubberduck.UI.Command;
-using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using System.Windows;
@@ -32,17 +31,24 @@ public sealed class CodeExplorerViewModel : ViewModelBase, IDisposable
         private readonly IConfigProvider<WindowSettings> _windowSettingsProvider;
         private readonly GeneralSettings _generalSettings;
         private readonly WindowSettings _windowSettings;
+        private readonly IUiDispatcher _uiDispatcher;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState state, List<CommandBase> commands,
-            IConfigProvider<GeneralSettings> generalSettingsProvider, IConfigProvider<WindowSettings> windowSettingsProvider)
+        public CodeExplorerViewModel(
+            FolderHelper folderHelper, 
+            RubberduckParserState state, 
+            List<CommandBase> commands,
+            IConfigProvider<GeneralSettings> generalSettingsProvider, 
+            IConfigProvider<WindowSettings> windowSettingsProvider, 
+            IUiDispatcher uiDispatcher)
         {
             _folderHelper = folderHelper;
             _state = state;
             _state.StateChanged += HandleStateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
             _windowSettingsProvider = windowSettingsProvider;
+            _uiDispatcher = uiDispatcher;
 
             if (generalSettingsProvider != null)
             {
@@ -388,7 +394,7 @@ private void ParserState_ModuleStateChanged(object sender, ParseProgressEventArg
                 var projectName = componentProject.Name;
                 var folderNode = projectNode.Items.FirstOrDefault(f => f is CodeExplorerCustomFolderViewModel && f.Name == projectName);
 
-                UiDispatcher.Invoke(() =>
+                _uiDispatcher.Invoke(() =>
                 {
                     try
                     {

Rubberduck.Core/Rubberduck.Core.csproj

@@ -475,9 +475,6 @@
     <Compile Include="UnitTesting\IFakes.cs" />
     <Compile Include="UnitTesting\ReturnTypeConverter.cs" />
     <Compile Include="UnitTesting\PermissiveObjectComparer.cs" />
-    <Compile Include="VBERuntime\RegistryWrapper.cs" />
-    <Compile Include="VBERuntime\IVBESettings.cs" />
-    <Compile Include="VBERuntime\VBESettings.cs" />
     <Compile Include="VersionCheck\IVersionCheck.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\AppCommandBarBase.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\ContextSelectionLabelMenuItem.cs" />

Rubberduck.Core/UI/Command/FindAllImplementationsCommand.cs

@@ -28,12 +28,13 @@ public class FindAllImplementationsCommand : CommandBase, IDisposable
         private readonly ISearchResultsWindowViewModel _viewModel;
         private readonly SearchResultPresenterInstanceManager _presenterService;
         private readonly IVBE _vbe;
+        private readonly IUiDispatcher _uiDispatcher;
 
         private new static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public FindAllImplementationsCommand(INavigateCommand navigateCommand, IMessageBox messageBox,
             RubberduckParserState state, IVBE vbe, ISearchResultsWindowViewModel viewModel,
-            SearchResultPresenterInstanceManager presenterService)
+            SearchResultPresenterInstanceManager presenterService, IUiDispatcher uiDispatcher)
              : base(LogManager.GetCurrentClassLogger())
         {
             _navigateCommand = navigateCommand;
@@ -42,6 +43,7 @@ public class FindAllImplementationsCommand : CommandBase, IDisposable
             _vbe = vbe;
             _viewModel = viewModel;
             _presenterService = presenterService;
+            _uiDispatcher = uiDispatcher;
 
             _state.StateChanged += _state_StateChanged;
         }
@@ -62,7 +64,7 @@ private void _state_StateChanged(object sender, ParserStateEventArgs e)
 
             if (_viewModel == null) { return; }
 
-            UiDispatcher.InvokeAsync(UpdateTab);
+            _uiDispatcher.InvokeAsync(UpdateTab);
         }
 
         private void UpdateTab()

Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs

@@ -6,7 +6,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Controls;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -25,10 +24,11 @@ public class FindAllReferencesCommand : CommandBase, IDisposable
         private readonly ISearchResultsWindowViewModel _viewModel;
         private readonly SearchResultPresenterInstanceManager _presenterService;
         private readonly IVBE _vbe;
+        private readonly IUiDispatcher _uiDispatcher;
 
         public FindAllReferencesCommand(INavigateCommand navigateCommand, IMessageBox messageBox,
             RubberduckParserState state, IVBE vbe, ISearchResultsWindowViewModel viewModel,
-            SearchResultPresenterInstanceManager presenterService)
+            SearchResultPresenterInstanceManager presenterService, IUiDispatcher uiDispatcher)
              : base(LogManager.GetCurrentClassLogger())
         {
             _navigateCommand = navigateCommand;
@@ -37,6 +37,7 @@ public class FindAllReferencesCommand : CommandBase, IDisposable
             _vbe = vbe;
             _viewModel = viewModel;
             _presenterService = presenterService;
+            _uiDispatcher = uiDispatcher;
 
             _state.StateChanged += _state_StateChanged;
         }
@@ -57,7 +58,7 @@ private void _state_StateChanged(object sender, ParserStateEventArgs e)
 
             if (_viewModel == null) { return; }
 
-            UiDispatcher.InvokeAsync(UpdateTab);
+            _uiDispatcher.InvokeAsync(UpdateTab);
         }
 
         private void UpdateTab()

Rubberduck.Core/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

@@ -16,13 +16,15 @@ public abstract class AppCommandBarBase : IAppCommandBar
         private readonly string _name;
         private readonly CommandBarPosition _position;
         private readonly IDictionary<ICommandMenuItem, ICommandBarControl> _items;
+        protected readonly IUiDispatcher _uiDispatcher;
         protected static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        protected AppCommandBarBase(string name, CommandBarPosition position, IEnumerable<ICommandMenuItem> items)
+        protected AppCommandBarBase(string name, CommandBarPosition position, IEnumerable<ICommandMenuItem> items, IUiDispatcher uiDispatcher)
         {
             _name = name;
             _position = position;
             _items = items.ToDictionary(item => item, item => null as ICommandBarControl);
+            _uiDispatcher = uiDispatcher;
         }
 
         protected ICommandMenuItem FindChildByTag(string tag)
@@ -53,7 +55,7 @@ public void Localize()
                 try
                 {
                     var item = kvp;
-                    UiDispatcher.Invoke(() => LocalizeInternal(item, kvp));
+                    _uiDispatcher.Invoke(() => LocalizeInternal(item, kvp));
 
                 }
                 catch (Exception e)

Rubberduck.Core/UI/Command/MenuItems/CommandBars/RubberduckCommandBar.cs

@@ -16,8 +16,8 @@ public class RubberduckCommandBar : AppCommandBarBase, IDisposable
         private readonly IParseCoordinator _parser;
         private readonly ISelectionChangeService _selectionService;
 
-        public RubberduckCommandBar(IParseCoordinator parser, IEnumerable<ICommandMenuItem> items, IContextFormatter formatter, ISelectionChangeService selectionService) 
-            : base("Rubberduck", CommandBarPosition.Top, items)
+        public RubberduckCommandBar(IParseCoordinator parser, IEnumerable<ICommandMenuItem> items, IContextFormatter formatter, ISelectionChangeService selectionService, IUiDispatcher uiDispatcher) 
+            : base("Rubberduck", CommandBarPosition.Top, items, uiDispatcher)
         {
             _parser = parser;
             _formatter = formatter;
@@ -106,7 +106,7 @@ private void SetStatusLabelCaption(string caption, int? errorCount = null)
             var showErrorsCommandButton = FindChildByTag(typeof(ShowParserErrorsCommandMenuItem).FullName) as ShowParserErrorsCommandMenuItem;
             if (showErrorsCommandButton == null) { return; }
 
-            UiDispatcher.Invoke(() =>
+            _uiDispatcher.Invoke(() =>
             {
                 try
                 {
@@ -132,7 +132,7 @@ private void SetContextSelectionCaption(string caption, int contextReferenceCoun
             var contextReferences = FindChildByTag(typeof(ReferenceCounterLabelMenuItem).FullName) as ReferenceCounterLabelMenuItem;
             var contextDescription = FindChildByTag(typeof(ContextDescriptionLabelMenuItem).FullName) as ContextDescriptionLabelMenuItem;
 
-            UiDispatcher.Invoke(() =>
+            _uiDispatcher.Invoke(() =>
             {
                 try
                 {

Rubberduck.Core/UI/Command/ReparseCommand.cs

@@ -8,10 +8,10 @@
 using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.UI.CodeExplorer.Commands;
-using Rubberduck.VBERuntime;
 using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.VBERuntime.Settings;
 
 namespace Rubberduck.UI.Command
 {

Rubberduck.Core/UI/Command/ShowParserErrorsCommand.cs

@@ -7,7 +7,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Controls;
 using Rubberduck.VBEditor;
 
@@ -22,17 +21,20 @@ public class ShowParserErrorsCommand : CommandBase, IShowParserErrorsCommand
         private readonly RubberduckParserState _state;
         private readonly ISearchResultsWindowViewModel _viewModel;
         private readonly SearchResultPresenterInstanceManager _presenterService;
+        private readonly IUiDispatcher _uiDispatcher;
 
         public ShowParserErrorsCommand(INavigateCommand navigateCommand,
             RubberduckParserState state,
             ISearchResultsWindowViewModel viewModel,
-            SearchResultPresenterInstanceManager presenterService)
+            SearchResultPresenterInstanceManager presenterService,
+            IUiDispatcher uiDispatcher)
             : base(LogManager.GetCurrentClassLogger())
         {
             _navigateCommand = navigateCommand;
             _state = state;
             _viewModel = viewModel;
             _presenterService = presenterService;
+            _uiDispatcher = uiDispatcher;
 
             _state.StateChanged += _state_StateChanged;
         }
@@ -42,8 +44,8 @@ private void _state_StateChanged(object sender, ParserStateEventArgs e)
             if (_viewModel == null) { return; }
 
             if (_state.Status != ParserState.Error && _state.Status != ParserState.Parsed) { return; }
-            
-            UiDispatcher.InvokeAsync(UpdateTab);
+
+            _uiDispatcher.InvokeAsync(UpdateTab);
         }
 
         private void UpdateTab()

Rubberduck.Core/UI/Inspections/InspectionResultsViewModel.cs

@@ -15,7 +15,6 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.UI.Command;
-using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Controls;
 using Rubberduck.UI.Settings;
 
@@ -41,12 +40,20 @@ public sealed class InspectionResultsViewModel : ViewModelBase, INavigateSelecti
         private readonly IClipboardWriter _clipboard;
         private readonly IGeneralConfigService _configService;
         private readonly ISettingsFormFactory _settingsFormFactory;
+        private readonly IUiDispatcher _uiDispatcher;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public InspectionResultsViewModel(RubberduckParserState state, IInspector inspector, IQuickFixProvider quickFixProvider,
-            INavigateCommand navigateCommand, ReparseCommand reparseCommand,
-            IClipboardWriter clipboard, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory)
+        public InspectionResultsViewModel(
+            RubberduckParserState state, 
+            IInspector inspector, 
+            IQuickFixProvider quickFixProvider,
+            INavigateCommand navigateCommand, 
+            ReparseCommand reparseCommand,
+            IClipboardWriter clipboard, 
+            IGeneralConfigService configService, 
+            ISettingsFormFactory settingsFormFactory,
+            IUiDispatcher uiDispatcher)
         {
             _state = state;
             _inspector = inspector;
@@ -55,6 +62,8 @@ public sealed class InspectionResultsViewModel : ViewModelBase, INavigateSelecti
             _clipboard = clipboard;
             _configService = configService;
             _settingsFormFactory = settingsFormFactory;
+            _uiDispatcher = uiDispatcher;
+
             RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),
                 o =>
                 {
@@ -326,7 +335,7 @@ private async void RefreshInspections(CancellationToken token)
 
             Results = new ObservableCollection<IInspectionResult>(results);
 
-            UiDispatcher.Invoke(() =>
+            _uiDispatcher.Invoke(() =>
             {
                 try
                 {

Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs

@@ -8,7 +8,7 @@
 using NLog;
 using Rubberduck.SettingsProvider;
 using Rubberduck.UI.Command;
-using Rubberduck.VBERuntime;
+using Rubberduck.VBEditor.VBERuntime.Settings;
 
 namespace Rubberduck.UI.Settings
 {

Rubberduck.Core/UI/Settings/SettingsForm.cs

@@ -1,10 +1,9 @@
 using System.Windows.Forms;
 using Rubberduck.Settings;
 using Rubberduck.Common;
-using Rubberduck.VBERuntime;
+using Rubberduck.VBEditor.VBERuntime.Settings;
 using System.Collections.Generic;
 using System;
-using System.Collections.ObjectModel;
 
 namespace Rubberduck.UI.Settings
 {