Merge branch 'next' into next

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -225,6 +225,8 @@ async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
                 return;
             }
 
+            _parser.Cancel();
+
             var projectId = e.Item.HelpFile;
             Debug.Assert(projectId != null);
 
@@ -334,6 +336,8 @@ async void sink_ComponentRenamed(object sender, DispatcherRenamedEventArgs<VBCom
                 return;
             }
 
+            _parser.Cancel();
+
             _sourceControlPanelVM.HandleRenamedComponent(e.Item, e.OldName);
 
             _logger.Debug("Component '{0}' was renamed to '{1}'.", e.OldName, e.Item.Name);
@@ -389,6 +393,8 @@ async void sink_ComponentRemoved(object sender, DispatcherEventArgs<VBComponent>
                 return;
             }
 
+            _parser.Cancel(e.Item);
+
             _sourceControlPanelVM.HandleRemovedComponent(e.Item);
 
             _logger.Debug("Component '{0}' was removed.", e.Item.Name);
@@ -404,6 +410,8 @@ async void sink_ComponentReloaded(object sender, DispatcherEventArgs<VBComponent
                 return;
             }
 
+            _parser.Cancel(e.Item);
+
             _logger.Debug("Component '{0}' was reloaded.", e.Item.Name);
             _parser.State.OnParseRequested(sender, e.Item);
         }
@@ -445,6 +453,8 @@ async void sink_ProjectRenamed(object sender, DispatcherRenamedEventArgs<VBProje
                 return;
             }
 
+            _parser.Cancel();
+
             _logger.Debug("Project '{0}' (ID {1}) was renamed to '{2}'.", e.OldName, e.Item.HelpFile, e.Item.Name);
 
             _parser.State.RemoveProject(e.Item.HelpFile);

Rubberduck.Parsing/Binding/TypeBindingContext.cs

@@ -44,6 +44,13 @@ private IExpressionBinding Visit(Declaration module, Declaration parent, VBAPars
             return Visit(module, parent, lexpr);
         }
 
+        private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.IndexExprContext expression)
+        {
+            dynamic lexpr = expression.lExpression();
+            var type = expression.lExpression().GetType();
+            return Visit(module, parent, lexpr);
+        }
+
         private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.SimpleNameExprContext expression)
         {
             return new SimpleNameTypeBinding(_declarationFinder, Declaration.GetProjectParent(parent), module, parent, expression);

Rubberduck.Parsing/IRubberduckParser.cs

@@ -1,10 +1,12 @@
 using System;
+using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.VBA;
 
 namespace Rubberduck.Parsing
 {
     public interface IRubberduckParser : IDisposable
     {
         RubberduckParserState State { get; }
+        void Cancel(VBComponent component = null);
     }
 }

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -260,17 +260,14 @@ private void ParseAll()
                 return;
             }
 
-            lock (State)  // note, method is invoked from UI thread... really need the lock here?
+            foreach (var component in toParse)
             {
-                foreach (var component in toParse)
-                {
-                    State.SetModuleState(component, ParserState.Pending);
-                }
-                foreach (var component in unchanged)
-                {
-                    // note: seting to 'Parsed' would include them in the resolver walk. 'Ready' excludes them.
-                    State.SetModuleState(component, ParserState.Ready);
-                }
+                State.SetModuleState(component, ParserState.Pending);
+            }
+            foreach (var component in unchanged)
+            {
+                // note: seting to 'Parsed' would include them in the resolver walk. 'Ready' excludes them.
+                State.SetModuleState(component, ParserState.Ready);
             }
 
             // invalidation cleanup should go into ParseAsync?
@@ -304,10 +301,7 @@ private void ParseAll()
                     Logger.Debug("Module '{0}' {1}", qualifiedName.ComponentName,
                         State.IsNewOrModified(qualifiedName) ? "was modified" : "was NOT modified");
 
-                    lock (State)
-                    {
-                        State.SetModuleState(toParse[index], ParserState.ResolvingDeclarations);
-                    }
+                    State.SetModuleState(toParse[index], ParserState.ResolvingDeclarations);
 
                     ResolveDeclarations(qualifiedName.Component,
                         State.ParseTrees.Find(s => s.Key == qualifiedName).Value);
