Merge pull request #1986 from Hosch250/cacheBugs

Fix 101 bugs in various parts of the project.

Author: retailcoder

RetailCoder.VBE/API/ParserState.cs

@@ -68,7 +68,7 @@ public void Initialize(VBE vbe)
 
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
-            _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
+            _parser = new RubberduckParser(_state, _attributeParser, preprocessorFactory,
                 new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state) });
         }
 

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows.Input;
 using Microsoft.Vbe.Interop;
 using NLog;
 using Rubberduck.Navigation.Folders;
@@ -87,17 +86,6 @@ public CodeExplorerItemViewModel SelectedItem
                 _selectedItem = value;
                 OnPropertyChanged();
 
-                if (_selectedItem is CodeExplorerProjectViewModel)
-                {
-                    var vbe = _selectedItem.GetSelectedDeclaration().Project.VBE;
-                    var project = vbe.VBProjects.Cast<VBProject>().FirstOrDefault(f => f.HelpFile == _selectedItem.GetSelectedDeclaration().Project.HelpFile);
-
-                    if (project != null)
-                    {
-                        vbe.ActiveVBProject = project;
-                    }
-                }
-
                 // ReSharper disable ExplicitCallerInfoArgument
                 OnPropertyChanged("CanExecuteIndenterCommand");
                 OnPropertyChanged("CanExecuteRenameCommand");

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -10,7 +10,6 @@
 using Rubberduck.VBEditor;
 using Rubberduck.Parsing.Preprocessing;
 using System.Diagnostics;
-using Rubberduck.VBEditor.Extensions;
 using System.IO;
 using NLog;
 // ReSharper disable LoopCanBeConvertedToQuery
@@ -26,22 +25,19 @@ public class RubberduckParser : IRubberduckParser
 
         private readonly IDictionary<VBComponent, IDictionary<Tuple<string, DeclarationType>, Attributes>> _componentAttributes
             = new Dictionary<VBComponent, IDictionary<Tuple<string, DeclarationType>, Attributes>>();
-
-        private readonly VBE _vbe;
+        
         private readonly RubberduckParserState _state;
         private readonly IAttributeParser _attributeParser;
         private readonly Func<IVBAPreprocessor> _preprocessorFactory;
         private readonly IEnumerable<ICustomDeclarationLoader> _customDeclarationLoaders;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public RubberduckParser(
-            VBE vbe,
             RubberduckParserState state,
             IAttributeParser attributeParser,
             Func<IVBAPreprocessor> preprocessorFactory,
             IEnumerable<ICustomDeclarationLoader> customDeclarationLoaders)
         {
-            _vbe = vbe;
             _state = state;
             _attributeParser = attributeParser;
             _preprocessorFactory = preprocessorFactory;
@@ -106,13 +102,7 @@ private void ReparseRequested(object sender, ParseRequestEventArgs e)
         /// </summary>
         public void Parse(CancellationTokenSource token)
         {
-            if (State.Projects.Count == 0)
-            {
-                foreach (var project in _vbe.VBProjects.UnprotectedProjects())
-                {
-                    State.AddProject(project.HelpFile);
-                }
-            }
+            State.RefreshProjects();
 
             var components = new List<VBComponent>();
             foreach (var project in State.Projects)
@@ -188,13 +178,7 @@ public void Parse(CancellationTokenSource token)
         /// </summary>
         private void ParseAll(CancellationTokenSource token)
         {
-            if (State.Projects.Count == 0)
-            {
-                foreach (var project in _vbe.VBProjects.UnprotectedProjects())
-                {
-                    State.AddProject(project.HelpFile);
-                }
-            }
+            State.RefreshProjects();
 
             var components = new List<VBComponent>();
             foreach (var project in State.Projects)
@@ -232,7 +216,6 @@ private void ParseAll(CancellationTokenSource token)
             }
 
             var toParse = new List<VBComponent>();
-
             foreach (var component in components)
             {
                 if (State.IsNewOrModified(component))
@@ -310,6 +293,13 @@ private void ParseAll(CancellationTokenSource token)
 
             Task.WaitAll(parseTasks);
 
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+            
+            Debug.Assert(State.ParseTrees.Count == components.Count);
+
             if (State.Status < ParserState.Error)
             {
                 State.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -96,7 +96,7 @@ private void Sinks_ProjectAdded(object sender, IProjectEventArgs e)
 
             Logger.Debug("Project '{0}' was added.", e.ProjectId);
 
-            AddProject(e.ProjectId); // note side-effect: assigns ProjectId/HelpFile
+            RefreshProjects(); // note side-effect: assigns ProjectId/HelpFile
             OnParseRequested(sender);
         }
 
@@ -122,7 +122,7 @@ private void Sinks_ProjectRenamed(object sender, IProjectRenamedEventArgs e)
             Logger.Debug("Project {0} was renamed.", e.ProjectId);
 
             RemoveProject(e.ProjectId);
-            AddProject(e.ProjectId);
+            RefreshProjects();
 
             OnParseRequested(sender);
         }
@@ -189,7 +189,7 @@ private void Sinks_ComponentRenamed(object sender, IComponentRenamedEventArgs e)
                 RemoveProject(e.ProjectId);
                 Logger.Debug("Project '{0}' was removed.", e.ComponentName);
 
-                AddProject(e.ProjectId);
+                RefreshProjects();
             }
             else
             {
@@ -209,49 +209,23 @@ public void OnStatusMessageUpdate(string message)
             }
         }
 
