Merge pull request #1760 from Hosch250/ParserIssues

Parser issues

Author: retailcoder

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -28,7 +28,7 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _folderHelper = folderHelper;
             _state = state;
             _state.StateChanged += ParserState_StateChanged;
-            
+
             _refreshCommand = new DelegateCommand(param => _state.OnParseRequested(this),
                 param => !IsBusy && _state.IsDirty());
 
@@ -188,38 +188,38 @@ public string PanelTitle
 
                 if (SelectedItem is CodeExplorerProjectViewModel)
                 {
-                    var node = (CodeExplorerProjectViewModel) SelectedItem;
+                    var node = (CodeExplorerProjectViewModel)SelectedItem;
                     return node.Declaration.IdentifierName + string.Format(" - ({0})", node.Declaration.DeclarationType);
                 }
 
                 if (SelectedItem is CodeExplorerComponentViewModel)
                 {
-                    var node = (CodeExplorerComponentViewModel) SelectedItem;
+                    var node = (CodeExplorerComponentViewModel)SelectedItem;
                     return node.Declaration.IdentifierName + string.Format(" - ({0})", node.Declaration.DeclarationType);
                 }
 
                 if (SelectedItem is CodeExplorerMemberViewModel)
                 {
-                    var node = (CodeExplorerMemberViewModel) SelectedItem;
+                    var node = (CodeExplorerMemberViewModel)SelectedItem;
                     return node.Declaration.IdentifierName + string.Format(" - ({0})", node.Declaration.DeclarationType);
                 }
 
                 return SelectedItem.Name;
             }
         }
-        
+
         public string Description
         {
             get
             {
                 if (SelectedItem is ICodeExplorerDeclarationViewModel)
                 {
-                    return ((ICodeExplorerDeclarationViewModel) SelectedItem).Declaration.DescriptionString;
+                    return ((ICodeExplorerDeclarationViewModel)SelectedItem).Declaration.DescriptionString;
                 }
 
                 if (SelectedItem is CodeExplorerCustomFolderViewModel)
                 {
-                    return ((CodeExplorerCustomFolderViewModel) SelectedItem).FolderAttribute;
+                    return ((CodeExplorerCustomFolderViewModel)SelectedItem).FolderAttribute;
                 }
 
                 return string.Empty;
@@ -237,7 +237,7 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
             set
             {
                 _projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));
-                
+
                 ReorderChildNodes(_projects);
                 OnPropertyChanged();
             }
@@ -250,12 +250,12 @@ private void ParserState_StateChanged(object sender, EventArgs e)
                 Projects = new ObservableCollection<CodeExplorerItemViewModel>();
             }
 
-            IsBusy = _state.Status == ParserState.Parsing;
-            if (_state.Status != ParserState.Ready)
+            IsBusy = _state.Status < ParserState.ResolvedDeclarations;
+            if (_state.Status != ParserState.ResolvedDeclarations)
             {
                 return;
             }
-            
+
             var userDeclarations = _state.AllUserDeclarations
                 .GroupBy(declaration => declaration.Project)
                 .Where(grouping => grouping.Key != null)
@@ -273,7 +273,7 @@ private void ParserState_StateChanged(object sender, EventArgs e)
                     grouping)).ToList();
 
             UpdateNodes(Projects, newProjects);
-            
+
             Projects = new ObservableCollection<CodeExplorerItemViewModel>(newProjects);
         }
 
@@ -403,7 +403,7 @@ private void SetErrorState(CodeExplorerItemViewModel itemNode, VBComponent compo
 
                 if (node is CodeExplorerComponentViewModel)
                 {
-                    var componentNode = (CodeExplorerComponentViewModel) node;
+                    var componentNode = (CodeExplorerComponentViewModel)node;
                     if (componentNode.GetSelectedDeclaration().QualifiedName.QualifiedModuleName.Component == component)
                     {
                         componentNode.IsErrorState = true;
@@ -472,8 +472,8 @@ private void SetErrorState(CodeExplorerItemViewModel itemNode, VBComponent compo
         // this is a special case--we have to reset SelectedItem to prevent a crash
         private void ExecuteRemoveComand(object param)
         {
-            var node = (CodeExplorerComponentViewModel) SelectedItem;
-            SelectedItem = Projects.First(p => ((CodeExplorerProjectViewModel) p).Declaration.Project == node.Declaration.Project);
+            var node = (CodeExplorerComponentViewModel)SelectedItem;
+            SelectedItem = Projects.First(p => ((CodeExplorerProjectViewModel)p).Declaration.Project == node.Declaration.Project);
 
             _externalRemoveCommand.Execute(param);
         }

RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs

@@ -94,7 +94,11 @@ private void SetSelectionText(QualifiedSelection selection)
         private void State_StateChanged(object sender, EventArgs e)
         {
             _logger.Debug("RubberduckCommandBar handles StateChanged...");
-            SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
+            
+            if (_state.Status != ParserState.ResolvedDeclarations)
+            {
+                SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
+            }
         }
 
         public event EventHandler Refresh;

RetailCoder.VBE/UI/UnitTesting/TestExplorerModel.cs

@@ -26,18 +26,17 @@ public TestExplorerModel(VBE vbe, RubberduckParserState state)
 
         private void State_StateChanged(object sender, ParserStateEventArgs e)
         {
-            if (e.State != ParserState.Ready) { return; }
-
-            var tests = UnitTestHelpers.GetAllTests(_vbe, _state).ToList();
-
-            var removedTests = Tests.Where(test =>
-                         !tests.Any(t =>
-                                 t.Declaration.ComponentName == test.Declaration.ComponentName &&
-                                 t.Declaration.IdentifierName == test.Declaration.IdentifierName &&
-                                 t.Declaration.ProjectId == test.Declaration.ProjectId)).ToList();
+            if (e.State != ParserState.ResolvedDeclarations) { return; }
 
             _dispatcher.Invoke(() =>
             {
+                var tests = UnitTestHelpers.GetAllTests(_vbe, _state).ToList();
+
+                var removedTests = Tests.Where(test =>
+                             !tests.Any(t =>
+                                     t.Declaration.ComponentName == test.Declaration.ComponentName &&
+                                     t.Declaration.IdentifierName == test.Declaration.IdentifierName &&
+                                     t.Declaration.ProjectId == test.Declaration.ProjectId)).ToList();
 
                 // remove old tests
                 foreach (var test in removedTests)

Rubberduck.Parsing/VBA/ParserState.cs

@@ -24,6 +24,10 @@ public enum ParserState
         /// </summary>
         Resolving,
         /// <summary>
+        /// Resolving identifier references.
+        /// </summary>
+        ResolvedDeclarations,
+        /// <summary>
         /// Parser state is in sync with the actual code in the VBE.
         /// </summary>
         Ready,

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -143,11 +143,11 @@ private void ParseAll()
 
             if (!toParse.Any())
             {
-                State.SetStatusAndFireStateChanged(ParserState.Ready);
+                State.SetStatusAndFireStateChanged(_state.Status);
                 return;
             }
 
-
+            
             lock (_state)  // note, method is invoked from UI thread... really need the lock here?
             {
                 foreach (var component in toParse)
@@ -496,6 +496,8 @@ private void ResolveInternal(CancellationToken token)
                 ResolveDeclarations(qualifiedName.Component, kvp.Value);
             }
 
+            _state.SetStatusAndFireStateChanged(ParserState.ResolvedDeclarations);
+
             // walk all parse trees (modified or not) for identifier references
             var finder = new DeclarationFinder(_state.AllDeclarations, _state.AllComments, _state.AllAnnotations);
             var passes = new List<ICompilationPass>