Fix a couple things

Author: Hosch250

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -66,6 +66,7 @@ public override void Load()
             Bind<IVBE>().ToConstant(_vbe);
             Bind<IAddIn>().ToConstant(_addin);
             Bind<App>().ToSelf().InSingletonScope();
+            Bind<ParserStateChangeCallbackManager>().ToSelf().InSingletonScope();
             Bind<RubberduckParserState>().ToSelf().InSingletonScope();
             Bind<ISelectionChangeService>().To<SelectionChangeService>().InSingletonScope();
             Bind<ISourceControlProvider>().To<GitProvider>();
@@ -101,7 +102,6 @@ public override void Load()
             Bind<Func<IIndenterSettings>>().ToMethod(t => () => KernelInstance.Get<IGeneralConfigService>().LoadConfiguration().UserSettings.IndenterSettings);
 
             BindCustomDeclarationLoadersToParser();
-            Rebind<IParserStateChangeCallbackManager>().To<ParserStateChangeCallbackManager>().InSingletonScope();
             Rebind<IParseCoordinator>().To<ParseCoordinator>().InSingletonScope().WithConstructorArgument("serializedDeclarationsPath", (string)null);
             Bind<Func<IVBAPreprocessor>>().ToMethod(p => () => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture)));
 

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -335,7 +335,6 @@
     <Compile Include="VBA\EnumerableExtensions.cs" />
     <Compile Include="VBA\IAttributeParser.cs" />
     <Compile Include="VBA\IModuleExporter.cs" />
-    <Compile Include="VBA\IParserStateChangeCallbackManager.cs" />
     <Compile Include="VBA\ParserStateChangeCallbackManager.cs" />
     <Compile Include="VBA\ModuleState.cs" />
     <Compile Include="VBA\ParseErrorEventArgs.cs" />

Rubberduck.Parsing/VBA/IParserStateChangeCallbackManager.cs

@@ -40,7 +40,7 @@ private readonly IDictionary<IVBComponent, IDictionary<Tuple<string, Declaration
         private readonly IAttributeParser _attributeParser;
         private readonly Func<IVBAPreprocessor> _preprocessorFactory;
         private readonly IEnumerable<ICustomDeclarationLoader> _customDeclarationLoaders;
-        private readonly IParserStateChangeCallbackManager _callbackManager;
+        private readonly ParserStateChangeCallbackManager _callbackManager;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private readonly bool _isTestScope;
@@ -53,7 +53,7 @@ public ParseCoordinator(
             IAttributeParser attributeParser,
             Func<IVBAPreprocessor> preprocessorFactory,
             IEnumerable<ICustomDeclarationLoader> customDeclarationLoaders,
-            IParserStateChangeCallbackManager callbackManager,
+            ParserStateChangeCallbackManager callbackManager,
             bool isTestScope = false,
             string serializedDeclarationsPath = null)
         {

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -9,46 +9,46 @@ public enum ParserState
         /// <summary>
         /// Parse was requested but hasn't started yet.
         /// </summary>
-        Pending = 0,
+        Pending = 1,
         /// <summary>
         /// Project references are being loaded into parser state.
         /// </summary>
-        LoadingReference = 1,
+        LoadingReference = 2,
         /// <summary>
         /// Code from modified modules is being parsed.
         /// </summary>
-        Parsing = 2,
+        Parsing = 4,
         /// <summary>
         /// Parse tree is waiting to be walked for identifier resolution.
         /// </summary>
-        Parsed = 4,
+        Parsed = 8,
         /// <summary>
         /// Resolving declarations.
         /// </summary>
-        ResolvingDeclarations = 8,
+        ResolvingDeclarations = 16,
         /// <summary>
         /// Resolved declarations.
         /// </summary>
-        ResolvedDeclarations = 16,
+        ResolvedDeclarations = 32,
         /// <summary>
         /// Resolving identifier references.
         /// </summary>
-        ResolvingReferences = 32,
+        ResolvingReferences = 64,
         /// <summary>
         /// Parser state is in sync with the actual code in the VBE.
         /// </summary>
-        Ready = 64,
+        Ready = 128,
         /// <summary>
         /// Parsing could not be completed for one or more modules.
         /// </summary>
-        Error = 128,
+        Error = 256,
         /// <summary>
         /// Parsing completed, but identifier references could not be resolved for one or more modules.
         /// </summary>
-        ResolverError = 256,
+        ResolverError = 512,
         /// <summary>
         /// This component doesn't need a state.  Use for built-in declarations.
         /// </summary>
-        None = 512,
+        None = 1024,
     }
 }

Rubberduck.Parsing/VBA/ParserState.cs

@@ -6,13 +6,16 @@
 
 namespace Rubberduck.Parsing.VBA
 {
-    public class ParserStateChangeCallbackManager : IParserStateChangeCallbackManager
+    public class ParserStateChangeCallbackManager
     {
+        private readonly bool _runAsync;
+
         private readonly Dictionary<ParserState, ConcurrentDictionary<Action<CancellationToken>, byte>> _callbacks =
             new Dictionary<ParserState, ConcurrentDictionary<Action<CancellationToken>, byte>>();
 
-        public ParserStateChangeCallbackManager()
+        public ParserStateChangeCallbackManager(bool runAsync = true)
         {
+            _runAsync = runAsync;
             foreach (ParserState value in Enum.GetValues(typeof(ParserState)))
             {
                 _callbacks.Add(value, new ConcurrentDictionary<Action<CancellationToken>, byte>());
@@ -61,7 +64,14 @@ public void RunCallbacks(ParserState state, CancellationToken token)
             {
                 if (token.IsCancellationRequested) { break; }
 
-                Task.Run(() => callback(token), token);
+                if (_runAsync)
+                {
+                    Task.Run(() => callback(token), token);
+                }
+                else
+                {
+                    callback(token);
+                }
             }
         }
     }

Rubberduck.Parsing/VBA/ParserStateChangeCallbackManager.cs

@@ -69,9 +69,9 @@ public void UnregisterCallback(Action<CancellationToken> callback)
         }
 
         private readonly IVBE _vbe;
-        private readonly IParserStateChangeCallbackManager _callbackManager;
+        private readonly ParserStateChangeCallbackManager _callbackManager;
 
-        public RubberduckParserState(IVBE vbe, IParserStateChangeCallbackManager callbackManager)
+        public RubberduckParserState(IVBE vbe, ParserStateChangeCallbackManager callbackManager)
         {
             var values = Enum.GetValues(typeof(ParserState));
             foreach (var value in values)