Rough EmptyConditionBlockInspection flag to select which block to inspect

Author: IvenBach

Rubberduck.Inspections/Concrete/EmptyConditionBlockInspection.cs

@@ -13,10 +13,27 @@
 
 namespace Rubberduck.Inspections.Concrete
 {
+    [Flags]
+    public enum ConditionBlockToInspect
+    {
+        NA = 0x0,
+        If = 0x1,
+        ElseIf = 0x2,
+        Else = 0x4,
+        All = If | ElseIf | Else
+    }
+
     internal class EmptyConditionBlockInspection : ParseTreeInspectionBase
     {
-        public EmptyConditionBlockInspection(RubberduckParserState state)
-            : base(state, CodeInspectionSeverity.Suggestion) { }
+        public EmptyConditionBlockInspection(RubberduckParserState state,
+                                            ConditionBlockToInspect BlockToInspect) //= ConditionBlockToInspect.EmptyIf
+            : base(state, CodeInspectionSeverity.Suggestion)
+        {
+            _blockToInspect = BlockToInspect;
+            Listener = new EmptyConditionBlockListener(BlockToInspect); // ¿better way to set this up?
+        }
+
+        public static ConditionBlockToInspect _blockToInspect { get; private set; }
 
         public override Type Type => typeof(EmptyConditionBlockInspection);
 
@@ -29,33 +46,49 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
                                                         result));
         }
 
-        public override IInspectionListener Listener { get; } =
-            new EmptyConditionBlockListener();
+        public override IInspectionListener Listener { get; } = new EmptyConditionBlockListener(_blockToInspect);
 
         public class EmptyConditionBlockListener : EmptyBlockInspectionListenerBase
         {
+            ConditionBlockToInspect _blockToInspect;
+
+            public EmptyConditionBlockListener(ConditionBlockToInspect blockToInspect)
+            {
+                _blockToInspect = blockToInspect;
+            }
+
             public override void EnterIfStmt([NotNull] VBAParser.IfStmtContext context)
             {
-                InspectBlockForExecutableStatements(context.block(), context);
+                if ((_blockToInspect & ConditionBlockToInspect.If) == ConditionBlockToInspect.If)
+                {
+                    InspectBlockForExecutableStatements(context.block(), context);
+                }
             }
 
             public override void EnterElseIfBlock([NotNull] VBAParser.ElseIfBlockContext context)
             {
-                InspectBlockForExecutableStatements(context.block(), context);
+                if ((_blockToInspect & ConditionBlockToInspect.ElseIf) == ConditionBlockToInspect.ElseIf)
+                {
+                    InspectBlockForExecutableStatements(context.block(), context);
+                }
             }
 
             public override void EnterSingleLineIfStmt([NotNull] VBAParser.SingleLineIfStmtContext context)
             {
-                if (context.ifWithEmptyThen() != null)
+                if (context.ifWithEmptyThen() != null
+                    & ((_blockToInspect & ConditionBlockToInspect.If) == ConditionBlockToInspect.If))
                 {
                     AddResult(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context.ifWithEmptyThen()));
                 }
             }
 
             public override void EnterElseBlock([NotNull] VBAParser.ElseBlockContext context)
             {
-                InspectBlockForExecutableStatements(context.block(), context);
+                if ((_blockToInspect & ConditionBlockToInspect.Else) == ConditionBlockToInspect.Else)
+                {
+                    InspectBlockForExecutableStatements(context.block(), context);
+                }
             }
         }
     }
-}
+}

Rubberduck.Inspections/Concrete/IntegerDataTypeInspection.cs

@@ -40,9 +40,7 @@ public override IEnumerable<IInspectionResult> GetInspectionResults()
                 .Select(issue =>
                     new DeclarationInspectionResult(this,
                         string.Format(InspectionsUI.IntegerDataTypeInspectionResultFormat,
-                            RubberduckUI.ResourceManager.GetString("DeclarationType_" + issue.DeclarationType,
-                                CultureInfo.CurrentUICulture),
-                            issue.IdentifierName),
+                            RubberduckUI.ResourceManager.GetString("DeclarationType_" + issue.DeclarationType, CultureInfo.CurrentUICulture), issue.IdentifierName),
                         issue));
 
             return result;