Merge pull request #2372 from retailcoder/next

retailcoder · web-flow · commit fa8ac439698f · 2016-11-20T23:13:55.000-05:00
Standardized Reparsing from Code Explorer and Inspection Results toolwindows
diff --git a/RetailCoder.VBE/App.cs b/RetailCoder.VBE/App.cs
@@ -51,7 +51,6 @@ public App(IVBE vbe,
             _configService.SettingsChanged += _configService_SettingsChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _parser.State.StatusMessageUpdate += State_StatusMessageUpdate;
-            _stateBar.Refresh += _stateBar_Refresh;
 
             UiDispatcher.Initialize();
         }
@@ -119,7 +118,7 @@ private void _configService_SettingsChanged(object sender, ConfigurationChangedE
             }
         }
 
-        private void EnsureDirectoriesExist()
+        private static void EnsureLogFolderPathExists()
         {
             try
             {
@@ -141,7 +140,7 @@ private void UpdateLoggingLevel()
 
         public void Startup()
         {
-            EnsureDirectoriesExist();
+            EnsureLogFolderPathExists();
             LoadConfig();
             _appMenus.Initialize();
             _stateBar.Initialize();
@@ -163,13 +162,6 @@ public void Shutdown()
             }
         }
 
-        private void _stateBar_Refresh(object sender, EventArgs e)
-        {
-            // handles "refresh" button click on "Rubberduck" command bar
-            _parser.State.OnParseRequested(sender);
-            _parser.State.StartEventSinks(); // no-op if already started
-        }
-
         private void Parser_StateChanged(object sender, EventArgs e)
         {
             Logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
@@ -221,11 +213,6 @@ public void Dispose()
                 _configService.SettingsChanged -= _configService_SettingsChanged;
             }
 
-            if (_stateBar != null)
-            {
-                _stateBar.Refresh -= _stateBar_Refresh;
-            }
-
             if (_autoSave != null)
             {
                 _autoSave.Dispose();
diff --git a/RetailCoder.VBE/Common/RubberduckHooks.cs b/RetailCoder.VBE/Common/RubberduckHooks.cs
@@ -45,7 +45,7 @@ public RubberduckHooks(IVBE vbe, IGeneralConfigService config, IEnumerable<Comma
 
         private CommandBase Command(RubberduckHotkey hotkey)
         {
-            return _commands.SingleOrDefault(s => s.Hotkey == hotkey);
+            return _commands.FirstOrDefault(s => s.Hotkey == hotkey);
         }
 
         public void HookHotkeys()
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -31,8 +31,12 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _state.StateChanged += ParserState_StateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
-            _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param => _state.OnParseRequested(this),
-                param => !IsBusy && _state.IsDirty());
+            var reparseCommand = commands.OfType<ReparseCommand>().SingleOrDefault();
+
+            _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), 
+                reparseCommand == null ? (Action<object>)(o => { }) :
+                o => reparseCommand.Execute(o),
+                o => !IsBusy && reparseCommand != null && reparseCommand.CanExecute(o));
             
             _navigateCommand = commands.OfType<UI.CodeExplorer.Commands.NavigateCommand>().SingleOrDefault();
 
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -30,7 +30,6 @@
 using Ninject.Extensions.NamedScope;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.UI.CodeExplorer.Commands;
-using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Application;
 using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/AddClassModuleCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/AddClassModuleCommand.cs
@@ -5,7 +5,6 @@
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/AddStdModuleCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/AddStdModuleCommand.cs
@@ -5,7 +5,6 @@
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/AddUserFormCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/AddUserFormCommand.cs
@@ -5,7 +5,6 @@
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/ExportCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/ExportCommand.cs
@@ -7,7 +7,6 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/ImportCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/ImportCommand.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
diff --git a/RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs b/RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs
@@ -16,17 +16,19 @@ public class RubberduckCommandBar : IDisposable
         private readonly RubberduckParserState _state;
         private readonly IVBE _vbe;
         private readonly IShowParserErrorsCommand _command;
+        private readonly ReparseCommand _reparseCommand;
 
         private ICommandBarButton _refreshButton;
         private ICommandBarButton _statusButton;
         private ICommandBarButton _selectionButton;
         private ICommandBar _commandbar;
 
