Merge pull request #1356 from retailcoder/next

ParserState and RubberduckCommandBar fixes

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -69,6 +69,7 @@ public App(VBE vbe, IMessageBox messageBox,
             _configService.SettingsChanged += _configService_SettingsChanged;
             _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
+            _parser.State.StatusMessageUpdate += State_StatusMessageUpdate;
             _stateBar.Refresh += _stateBar_Refresh;
 
             var sink = new VBProjectsEventsSink();
@@ -93,6 +94,18 @@ public App(VBE vbe, IMessageBox messageBox,
             UiDispatcher.Initialize();
         }
 
+        private void State_StatusMessageUpdate(object sender, RubberduckStatusMessageEventArgs e)
+        {
+            var message = e.Message;
+            if (message == ParserState.LoadingReference.ToString())
+            {
+                // note: ugly hack to enable Rubberduck.Parsing assembly to do this
+                message = RubberduckUI.ParserState_LoadingReference;
+            }
+
+            _stateBar.SetStatusText(message);
+        }
+
         private void _hooks_MessageReceived(object sender, HookEventArgs e)
         {
             var hookType = sender.GetType();

RetailCoder.VBE/Inspections/Inspector.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
+using Rubberduck.UI;
 
 namespace Rubberduck.Inspections
 {
@@ -54,6 +55,7 @@ public async Task<IList<ICodeInspectionResult>> FindIssuesAsync(RubberduckParser
 
                 await Task.Yield();
 
+                state.OnStatusMessageUpdate(RubberduckUI.CodeInspections_Inspecting);
                 UpdateInspectionSeverity();
                 //OnReset();
 
@@ -84,6 +86,7 @@ public async Task<IList<ICodeInspectionResult>> FindIssuesAsync(RubberduckParser
                 }
 
                 Task.WaitAll(inspections);
+                state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status)); // should be "Ready"
 
                 return allIssues.ToList();
             }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -385,11 +385,13 @@ public virtual bool IsArray()
             var rParenMethod = Context.GetType().GetMethod("RPAREN");
             if (rParenMethod == null)
             {
-                return false;
+                _isArray = false;
+                return _isArray.Value;
             }
 
             var declaration = (dynamic)Context;
-            return declaration.LPAREN() != null && declaration.RPAREN() != null;
+            _isArray = declaration.LPAREN() != null && declaration.RPAREN() != null;
+            return _isArray.Value;
         }
 
         private bool? _isTypeSpecified;
@@ -425,15 +427,18 @@ public virtual bool IsTypeSpecified()
             var method = Context.GetType().GetMethod("asTypeClause");
             if (method == null)
             {
+                _isTypeSpecified = false;
                 return false;
             }
 
             if (HasTypeHint())
             {
+                _isTypeSpecified = false;
                 return true;
             }
 
-            return ((dynamic)Context).asTypeClause() is VBAParser.AsTypeClauseContext;
+            _isTypeSpecified = ((dynamic)Context).asTypeClause() is VBAParser.AsTypeClauseContext;
+            return _isTypeSpecified.Value;
         }
 
         private bool? _hasTypeHint;
@@ -471,19 +476,22 @@ public bool HasTypeHint(out string token)
             if (Context == null || _neverHinted.Any(item => DeclarationType.HasFlag(item)))
             {
                 token = null;
-                return false;
+                _hasTypeHint = false;
+                return _hasTypeHint.Value;
             }
 
             try
             {
                 var hint = ((dynamic) Context).typeHint();
                 token = hint == null ? null : hint.GetText();
-                return hint != null;
+                _hasTypeHint = hint != null;
+                return _hasTypeHint.Value;
             }
             catch (RuntimeBinderException)
             {
                 token = null;
-                return false;
+                _hasTypeHint = false;
+                return _hasTypeHint.Value;
             }
         }
 

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -100,8 +100,6 @@ public void Parse()
                 .ToList();
 
             var components = projects.SelectMany(p => p.VBComponents.Cast<VBComponent>()).ToList();
-            _state.SetModuleState(ParserState.LoadingReference);
-
             SyncComReferences(projects);
 
             foreach (var component in components)
@@ -137,7 +135,6 @@ private void ParseAll()
             var modified = components.Where(_state.IsModified).ToList();
             var unchanged = components.Where(c => !_state.IsModified(c)).ToList();
 
-            _state.SetModuleState(ParserState.LoadingReference); // todo: change that to a simple statusbar text update
             SyncComReferences(projects);
 
             if (!modified.Any())
@@ -190,6 +187,7 @@ private void SyncComReferences(IReadOnlyList<VBProject> projects)
 
                     if (!map.IsLoaded)
                     {
+                        _state.OnStatusMessageUpdate(ParserState.LoadingReference.ToString());
                         var items = _comReflector.GetDeclarationsForReference(reference).ToList();
                         foreach (var declaration in items)
                         {

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -42,10 +42,20 @@ public ParseRequestEventArgs(VBComponent component)
         public bool IsFullReparseRequest { get { return _component == null; } }
     }
 
-    public sealed class RubberduckParserState
+    public class RubberduckStatusMessageEventArgs : EventArgs
     {
-        public event EventHandler<ParseRequestEventArgs> ParseRequest;
+        private readonly string _message;
+
+        public RubberduckStatusMessageEventArgs(string message)
+        {
+            _message = message;
+        }
 
+        public string Message { get { return _message; } }
+    }
+
+    public sealed class RubberduckParserState
+    {
         // circumvents VBIDE API's tendency to return a new instance at every parse, which breaks reference equality checks everywhere
         private readonly IDictionary<string,Func<VBProject>> _projects = new Dictionary<string,Func<VBProject>>();
 
@@ -76,6 +86,19 @@ public sealed class RubberduckParserState
         private readonly ConcurrentDictionary<QualifiedModuleName, IDictionary<Tuple<string, DeclarationType>, Attributes>> _moduleAttributes =
             new ConcurrentDictionary<QualifiedModuleName, IDictionary<Tuple<string, DeclarationType>, Attributes>>();
 
+        public event EventHandler<ParseRequestEventArgs> ParseRequest;
+        public event EventHandler<RubberduckStatusMessageEventArgs> StatusMessageUpdate;
+
+        public void OnStatusMessageUpdate(string message)
+        {
+            var handler = StatusMessageUpdate;
+            if (handler != null)
+            {
+                var args=  new RubberduckStatusMessageEventArgs(message);
+                handler.Invoke(this, args);
+            }
+        }
+
         public void AddProject(VBProject project)
         {
             if (string.IsNullOrEmpty(project.HelpFile))