Merge pull request #3797 from MDoerner/AddTwoNewStatus

Adds 'Started' and 'UnexpectedError' parser states.

Author: retailcoder

RetailCoder.VBE/UI/Command/ReparseCommand.cs

@@ -38,7 +38,8 @@ protected override bool EvaluateCanExecute(object parameter)
             return _state.Status == ParserState.Pending
                    || _state.Status == ParserState.Ready
                    || _state.Status == ParserState.Error
-                   || _state.Status == ParserState.ResolverError;
+                   || _state.Status == ParserState.ResolverError
+                   || _state.Status == ParserState.UnexpectedError;
         }
 
         protected override void OnExecute(object parameter)

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -1728,4 +1728,10 @@ Möchten sie die Einstellungen in Rubberduck importieren?</value>
   <data name="CodeMetrics_Nesting" xml:space="preserve">
     <value>Maximale Einrückung</value>
   </data>
+  <data name="ParserState_Started" xml:space="preserve">
+    <value>Gestartet</value>
+  </data>
+  <data name="ParserState_UnexpectedError" xml:space="preserve">
+    <value>Unerwarteter Fehler</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.de.resx

@@ -1789,4 +1789,10 @@ Would you like to import them to Rubberduck?</value>
   <data name="GeneralSettings_CompileBeforeParse" xml:space="preserve">
     <value>Compile code before parsing</value>
   </data>
+  <data name="ParserState_Started" xml:space="preserve">
+    <value>Started</value>
+  </data>
+  <data name="ParserState_UnexpectedError" xml:space="preserve">
+    <value>Unexpected Error</value>
+  </data>
 </root>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -165,7 +165,7 @@ private void ExecuteCommonParseActivities(IReadOnlyCollection<QualifiedModuleNam
             toReresolveReferences.UnionWith(toReresolveReferencesInput);
             token.ThrowIfCancellationRequested();
 
-            _parserStateManager.SetModuleStates(toParse, ParserState.Pending, token);
+            _parserStateManager.SetModuleStates(toParse, ParserState.Started, token);
             token.ThrowIfCancellationRequested();
 
             _parserStateManager.SetStatusAndFireStateChanged(this, ParserState.LoadingReference, token);
@@ -320,9 +320,9 @@ private void ParseAll(object requestor, CancellationToken token)
             catch (Exception exception)
             {
                 Logger.Error(exception, "Unexpected exception thrown in parsing run. (thread {0}).", Thread.CurrentThread.ManagedThreadId);
-                if (!(_parserStateManager.OverallParserState >= ParserState.Error))
+                if (_parserStateManager.OverallParserState != ParserState.UnexpectedError)
                 {
-                    _parserStateManager.SetStatusAndFireStateChanged(this, ParserState.Error, token);
+                    _parserStateManager.SetStatusAndFireStateChanged(this, ParserState.UnexpectedError, token);
                 }
             }
             finally
@@ -337,7 +337,7 @@ private void ParseAllInternal(object requestor, CancellationToken token)
         {
             token.ThrowIfCancellationRequested();
 
-            _parserStateManager.SetStatusAndFireStateChanged(requestor, ParserState.Pending, token);
+            _parserStateManager.SetStatusAndFireStateChanged(requestor, ParserState.Started, token);
             token.ThrowIfCancellationRequested();
 
             _projectManager.RefreshProjects();

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -4,10 +4,14 @@ namespace Rubberduck.Parsing.VBA
     public enum ParserState
     {
         /// <summary>
-        /// Parse was requested but hasn't started yet.
+        /// Parse has not been requested or has not started yet.
         /// </summary>
         Pending,
         /// <summary>
+        /// Parse has started and is in the coordination phase.
+        /// </summary>
+        Started,
+        /// <summary>
         /// Project references are being loaded into parser state.
         /// </summary>
         LoadingReference,
@@ -44,6 +48,10 @@ public enum ParserState
         /// </summary>
         ResolverError,
         /// <summary>
+        /// Unexpected exception has been encountered during a parse.
+        /// </summary>
+        UnexpectedError,
+        /// <summary>
         /// This component doesn't need a state.  Use for built-in declarations.
         /// </summary>
         None,

Rubberduck.Parsing/VBA/ParserState.cs

@@ -402,6 +402,10 @@ private ParserState OverallParserStateFromModuleStates()
             }
 
             // error state takes precedence over every other state
+            if (stateCounts[(int)ParserState.UnexpectedError] > 0)
+            {
+                return ParserState.UnexpectedError;
+            }
             if (stateCounts[(int)ParserState.Error] > 0)
             {
                 return ParserState.Error;