-        public RubberduckCommandBar(RubberduckParserState state, IVBE vbe, IShowParserErrorsCommand command)
+        public RubberduckCommandBar(RubberduckParserState state, IVBE vbe, IShowParserErrorsCommand command, ReparseCommand reparseCommand)
         {
             _state = state;
             _vbe = vbe;
             _command = command;
+            _reparseCommand = reparseCommand;
         }
 
         public void SetSelectionText()
@@ -118,17 +120,6 @@ private void State_StateChanged(object sender, EventArgs e)
             }
         }
 
-        public event EventHandler Refresh;
-
-        private void OnRefresh()
-        {
-            var handler = Refresh;
-            if (handler != null)
-            {
-                handler.Invoke(this, EventArgs.Empty);
-            }
-        }
-
         public void Initialize()
         {
             _commandbar = _vbe.CommandBars.Add("Rubberduck", CommandBarPosition.Top);
@@ -163,7 +154,10 @@ public void Initialize()
 
         private void refreshButton_Click(object sender, CommandBarButtonClickEventArgs e)
         {
-            OnRefresh();
+            if (_reparseCommand.CanExecute(null))
+            {
+                _reparseCommand.Execute(null);
+            }
             e.Cancel = true;
         }
 
diff --git a/RetailCoder.VBE/UI/Command/ReparseCommand.cs b/RetailCoder.VBE/UI/Command/ReparseCommand.cs
@@ -2,6 +2,7 @@
 using NLog;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
+using Rubberduck.UI.CodeExplorer.Commands;
 using Rubberduck.UI.Command.MenuItems;
 
 namespace Rubberduck.UI.Command
@@ -20,6 +21,7 @@ public override string Key
     }
 
     [ComVisible(false)]
+    [CodeExplorerCommand]
     public class ReparseCommand : CommandBase
     {
         private readonly RubberduckParserState _state;
@@ -45,6 +47,7 @@ protected override bool CanExecuteImpl(object parameter)
         protected override void ExecuteImpl(object parameter)
         {
             _state.OnParseRequested(this);
+            _state.StartEventSinks(); // no-op if already started
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs b/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs
@@ -17,31 +17,34 @@
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Controls;
 using Rubberduck.UI.Settings;
-using Rubberduck.VBEditor.Extensions;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Inspections
 {
     public sealed class InspectionResultsViewModel : ViewModelBase, INavigateSelection, IDisposable
     {
         private readonly RubberduckParserState _state;
         private readonly IInspector _inspector;
-        private readonly IVBE _vbe;
         private readonly IClipboardWriter _clipboard;
         private readonly IGeneralConfigService _configService;
         private readonly IOperatingSystem _operatingSystem;
 
-        public InspectionResultsViewModel(RubberduckParserState state, IInspector inspector, IVBE vbe, INavigateCommand navigateCommand, IClipboardWriter clipboard, 
-                                          IGeneralConfigService configService, IOperatingSystem operatingSystem)
+        public InspectionResultsViewModel(RubberduckParserState state, IInspector inspector, 
+            INavigateCommand navigateCommand, ReparseCommand reparseCommand,
+            IClipboardWriter clipboard, IGeneralConfigService configService, IOperatingSystem operatingSystem)
         {
             _state = state;
             _inspector = inspector;
-            _vbe = vbe;
             _navigateCommand = navigateCommand;
             _clipboard = clipboard;
             _configService = configService;
             _operatingSystem = operatingSystem;
-            _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), async param => await Task.Run(() => ExecuteRefreshCommandAsync()), CanExecuteRefreshCommand);
+            _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), 
+                o => {
+                        IsBusy = true;
+                        reparseCommand.Execute(o); 
+                     },
+                o => !IsBusy && reparseCommand.CanExecute(o));
+
             _disableInspectionCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteDisableInspectionCommand);
             _quickFixCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteQuickFixCommand, CanExecuteQuickFixCommand);
             _quickFixInModuleCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteQuickFixInModuleCommand, _ => _state.Status == ParserState.Ready);
@@ -215,19 +218,9 @@ private void OpenSettings(object param)
             }
         }
 
