Split actual Print statement and unqualified object Print member access

Author: MDoerner

Rubberduck.Parsing/Binding/DefaultBindingContext.cs

@@ -73,8 +73,8 @@ public IExpressionBinding Visit(Declaration module, Declaration parent, IParseTr
                     return Visit(module, parent, integerExpressionContext, withBlockVariable);
                 case VBAParser.OutputListContext outputListContext:
                     return Visit(module, parent, outputListContext, withBlockVariable);
-                case VBAParser.PrintStmtContext printStmtContext:
-                    return Visit(module, parent, printStmtContext, withBlockVariable);
+                case VBAParser.UnqualifiedObjectPrintStmtContext unqualifiedObjectPrintStmtContext:
+                    return Visit(module, parent, unqualifiedObjectPrintStmtContext, withBlockVariable);
                 default:
                     throw new NotSupportedException($"Unexpected context type {expression.GetType()}");
             }
@@ -266,7 +266,7 @@ private IExpressionBinding Visit(Declaration module, Declaration parent, VBAPars
             return new ObjectPrintDefaultBinding(expression, memberAccessBinding, outputListBinding);
         }
 
-        private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.PrintStmtContext expression, IBoundExpression withBlockVariable)
+        private IExpressionBinding Visit(Declaration module, Declaration parent, VBAParser.UnqualifiedObjectPrintStmtContext expression, IBoundExpression withBlockVariable)
         {
             var printMethodContext = expression.printMethod();
             var simpleNameBinding = new SimpleNameDefaultBinding(

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -172,6 +172,7 @@ mainBlockStmt :
     | circleSpecialForm
     | scaleSpecialForm
     | pSetSpecialForm
+    | unqualifiedObjectPrintStmt
     | callStmt
     | nameStmt
 ;
@@ -257,10 +258,10 @@ lineWidth : expression;
 
 
 // 5.4.5.8   Print Statement
-//We make the part regarding the file handle optional to support VB6's print statement in forms.
-//It is an invocation of the Print member of the enclosing form, which also takes an output list as argument.
+//The unqualifiedObjectPrintStmt is an invocation of the Print member of the enclosing form or report, which also takes an output list as argument.
 printMethod : PRINT;
-printStmt : printMethod (whiteSpace markedFileNumber whiteSpace? COMMA)? (whiteSpace? outputList)?;
+printStmt : printMethod whiteSpace markedFileNumber whiteSpace? COMMA (whiteSpace? outputList)?;
+unqualifiedObjectPrintStmt : printMethod (whiteSpace outputList)?;
 
 // 5.4.5.8.1 Output Lists
 outputList : outputItem (whiteSpace? outputItem)*;

Rubberduck.Parsing/VBA/ReferenceManagement/IdentifierReferenceListener.cs

@@ -237,6 +237,11 @@ public override void EnterPrintStmt([NotNull] VBAParser.PrintStmtContext context
             _resolver.Resolve(context);
         }
 
+        public override void EnterUnqualifiedObjectPrintStmt([NotNull] VBAParser.UnqualifiedObjectPrintStmtContext context)
+        {
+            _resolver.Resolve(context);
+        }
+
         public override void EnterWriteStmt([NotNull] VBAParser.WriteStmtContext context)
         {
             _resolver.Resolve(context);

Rubberduck.Parsing/VBA/ReferenceManagement/IdentifierReferenceResolver.cs

@@ -501,21 +501,13 @@ public void Resolve(VBAParser.WidthStmtContext context)
 
         public void Resolve(VBAParser.PrintStmtContext context)
         {
-            if (context.markedFileNumber() != null)
-            {
-                ResolvePrintStatement(context);
-            }
-            else
-            {
-                //Since there is no file handle, this must be an unqualified print member call in a VB6 form.  
-                ResolveDefault(context);
-            }
+            ResolveDefault(context.markedFileNumber().expression(), true);
+            ResolveOutputList(context.outputList());
         }
 
-        public void ResolvePrintStatement(VBAParser.PrintStmtContext context)
+        public void Resolve(VBAParser.UnqualifiedObjectPrintStmtContext context)
         {
-            ResolveDefault(context.markedFileNumber().expression(), true);
-            ResolveOutputList(context.outputList());
+            ResolveDefault(context);
         }
 
         public void Resolve(VBAParser.WriteStmtContext context)