Reparsing a module now cancels a currently running Resolver task

Author: Vogel612

Rubberduck.Parsing/VBA/ComponentParseTask.cs

@@ -31,6 +31,8 @@ class ComponentParseTask
 
         public ComponentParseTask(VBComponent vbComponent, VBAPreprocessor preprocessor, IAttributeParser attributeParser, TokenStreamRewriter rewriter = null)
         {
+            _attributeParser = attributeParser;
+            _preprocessor = preprocessor;
             _component = vbComponent;
             _rewriter = rewriter;
             _qualifiedName = new QualifiedModuleName(vbComponent); 

Rubberduck.Parsing/VBA/RubberduckParserReimpl.cs

@@ -28,6 +28,7 @@ public RubberduckParserState State
         }
 
         private readonly CancellationTokenSource _central = new CancellationTokenSource();
+        private readonly CancellationTokenSource _resolverTokenSource; // linked to _central later
         private readonly Dictionary<VBComponent, Tuple<Task, CancellationTokenSource>> _currentTasks = new Dictionary<VBComponent, Tuple<Task, CancellationTokenSource>>();
 
         private readonly Dictionary<VBComponent, IParseTree> _parseTrees = new Dictionary<VBComponent, IParseTree>();
@@ -46,6 +47,7 @@ private readonly IDictionary<VBComponent, IDictionary<Tuple<string, DeclarationT
 
         public RubberduckParserReimpl(VBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
         {
+            _resolverTokenSource = CancellationTokenSource.CreateLinkedTokenSource(_central.Token);
             _vbe = vbe;
             _state = state;
             _attributeParser = attributeParser;
@@ -135,12 +137,11 @@ public void Cancel(VBComponent component = null)
             }
             else
             {
+                _resolverTokenSource.Cancel(false);
                 Tuple<Task, CancellationTokenSource> result;
                 if (_currentTasks.TryGetValue(component, out result))
                 {
                     result.Item2.Cancel(false);
-                    // should we do this??
-                    //result.Item1.Wait(); 
                 }
             }
         }
@@ -171,7 +172,8 @@ public void ParseComponent(VBComponent component, TokenStreamRewriter rewriter =
 
         public void Resolve(CancellationToken token)
         {
-            Task.Run(() => ResolveInternal(token));
+            var sharedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(_resolverTokenSource.Token, token);
+            Task.Run(() => ResolveInternal(sharedTokenSource.Token));
         }
 
         private void ResolveInternal(CancellationToken token)
@@ -197,6 +199,7 @@ private void ResolveDeclarations(VBComponent component, IParseTree tree)
             var declarations = new List<Declaration>();
             var qualifiedModuleName = new QualifiedModuleName(component);
             DeclarationSymbolsListener declarationsListener = new DeclarationSymbolsListener(qualifiedModuleName, Accessibility.Implicit, component.Type, _state.GetModuleComments(component), _state.getModuleAttributes(component));
+            // TODO: should we unify the API? consider working like the other listeners instead of event-based
             declarationsListener.NewDeclaration += (sender, e) => _state.AddDeclaration(e.Declaration);
             declarationsListener.CreateModuleDeclarations();
 
@@ -211,16 +214,14 @@ private void ResolveDeclarations(VBComponent component, IParseTree tree)
                 obsoleteLetStatementListener,
                 emptyStringLiteralListener,
                 argListWithOneByRefParamListener,
-                
                 declarationsListener,
             }), tree);
 
             // FIXME this are actually (almost) isnpection results.. we should handle them as such
             _state.ArgListsWithOneByRefParam = argListWithOneByRefParamListener.Contexts.Select(context => new QualifiedContext(qualifiedModuleName, context));
             _state.EmptyStringLiterals = emptyStringLiteralListener.Contexts.Select(context => new QualifiedContext(qualifiedModuleName, context));
             _state.ObsoleteLetContexts = obsoleteLetStatementListener.Contexts.Select(context => new QualifiedContext(qualifiedModuleName, context));
-            _state.ObsoleteCallContexts = obsoleteCallStatementListener.Contexts.Select(context => new QualifiedContext(qualifiedModuleName, context));
-            
+            _state.ObsoleteCallContexts = obsoleteCallStatementListener.Contexts.Select(context => new QualifiedContext(qualifiedModuleName, context))
         }
 
         private void ResolveReferences(DeclarationFinder finder, VBComponent component, IParseTree tree)