Code Cleanup, Reset for existing RubberduckParser to the State of next

Author: Vogel612

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -186,6 +186,7 @@
     <Compile Include="VBA\AttributesListener.cs" />
     <Compile Include="VBA\AttributesParser.cs" />
     <Compile Include="VBA\AttributesVisitor.cs" />
+    <Compile Include="VBA\CombinedParseTreeListener.cs" />
     <Compile Include="VBA\ComponentParseTask.cs" />
     <Compile Include="VBA\EnumerableExtensions.cs" />
     <Compile Include="VBA\IAttributeParser.cs" />

Rubberduck.Parsing/VBA/ComponentParseTask.cs

@@ -132,12 +132,6 @@ public class ParseCompletionArgs
         {
             public ITokenStream Tokens { get; internal set; }
             public IParseTree ParseTree { get; internal set; }
-            public IEnumerable<CommentNode> Comments { get; internal set; }
-            public IEnumerable<QualifiedContext> ObsoleteCallContexts { get; internal set; }
-            public IEnumerable<QualifiedContext> ObsoleteLetContexts { get; internal set; }
-            public IEnumerable<QualifiedContext> EmptyStringLiterals { get; internal set; }
-            public IEnumerable<QualifiedContext> ArgListsWithOneByRefParam { get; internal set; }
-            public IEnumerable<Declaration> Declarations { get; internal set; }
             public IDictionary<Tuple<string, DeclarationType>, Attributes> Attributes { get; internal set; }
         }
 

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -24,20 +24,6 @@ public class RubberduckParser : IRubberduckParser
     {
         private readonly ReferencedDeclarationsCollector _comReflector;
 
-        private readonly IParseTreeListener[] listeners = new IParseTreeListener[]
-        {
-            new ObsoleteCallStatementListener(),
-            new ObsoleteLetStatementListener(),
-            new EmptyStringLiteralListener(),
-            new ArgListWithOneByRefParamListener(),
-            new CommentListener(),
-        };
-
-        private readonly VBE _vbe;
-        private readonly RubberduckParserState _state;
-        private readonly IAttributeParser _attributeParser;
-        public RubberduckParserState State { get { return _state; } }
-
         public RubberduckParser(VBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
         {
             _vbe = vbe;
@@ -52,21 +38,17 @@ public RubberduckParser(VBE vbe, RubberduckParserState state, IAttributeParser a
 
         private void ReparseRequested(object sender, EventArgs e)
         {
-            var args = e as ParseRequestEventArgs;
-            if (args.IsFullReparseRequest)
-            {
-                // cancel currently running parsing processes...
-                Task.Run(() => ParseInternal());
-            }
-            else
-            {
-                ParseAsync(args.Component, CancellationToken.None, _state.GetRewriter(args.Component));
-            }
+            Task.Run(() => ParseInternal());
         }
 
+        private readonly VBE _vbe;
+        private readonly RubberduckParserState _state;
+        private readonly IAttributeParser _attributeParser;
+        public RubberduckParserState State { get { return _state; } }
+
         /// <summary>
         /// This method is not part of the interface and should only be used for testing.
-        /// Request a reparse using <cref>RubberduckParserState.ParseRequest</cref> instead.
+        /// Request a reparse using RubberduckParserState.OnParseRequested instead.
         /// </summary>
         public void Parse()
         {
@@ -147,7 +129,8 @@ private void AddDeclarationsFromProjectReferences(IReadOnlyList<VBProject> proje
             var references = projects
                 .SelectMany(project => project.References.Cast<Reference>())
                 .DistinctBy(reference => reference.Guid)
-                .Where(reference => reference.Type == vbext_RefKind.vbext_rk_TypeLib);
+                .Where(reference => reference.Type == vbext_RefKind.vbext_rk_TypeLib)
+                .ToList();
             foreach (var reference in references)
             {
                 AddDeclarationsFromReference(reference);
@@ -171,15 +154,9 @@ private void SetComponentsState(IEnumerable<VBComponent> components, ParserState
             }
         }
 
-
-        public Task ParseAsync(VBComponent component, CancellationToken token, TokenStreamRewriter rewriter = null)
-        {
-            return Task.Run(() => ParseComponent(component, rewriter), token);
-        }
-
-
         public void ParseComponent(VBComponent vbComponent, TokenStreamRewriter rewriter = null)
         {
+            var component = vbComponent;
             State.SetModuleState(vbComponent, ParserState.Parsing);
 
             try
@@ -195,10 +172,25 @@ public void ParseComponent(VBComponent vbComponent, TokenStreamRewriter rewriter
                 }
                 catch (VBAPreprocessorException)
                 {
-                    Debug.Print("Falling back to no preprocessing");
+                    // Fall back to not doing any preprocessing at all.
                     preprocessedModuleBody = code;
                 }
 
+                var obsoleteCallsListener = new ObsoleteCallStatementListener();
+                var obsoleteLetListener = new ObsoleteLetStatementListener();
+                var emptyStringLiteralListener = new EmptyStringLiteralListener();
+                var argListsWithOneByRefParam = new ArgListWithOneByRefParamListener();
+                var commentListener = new CommentListener();
+
+                var listeners = new IParseTreeListener[]
+                {
+                    obsoleteCallsListener,
+                    obsoleteLetListener,
+                    emptyStringLiteralListener,
+                    argListsWithOneByRefParam,
+                    commentListener
+                };
+
                 DeclarationSymbolsListener listener;
                 var tree = GetParseTree(vbComponent, listeners, preprocessedModuleBody, qualifiedName, out listener);
                 WalkParseTree(listeners, qualifiedName, tree, listener);
@@ -207,13 +199,13 @@ public void ParseComponent(VBComponent vbComponent, TokenStreamRewriter rewriter
             }
             catch (COMException exception)
             {
-                State.SetModuleState(vbComponent, ParserState.Error);
+                State.SetModuleState(component, ParserState.Error);
                 Debug.WriteLine("Exception thrown in thread {0}:\n{1}", Thread.CurrentThread.ManagedThreadId, exception);
             }
             catch (SyntaxErrorException exception)
             {
                 Debug.WriteLine("Exception thrown in thread {0}:\n{1}", Thread.CurrentThread.ManagedThreadId, exception);
-                State.SetModuleState(vbComponent, ParserState.Error, exception);
+                State.SetModuleState(component, ParserState.Error, exception);
             }
             catch (OperationCanceledException exception)
             {
@@ -369,17 +361,17 @@ private ParserState WalkParseTree(VBComponent component, IParseTree tree, Declar
             return ParserState.Ready;
         }
 
-        public void Resolve(CancellationToken token)
+        public Task ParseAsync(VBComponent component, CancellationToken token, TokenStreamRewriter rewriter = null)
         {
             throw new NotImplementedException();
         }
 
-        public Task ParseAsync(VBComponent component, TokenStreamRewriter rewriter = null)
+        public void Cancel(VBComponent component = null)
         {
             throw new NotImplementedException();
         }
 
-        public void Cancel(VBComponent component = null)
+        public void Resolve(CancellationToken token)
         {
             throw new NotImplementedException();
         }

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -115,10 +115,7 @@ private ParserState EvaluateParserState()
 
         public ParserState GetModuleState(VBComponent component)
         {
-            ParserState result;
-            return _moduleStates.TryGetValue(component, out result) 
-                ? result 
-                : ParserState.Pending;
+            return _moduleStates.GetOrAdd(component, ParserState.Pending);
         }
 
         private ParserState _status;