Merge remote-tracking branch 'upstream/next' into rkapka-master

Author: rkapka

RetailCoder.VBE/Root/EnumerableCounterInterceptor.cs

@@ -294,8 +294,12 @@ private void ApplyAbstractFactoryConvention(IEnumerable<Assembly> assemblies)
         private void BindCodeInspectionTypes(IEnumerable<Assembly> assemblies)
         {
             var inspections = assemblies
-                .SelectMany(a => a.GetTypes().Where(type => type.IsClass && !type.IsAbstract && type.GetInterfaces().Contains(typeof(IInspection))))
-                .ToList();
+                .SelectMany(a => a.GetTypes()
+                    .Where(type => type.IsClass 
+                        && !type.IsAbstract 
+                        && type.GetInterfaces().Contains(typeof(IInspection))
+                    )
+                );
 
             // multibinding for IEnumerable<IInspection> dependency
             foreach(var inspection in inspections)
@@ -308,17 +312,12 @@ private void BindCodeInspectionTypes(IEnumerable<Assembly> assemblies)
                         .InCallScope()
                         .Named(inspection.FullName);
 
-                    binding.Intercept().With<TimedCallLoggerInterceptor>();
-                    binding.Intercept().With<EnumerableCounterInterceptor<IInspectionResult>>();
-
                     var localInspection = inspection;
                     Bind<IInspection>().ToMethod(c => (IInspection)c.Kernel.Get(iParseTreeInspection, localInspection.FullName));
                 }
                 else
                 {
                     var binding = Bind<IInspection>().To(inspection).InCallScope();
-                    binding.Intercept().With<TimedCallLoggerInterceptor>();
-                    binding.Intercept().With<EnumerableCounterInterceptor<IInspectionResult>>();
                 }
             }
         }
@@ -509,6 +508,7 @@ private IEnumerable<IMenuItem> GetRubberduckMenuItems()
         {
             return new[]
             {
+                KernelInstance.Get<RefreshCommandMenuItem>(),
                 KernelInstance.Get<AboutCommandMenuItem>(),
                 KernelInstance.Get<SettingsCommandMenuItem>(),
                 KernelInstance.Get<InspectionResultsCommandMenuItem>(),

RetailCoder.VBE/Root/InterceptedException.cs

@@ -373,10 +373,6 @@
     <Compile Include="Refactorings\ExtractMethod\IExtractMethodProc.cs" />
     <Compile Include="Refactorings\ExtractMethod\IExtractMethodRule.cs" />
     <Compile Include="Refactorings\ExtractMethod\IExtractMethodSelectionValidation.cs" />
-    <Compile Include="Root\EnumerableCounterInterceptor.cs" />
-    <Compile Include="Root\InterceptedException.cs" />
-    <Compile Include="Root\InterceptorBase.cs" />
-    <Compile Include="Root\TimedCallLoggerInterceptor.cs" />
     <Compile Include="RubberduckGuid.cs" />
     <Compile Include="RubberduckProgId.cs" />
     <Compile Include="Settings\CodeInspectionConfigProvider.cs" />
@@ -426,9 +422,11 @@
     <Compile Include="UI\Command\FormDesignerFindAllReferencesCommand.cs" />
     <Compile Include="UI\Command\IndentCurrentProjectCommand.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\ContextDescriptionLabelMenuItem.cs" />
+    <Compile Include="UI\Command\MenuItems\RefreshCommandMenuItem.cs" />
     <Compile Include="UI\Command\MenuItems\FormDesignerFindAllReferencesCommandMenuItem.cs" />
     <Compile Include="UI\Command\MenuItems\IndentCurrentProjectCommandMenuItem.cs" />
     <Compile Include="UI\Command\MenuItems\ExportAllCommandMenuItem.cs" />
+    <Compile Include="UI\Command\RefreshCommand .cs" />
     <Compile Include="UI\Controls\EmptyUIRefresh.xaml.cs">
       <DependentUpon>EmptyUIRefresh.xaml</DependentUpon>
     </Compile>

RetailCoder.VBE/Root/InterceptorBase.cs

@@ -15,7 +15,7 @@ public FormDesignerRefactorRenameCommandMenuItem(CommandBase command)
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return state.Status == ParserState.Ready && Command.CanExecute(null);
+            return state != null && state.Status == ParserState.Ready && Command.CanExecute(null);
         }
     }
 }

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -124,7 +124,16 @@ public void EvaluateCanExecute(RubberduckParserState state)
                 var commandItem = kvp.Key as ICommandMenuItem;
                 if (commandItem != null && kvp.Value != null)
                 {
-                     kvp.Value.IsEnabled = commandItem.EvaluateCanExecute(state);
+                    try
+                    {
+                        kvp.Value.IsEnabled = commandItem.EvaluateCanExecute(state);
+                    }
+                    catch (Exception exception)
+                    {
+                        kvp.Value.IsEnabled = false;
+                        Logger.Error(exception, "Could not evaluate availability of commmand menu item {0}.", kvp.Value.Tag ?? "{Unknown}");
+                    }
+                     
                 }
             }
         }

RetailCoder.VBE/Root/TimedCallLoggerInterceptor.cs

@@ -12,6 +12,7 @@ public RubberduckParentMenu(IEnumerable<IMenuItem> items, int beforeIndex)
 
     public enum RubberduckMenuItemDisplayOrder
     {
+        Refresh,
         UnitTesting,
         Refactorings,
         Navigate,

RetailCoder.VBE/Rubberduck.csproj

@@ -0,0 +1,13 @@
+using Rubberduck.UI.Command.MenuItems.ParentMenus;
+
+namespace Rubberduck.UI.Command.MenuItems
+{
+    public class RefreshCommandMenuItem : CommandMenuItemBase
+    {
+        public RefreshCommandMenuItem(CommandBase command) : base(command)
+        {
+        }
+        public override string Key => "RubberduckMenu_Refresh";
+        public override int DisplayOrder => (int)RubberduckMenuItemDisplayOrder.Refresh;
+    }
+}