Adapted grammar to cope with combined next statements for For and For Each loops.

Author: MDoerner

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyBlockInspectionListenerBase.cs

@@ -5,6 +5,7 @@
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Antlr4.Runtime.Tree;
 
 namespace Rubberduck.Inspections.Concrete
 {
@@ -35,12 +36,12 @@ public void AddResult(QualifiedContext<ParserRuleContext> qualifiedContext)
 
         private bool BlockContainsExecutableStatements(VBAParser.BlockContext block)
         {
-            return block?.children != null && ContainsExecutableStatements(block);
+            return block?.children != null && ContainsExecutableStatements(block.children);
         }
 
-        private bool ContainsExecutableStatements(VBAParser.BlockContext block)
+        private bool ContainsExecutableStatements(IList<IParseTree> blockChildren)
         {
-            foreach (var child in block.children)
+            foreach (var child in blockChildren)
             {
                 if (child is VBAParser.BlockStmtContext blockStmt)
                 {
@@ -76,5 +77,18 @@ child is VBAParser.CommentOrAnnotationContext ||
 
             return false;
         }
+
+        public void InspectBlockForExecutableStatements<T>(VBAParser.UnterminatedBlockContext block, T context) where T : ParserRuleContext
+        {
+            if (!BlockContainsExecutableStatements(block))
+            {
+                AddResult(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
+            }
+        }
+
+        private bool BlockContainsExecutableStatements(VBAParser.UnterminatedBlockContext block)
+        {
+            return block?.children != null && ContainsExecutableStatements(block.children);
+        }
     }
 }

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyForEachBlockInspection.cs

@@ -33,7 +33,7 @@ public class EmptyForEachBlockListener : EmptyBlockInspectionListenerBase
         {
             public override void EnterForEachStmt([NotNull] VBAParser.ForEachStmtContext context)
             {
-                InspectBlockForExecutableStatements(context.block(), context);
+                InspectBlockForExecutableStatements(context.unterminatedBlock(), context);
             }
         }
     }

Rubberduck.CodeAnalysis/Inspections/Concrete/EmptyForLoopBlockInspection.cs

@@ -33,7 +33,7 @@ public class EmptyForloopBlockListener : EmptyBlockInspectionListenerBase
         {
             public override void EnterForNextStmt([NotNull] VBAParser.ForNextStmtContext context)
             {
-                InspectBlockForExecutableStatements(context.block(), context);
+                InspectBlockForExecutableStatements(context.unterminatedBlock(), context);
             }
         }
     }

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -108,7 +108,7 @@ moduleBodyElement :
 
 block : (blockStmt endOfStatement)*;
 
-unterminatedBlock : blockStmt? (endOfStatement blockStmt)*;
+unterminatedBlock : blockStmt (endOfStatement blockStmt)*;
 
 blockStmt : 
     statementLabelDefinition whiteSpace? mainBlockStmt?
@@ -353,16 +353,18 @@ eventStmt : (visibility whiteSpace)? EVENT whiteSpace identifier whiteSpace? arg
 exitStmt : EXIT_DO | EXIT_FOR | EXIT_FUNCTION | EXIT_PROPERTY | EXIT_SUB;
 
 forEachStmt : 
-    FOR whiteSpace EACH whiteSpace expression whiteSpace IN whiteSpace expression endOfStatement
-    block
-    statementLabelDefinition? whiteSpace? NEXT (whiteSpace expression)?
+    FOR whiteSpace EACH whiteSpace expression whiteSpace IN whiteSpace expression 
+	(endOfStatement unterminatedBlock)?
+    (endOfStatement statementLabelDefinition? whiteSpace? NEXT (whiteSpace expression)? 
+	| whiteSpace? COMMA whiteSpace? expression)
 ;
 
 // expression EQ expression refactored to expression to allow SLL
 forNextStmt : 
-    FOR whiteSpace expression whiteSpace TO whiteSpace expression stepStmt? whiteSpace* endOfStatement 
-    block
-    statementLabelDefinition? whiteSpace? NEXT (whiteSpace expression)?
+    FOR whiteSpace expression whiteSpace TO whiteSpace expression stepStmt? whiteSpace* 
+	(endOfStatement unterminatedBlock)?
+    (endOfStatement statementLabelDefinition? whiteSpace? NEXT (whiteSpace expression)? 
+	| whiteSpace? COMMA whiteSpace? expression)
 ; 
 
 stepStmt : whiteSpace STEP whiteSpace expression;