@@ -349,10 +343,7 @@ private Task[] ResolveReferencesAsync()
 
                 tasks[index] = Task.Run(() =>
                 {
-                    lock (State)
-                    {
-                        State.SetModuleState(kvp.Key.Component, ParserState.ResolvingReferences);
-                    }
+                    State.SetModuleState(kvp.Key.Component, ParserState.ResolvingReferences);
 
                     ResolveReferences(finder, kvp.Key.Component, kvp.Value);
                 });
@@ -363,14 +354,11 @@ private Task[] ResolveReferencesAsync()
 
         private void AddBuiltInDeclarations()
         {
-            lock (State)
+            foreach (var customDeclarationLoader in _customDeclarationLoaders)
             {
-                foreach (var customDeclarationLoader in _customDeclarationLoaders)
+                foreach (var declaration in customDeclarationLoader.Load())
                 {
-                    foreach (var declaration in customDeclarationLoader.Load())
-                    {
-                        State.AddDeclaration(declaration);
-                    }
+                    State.AddDeclaration(declaration);
                 }
             }
         }
@@ -512,12 +500,8 @@ private void UnloadComReference(Reference reference, IReadOnlyList<VBProject> pr
 
         private Task ParseAsync(VBComponent component, CancellationToken token, TokenStreamRewriter rewriter = null)
         {
-            lock (State)
-                lock (component)
-                {
-                    State.ClearStateCache(component);
-                    State.SetModuleState(component, ParserState.Pending); // also clears module-exceptions
-                }
+            State.ClearStateCache(component);
+            State.SetModuleState(component, ParserState.Pending); // also clears module-exceptions
 
             var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(_central.Token, token);
 
@@ -566,11 +550,7 @@ private void ParseAsyncInternal(VBComponent component, CancellationToken token,
             var parser = new ComponentParseTask(component, preprocessor, _attributeParser, rewriter);
             parser.ParseFailure += (sender, e) =>
             {
-                lock (State)
-                    lock (component)
-                    {
-                        State.SetModuleState(component, ParserState.Error, e.Cause as SyntaxErrorException);
-                    }
+                State.SetModuleState(component, ParserState.Error, e.Cause as SyntaxErrorException);
             };
             parser.ParseCompleted += (sender, e) =>
             {
@@ -587,11 +567,8 @@ private void ParseAsyncInternal(VBComponent component, CancellationToken token,
                         State.SetModuleState(component, ParserState.Parsed);
                     }
             };
-            lock (State)
-                lock (component)
-                {
-                    State.SetModuleState(component, ParserState.Parsing);
-                }
+            State.SetModuleState(component, ParserState.Parsing);
+                
             parser.Start(token);
         }
 
@@ -611,10 +588,7 @@ private void ResolveDeclarations(VBComponent component, IParseTree tree)
                 {
                     projectDeclaration = CreateProjectDeclaration(projectQualifiedName, project);
                     _projectDeclarations.AddOrUpdate(projectQualifiedName.ProjectId, projectDeclaration, (s, c) => projectDeclaration);
-                    lock (State)
-                    {
-                        State.AddDeclaration(projectDeclaration);
-                    }
+                    State.AddDeclaration(projectDeclaration);
                 }
                 Logger.Debug("Creating declarations for module {0}.", qualifiedModuleName.Name);
                 var declarationsListener = new DeclarationSymbolsListener(State, qualifiedModuleName, component.Type, State.GetModuleAnnotations(component), State.GetModuleAttributes(component), projectDeclaration);
@@ -627,10 +601,7 @@ private void ResolveDeclarations(VBComponent component, IParseTree tree)
             catch (Exception exception)
             {
                 Logger.Error(exception, "Exception thrown acquiring declarations for '{0}' (thread {1}).", component.Name, Thread.CurrentThread.ManagedThreadId);
-                lock (State)
-                {
-                    State.SetModuleState(component, ParserState.ResolverError);
-                }
+                State.SetModuleState(component, ParserState.ResolverError);
             }
         }