-        public void AddProject(string projectId)
+        /// <summary>
+        /// Refreshes our list of cached projects.
+        /// Be sure to reparse after calling this in case there
+        /// were projects with duplicate ID's to clear the old
+        /// declarations referencing the project by the old ID.
+        /// </summary>
+        public void RefreshProjects()
         {
-            var projects = new List<VBProject>();
-            foreach (VBProject p in _vbe.VBProjects)
+            _projects.Clear();
+            foreach (VBProject project in _vbe.VBProjects)
             {
-                if (p.HelpFile != null && _projects.Keys.Contains(p.HelpFile))
+                if (string.IsNullOrEmpty(project.HelpFile) || _projects.Keys.Contains(project.HelpFile))
                 {
-                    continue;
+                    project.AssignProjectId();
                 }
 
-                projects.Add(p);
-            }
-
-            if (projects.Count == 0)
-            {
-                Logger.Debug("Project was not found and will not be added to parser state.");
-                return;
-            }
-
-            foreach (var project in projects)
-            {
-                if (project.Protection == vbext_ProjectProtection.vbext_pp_locked)
-                {
-                    // adding protected project to parser state is asking for COMExceptions..
-                    Logger.Debug("Project is protected and will not be added to parser state.");
-                    return;
-                }
-
-                if (string.IsNullOrEmpty(project.HelpFile))
-                {
-                    // assigns the help file and returns the value to reduce COM calls
-                    projectId = project.AssignProjectId();
-                }
-
-                if (!_projects.ContainsKey(projectId))
-                {
-                    _projects.Add(projectId, project);
-                }
-
-                foreach (VBComponent component in project.VBComponents)
-                {
-                    _moduleStates.TryAdd(new QualifiedModuleName(component), new ModuleState(ParserState.Pending));
-                }
+                _projects.Add(project.HelpFile, project);
             }
         }
 
@@ -723,70 +697,18 @@ public void ClearBuiltInReferences()
                 {
                     continue;
                 }
-
-                var hasReference = false;
+                
                 foreach (var reference in declaration.References)
