Merge pull request #3435 from Vogel612/typecrutch

Removes IInspection interceptors, mechanics replaced with templated method.

Author: retailcoder

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>>();
                 }
             }
         }

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" />

RetailCoder.VBE/Root/InterceptorBase.cs

@@ -8,12 +8,16 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
+using System.Diagnostics;
+using NLog;
 
 namespace Rubberduck.Inspections.Abstract
 {
     public abstract class InspectionBase : IInspection
     {
         protected readonly RubberduckParserState State;
+
+        private readonly ILogger _logger = LogManager.GetCurrentClassLogger();
         private readonly CodeInspectionSeverity _defaultSeverity;
 
         protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity defaultSeverity = CodeInspectionSeverity.Warning)
@@ -24,11 +28,6 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
             Name = GetType().Name;
         }
 
-        /// <summary>
-        /// Gets the type of the inspection class. GetType() returns an interceptor proxy type.
-        /// </summary>
-        public abstract Type Type { get; }
-
         /// <summary>
         /// Gets a value the severity level to reset to, the "factory default" setting.
         /// </summary>
@@ -44,12 +43,6 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
         /// </summary>
         public abstract CodeInspectionType InspectionType { get; }
 
-        /// <summary>
-        /// A method that inspects the parser state and returns all issues it can find.
-        /// </summary>
-        /// <returns></returns>
-        public abstract IEnumerable<IInspectionResult> GetInspectionResults();
-
         /// <summary>
         /// The inspection type name, obtained by reflection.
         /// </summary>
@@ -166,5 +159,21 @@ public int CompareTo(object obj)
         {
             return CompareTo(obj as IInspection);
         }
+        protected abstract IEnumerable<IInspectionResult> DoGetInspectionResults();
+
+        /// <summary>
+        /// A method that inspects the parser state and returns all issues it can find.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<IInspectionResult> GetInspectionResults()
+        {
+            var _stopwatch = new Stopwatch();
+            _stopwatch.Start();
+            var result = DoGetInspectionResults();
+            _stopwatch.Stop();
+            _logger.Trace("Intercepted invocation of '{0}.{1}' returned {2} objects.", GetType().Name, nameof(DoGetInspectionResults), result.Count());
+            _logger.Trace("Intercepted invocation of '{0}.{1}' ran for {2}ms", GetType().Name, nameof(DoGetInspectionResults), _stopwatch.ElapsedMilliseconds);
+            return result;
+        }
     }
 }

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -18,11 +18,9 @@ public class ApplicationWorksheetFunctionInspection : InspectionBase
         public ApplicationWorksheetFunctionInspection(RubberduckParserState state)
             : base(state, CodeInspectionSeverity.Suggestion) { }
 
-        public override Type Type => typeof(ApplicationWorksheetFunctionInspection);
-
         public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
 
-        public override IEnumerable<IInspectionResult> GetInspectionResults()
+        protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
             var excel = State.DeclarationFinder.Projects.SingleOrDefault(item => !item.IsUserDefined && item.IdentifierName == "Excel");
             if (excel == null) { return Enumerable.Empty<IInspectionResult>(); }

RetailCoder.VBE/Root/TimedCallLoggerInterceptor.cs

@@ -15,12 +15,10 @@ public sealed class AssignedByValParameterInspection : InspectionBase
         public AssignedByValParameterInspection(RubberduckParserState state)
             : base(state)
         { }
-
-        public override Type Type => typeof(AssignedByValParameterInspection);
-
+        
         public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
 
-        public override IEnumerable<IInspectionResult> GetInspectionResults()
+        protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
             var parameters = State.DeclarationFinder.UserDeclarations(DeclarationType.Parameter)
                 .Cast<ParameterDeclaration>()

RetailCoder.VBE/Rubberduck.csproj

@@ -18,11 +18,9 @@ public sealed class ConstantNotUsedInspection : InspectionBase
         public ConstantNotUsedInspection(RubberduckParserState state)
             : base(state) { }
 
-        public override Type Type => typeof(ConstantNotUsedInspection);
-
         public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
 
-        public override IEnumerable<IInspectionResult> GetInspectionResults()
+        protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
             var results = State.DeclarationFinder.UserDeclarations(DeclarationType.Constant)
                 .Where(declaration => declaration.Context != null