Merge branch 'rubberduck-vba/next' into next

Author: BZngr

Installer Build Script.iss

@@ -1,8 +1,7 @@
-#define BuildDir SourcePath + "RetailCoder.VBE\bin\Release"
+#define BuildDir SourcePath + "Rubberduck.Main\bin\Release"
 #define AppName "Rubberduck"
 #define AddinDLL "Rubberduck.dll"
-#define InspectionsDLL "Rubberduck.Inspections.dll"
-#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\Release\Rubberduck.dll")
+#define AppVersion GetFileVersion(SourcePath + "Rubberduck.Main\bin\Release\Rubberduck.dll")
 #define AppPublisher "Rubberduck"
 #define AppURL "http://rubberduckvba.com"
 #define License SourcePath + "\License.rtf"
@@ -42,7 +41,6 @@ Source: "{#BuildDir}\lib\win32\x64\*"; DestDir: "{app}"; Flags: ignoreversion; E
 Source: "{#BuildDir}\lib\win32\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled
 
 Source: "{#BuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Excludes: "{#AddinDLL},\NativeBinaries"
-Source: "{#BuildDir}\{#InspectionsDLL}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BuildDir}\{#AddinDLL}"; DestDir: "{app}"; Flags: ignoreversion; AfterInstall: RegisterAddin
 
 [Run]

license renamed to LICENSE

@@ -1,4 +1,4 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    {project}  Copyright (C) {year}  {fullname}
+    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -8,12 +8,12 @@
 using Rubberduck.Parsing.PreProcessing;
 using Rubberduck.Parsing.Symbols.DeclarationLoaders;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.UI.Command.MenuItems;
 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
 {
@@ -52,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)
@@ -67,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();
@@ -146,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;
@@ -166,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);
             }
         }