Merge pull request #1952 from rubberduck-vba/next

Release 2.0.4

Author: Hosch250

README.md

@@ -1,9 +1,9 @@
-![Rubberduck](http://i.stack.imgur.com/vmqXM.png)
+<img src="http://i.stack.imgur.com/vmqXM.png" width="320" />
 
-| Branch     | Build Status |
-|------------|--------------|
-| **master** | ![master branch build status][masterBuildStatus] |
-| **next**   | ![next branch build status][nextBuildStatus] |
+Branch     | Description | Build Status |
+|------------|---|--------------|
+| **master** | The last released build | ![master branch build status][masterBuildStatus] |
+| **next**   | The current build (dev)  | ![next branch build status][nextBuildStatus] |
 
 [nextBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/next?svg=true
 [masterBuildStatus]:https://ci.appveyor.com/api/projects/status/we3pdnkeebo4nlck/branch/master?svg=true

RetailCoder.VBE/API/ParserState.cs

@@ -47,16 +47,13 @@ public sealed class ParserState : IParserState, IDisposable
         private const string ClassId = "28754D11-10CC-45FD-9F6A-525A65412B7A";
         private const string ProgId = "Rubberduck.ParserState";
 
-        private readonly RubberduckParserState _state;
+        private RubberduckParserState _state;
         private AttributeParser _attributeParser;
         private RubberduckParser _parser;
 
         public ParserState()
         {
             UiDispatcher.Initialize();
-            _state = new RubberduckParserState();
-            
-            _state.StateChanged += _state_StateChanged;
         }
 
         public void Initialize(VBE vbe)
@@ -65,6 +62,10 @@ public void Initialize(VBE vbe)
             {
                 throw new InvalidOperationException("ParserState is already initialized.");
             }
+
+            _state = new RubberduckParserState(vbe, new Sinks(vbe));
+            _state.StateChanged += _state_StateChanged;
+
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
             _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,