-                {
-                    hasReference = true;
-                    break;
-                }
-
-                if (hasReference)
                 {
                     declaration.ClearReferences();
+                    break;
                 }
             }
         }
 
         public bool ClearStateCache(VBComponent component, bool notifyStateChanged = false)
         {
-            if (component == null) { return false; }
-
-            var match = new QualifiedModuleName(component);
-
-            var keys = new List<QualifiedModuleName> { match };
-            foreach (var key in _moduleStates.Keys)
-            {
-                if (key.Equals(match) && !keys.Contains(key))
-                {
-                    keys.Add(key);
-                }
-            }
-
-            var success = RemoveKeysFromCollections(keys);
-
-            var projectId = component.Collection.Parent.HelpFile;
-            var sameProjectDeclarations = new List<KeyValuePair<QualifiedModuleName, ModuleState>>();
-            foreach (var item in _moduleStates)
-            {
-                if (item.Key.ProjectId == projectId)
-                {
-                    sameProjectDeclarations.Add(new KeyValuePair<QualifiedModuleName, ModuleState>(item.Key, item.Value));
-                }
-            }
-
-            var projectCount = 0;
-            foreach (var item in sameProjectDeclarations)
-            {
-                if (item.Value.Declarations == null) { continue; }
-
-                foreach (var declaration in item.Value.Declarations)
-                {
-                    if (declaration.Key.DeclarationType == DeclarationType.Project)
-                    {
-                        projectCount++;
-                        break;
-                    }
-                }
-            }
-
-            if (notifyStateChanged)
-            {
-                OnStateChanged(ParserState.ResolvedDeclarations);   // trigger test explorer and code explorer updates
-                OnStateChanged(ParserState.Ready);   // trigger find all references &c. updates
-            }
-
-            return success;
+            return component != null && ClearStateCache(new QualifiedModuleName(component), notifyStateChanged);
         }
 
         public bool ClearStateCache(QualifiedModuleName component, bool notifyStateChanged = false)
@@ -802,31 +724,6 @@ public bool ClearStateCache(QualifiedModuleName component, bool notifyStateChang
 
             var success = RemoveKeysFromCollections(keys);
 
-            var projectId = component.ProjectId;
-            var sameProjectDeclarations = new List<KeyValuePair<QualifiedModuleName, ModuleState>>();
-            foreach (var item in _moduleStates)
-            {
-                if (item.Key.ProjectId == projectId)
-                {
-                    sameProjectDeclarations.Add(new KeyValuePair<QualifiedModuleName, ModuleState>(item.Key, item.Value));
-                }
-            }
-
-            var projectCount = 0;
-            foreach (var item in sameProjectDeclarations)
-            {
-                if (item.Value.Declarations == null) { continue; }
-
-                foreach (var declaration in item.Value.Declarations)
-                {
-                    if (declaration.Key.DeclarationType == DeclarationType.Project)
-                    {
-                        projectCount++;
-                        break;
-                    }
-                }
-            }
-
             if (notifyStateChanged)
             {
                 OnStateChanged(ParserState.ResolvedDeclarations);   // trigger test explorer and code explorer updates
@@ -914,13 +811,19 @@ public bool IsDirty()
         {
             foreach (var project in Projects)
             {
-                foreach (VBComponent component in project.VBComponents)
+                try
                 {
-                    if (IsNewOrModified(component))
+                    foreach (VBComponent component in project.VBComponents)
                     {
-                        return true;
+                        if (IsNewOrModified(component))
+                        {
+                            return true;
+                        }
                     }
                 }
+                catch (COMException)
+                {
+                }
             }
 
             return false;

RubberduckTests/MockParser.cs

@@ -41,7 +41,7 @@ public static RubberduckParser Create(VBE vbe, RubberduckParserState state)
 
         public static RubberduckParser Create(VBE vbe, RubberduckParserState state, IAttributeParser attributeParser)
         {
-            return new RubberduckParser(vbe, state, attributeParser,
+            return new RubberduckParser(state, attributeParser,
                 () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture)),
                 new List<ICustomDeclarationLoader> {new DebugDeclarations(state), new FormEventDeclarations(state)});
         }