-        private bool _canRefresh = true;
-        public bool CanRefresh
-        {
-            get { return _canRefresh; }
-            private set
-            {
-                _canRefresh = value; 
-                OnPropertyChanged();
-            }
-        }
-
         private bool _canQuickFix;
-                public bool CanQuickFix
+
+        public bool CanQuickFix
         {
             get { return _canQuickFix; }
             set
@@ -240,30 +233,18 @@ public bool CanQuickFix
         private bool _isBusy;
         public bool IsBusy { get { return _isBusy; } set { _isBusy = value; OnPropertyChanged(); } }
 
-        private async void ExecuteRefreshCommandAsync()
+        private bool _runInspectionsOnReparse;
+        private void _state_StateChanged(object sender, EventArgs e)
         {
-            CanRefresh = _vbe.HostApplication() != null;
-            if (!CanRefresh)
+            if (_state.Status == ParserState.Error || _state.Status == ParserState.ResolverError)
             {
+                IsBusy = false;
                 return;
             }
-            await Task.Yield();
-
-            IsBusy = true;
 
-            _state.OnParseRequested(this);
-        }
-
-        private bool CanExecuteRefreshCommand(object parameter)
-        {
-            return !IsBusy;
-        }
-
-        private bool _runInspectionsOnReparse;
-        private void _state_StateChanged(object sender, EventArgs e)
-        {
             if (_state.Status != ParserState.Ready)
             {
+                IsBusy = true;
                 return;
             }
 
@@ -301,7 +282,6 @@ private async void RefreshInspections()
             {
                 Results = new ObservableCollection<ICodeInspectionResult>(results);
 
-                CanRefresh = true;
                 IsBusy = false;
                 SelectedItem = null;
             });
@@ -331,7 +311,7 @@ private void ExecuteQuickFixes(IEnumerable<CodeInspectionQuickFix> quickFixes)
             // refresh if any quickfix has completed without cancelling:
             if (completed != 0 && cancelled < completed)
             {
-                Task.Run(() => ExecuteRefreshCommandAsync());
+                Task.Run(() => _refreshCommand.Execute(null));
             }
         }
 
@@ -400,7 +380,7 @@ private void ExecuteDisableInspectionCommand(object parameter)
             var setting = config.UserSettings.CodeInspectionSettings.CodeInspections.Single(e => e.Name == _selectedInspection.Name);
             setting.Severity = CodeInspectionSeverity.DoNotShow;
 
-            Task.Run(() => _configService.SaveConfiguration(config)).ContinueWith(t => ExecuteRefreshCommandAsync());
+            Task.Run(() => _configService.SaveConfiguration(config)).ContinueWith(t => _refreshCommand.Execute(null));
         }
 
         private bool _canDisableInspection;
diff --git a/Rubberduck.Parsing/VBA/RubberduckParser.cs b/Rubberduck.Parsing/VBA/RubberduckParser.cs
@@ -393,6 +393,13 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                     for (var priority = 1; priority <= references.Count; priority++)
                     {
                         var reference = references[priority];
+
+                        // skip loading Rubberduck.tlb (GUID is defined in AssemblyInfo.cs)
+                        if (reference.Guid == "{E07C841C-14B4-4890-83E9-8C80B06DD59D}")
+                        {
+                            // todo: figure out why Rubberduck.tlb can't be loaded that way
+                            continue;
+                        }
                         var referencedProjectId = GetReferenceProjectId(reference, projects);
 
                         ReferencePriorityMap map = null;
@@ -423,12 +430,20 @@ private void SyncComReferences(IReadOnlyList<IVBProject> projects)
                             loadTasks.Add(
                                 Task.Run(() =>
                                 {
-                                    var comReflector = new ReferencedDeclarationsCollector(State);
-                                    var items = comReflector.GetDeclarationsForReference(localReference);
+                                    try
+                                    {
+                                        var comReflector = new ReferencedDeclarationsCollector(State);
+                                        var items = comReflector.GetDeclarationsForReference(localReference);
 
-                                    foreach (var declaration in items)
+                                        foreach (var declaration in items)
+                                        {
+                                            State.AddDeclaration(declaration);
+                                        }
+                                    }
+                                    catch (Exception exception)
                                     {
-                                        State.AddDeclaration(declaration);
+                                        Logger.Warn(string.Format("Types were not loaded from referenced type library '{0}'.", reference.Name));
+                                        Logger.Error(exception);
                                     }
                                 }));
                             map.IsLoaded = true;

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ public App(IVBE vbe,`
`51`	`51`	`_configService.SettingsChanged += _configService_SettingsChanged;`
`52`	`52`	`_parser.State.StateChanged += Parser_StateChanged;`
`53`	`53`	`_parser.State.StatusMessageUpdate += State_StatusMessageUpdate;`
`54`		`- _stateBar.Refresh += _stateBar_Refresh;`
`55`	`54`
`56`	`55`	`UiDispatcher.Initialize();`
`57`	`56`	`}`
`@@ -119,7 +118,7 @@ private void _configService_SettingsChanged(object sender, ConfigurationChangedE`
`119`	`118`	`}`
`120`	`119`	`}`
`121`	`120`
`122`		`- private void EnsureDirectoriesExist()`
	`121`	`+ private static void EnsureLogFolderPathExists()`
`123`	`122`	`{`
`124`	`123`	`try`
`125`	`124`	`{`
`@@ -141,7 +140,7 @@ private void UpdateLoggingLevel()`
`141`	`140`
`142`	`141`	`public void Startup()`
`143`	`142`	`{`
`144`		`- EnsureDirectoriesExist();`
	`143`	`+ EnsureLogFolderPathExists();`
`145`	`144`	`LoadConfig();`
`146`	`145`	`_appMenus.Initialize();`
`147`	`146`	`_stateBar.Initialize();`
`@@ -163,13 +162,6 @@ public void Shutdown()`
`163`	`162`	`}`
`164`	`163`	`}`
`165`	`164`
`166`		`- private void _stateBar_Refresh(object sender, EventArgs e)`
`167`		`- {`
`168`		`- // handles "refresh" button click on "Rubberduck" command bar`
`169`		`- _parser.State.OnParseRequested(sender);`
`170`		`- _parser.State.StartEventSinks(); // no-op if already started`
`171`		`- }`
`172`		`-`
`173`	`165`	`private void Parser_StateChanged(object sender, EventArgs e)`
`174`	`166`	`{`
`175`	`167`	`Logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);`
`@@ -221,11 +213,6 @@ public void Dispose()`
`221`	`213`	`_configService.SettingsChanged -= _configService_SettingsChanged;`
`222`	`214`	`}`
`223`	`215`
`224`		`- if (_stateBar != null)`
`225`		`- {`
`226`		`- _stateBar.Refresh -= _stateBar_Refresh;`
`227`		`- }`
`228`		`-`
`229`	`216`	`if (_autoSave != null)`
`230`	`217`	`{`
`231`	`218`	`_autoSave.Dispose();`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public RubberduckHooks(IVBE vbe, IGeneralConfigService config, IEnumerable<Comma`
`45`	`45`
`46`	`46`	`private CommandBase Command(RubberduckHotkey hotkey)`
`47`	`47`	`{`
`48`		`- return _commands.SingleOrDefault(s => s.Hotkey == hotkey);`
	`48`	`+ return _commands.FirstOrDefault(s => s.Hotkey == hotkey);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public void HookHotkeys()`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using Rubberduck.UI.Command;`
`6`	`6`	`using Rubberduck.VBEditor.SafeComWrappers;`
`7`	`7`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`8`		`-using Rubberduck.VBEditor.SafeComWrappers.VBA;`
`9`	`8`
`10`	`9`	`namespace Rubberduck.UI.CodeExplorer.Commands`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using Rubberduck.Navigation.CodeExplorer;`
`8`	`8`	`using Rubberduck.UI.Command;`
`9`	`9`	`using Rubberduck.VBEditor.SafeComWrappers;`
`10`		`-using Rubberduck.VBEditor.SafeComWrappers.VBA;`
`11`	`10`
`12`	`11`	`namespace Rubberduck.UI.CodeExplorer.Commands`
`13`	`12`	`{`