Adjust Grammar update, Add repro-based testcase

This additionally reverts the incorrect modifications to the ParserTests for comments.
The added test directly uses the code from Issue 3789, which was suboptimally fixed in bbc0b37

Co-authored-by: Max Doerner <maxdoerner@gmx.net>

Author: Vogel612

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -502,8 +502,9 @@ subroutineName : identifier;
 // 5.2.3.3 User Defined Type Declarations
 publicTypeDeclaration : ((GLOBAL | PUBLIC) whiteSpace)? udtDeclaration;
 privateTypeDeclaration : PRIVATE whiteSpace udtDeclaration;
-udtDeclaration : TYPE whiteSpace untypedIdentifier endOfStatement udtMemberList endOfStatement END_TYPE;  
-udtMemberList : udtMember (endOfStatement udtMember)*; 
+// member list includes trailing endOfStatement
+udtDeclaration : TYPE whiteSpace untypedIdentifier endOfStatement udtMemberList END_TYPE;  
+udtMemberList : (udtMember endOfStatement)+; 
 udtMember : reservedNameMemberDeclaration | untypedNameMemberDeclaration;
 untypedNameMemberDeclaration : untypedIdentifier whiteSpace? optionalArrayClause;
 reservedNameMemberDeclaration : unrestrictedIdentifier whiteSpace asTypeClause;
@@ -872,15 +873,16 @@ endOfStatement :
 
 // Annotations must come before comments because of precedence. ANTLR4 matches as much as possible then chooses the one that comes first.
 commentOrAnnotation :
-    annotationList 
+    (annotationList 
     | remComment
-    | comment
+    | comment) 
+	// all comments must end with a logical line. See VBA Language Spec 3.3.1
+	(NEWLINE | EOF)
 ;
 remComment : REM whiteSpace? commentBody;
 comment : SINGLEQUOTE commentBody;
-// commentBody must terminate with a NEWLINE, see VBA Language spec, section 3.3.1 and 3789
-commentBody : (LINE_CONTINUATION | ~NEWLINE)* (NEWLINE | EOF);
-annotationList : SINGLEQUOTE (AT annotation whiteSpace?)+ (whiteSpace? COLON commentBody)?;
+commentBody : (~NEWLINE)*;
+annotationList : SINGLEQUOTE (AT annotation whiteSpace?)+ (COLON commentBody)?;
 annotation : annotationName annotationArgList?;
 annotationName : unrestrictedIdentifier;
 annotationArgList : 

RubberduckTests/Grammar/VBAParserTests.cs

@@ -440,8 +440,7 @@ public void TestModuleConfig()
         [Test]
         public void TestEmptyComment()
         {
-            string code = @"'
-";
+            string code = @"'";
             var parseResult = Parse(code);
             AssertTree(parseResult.Item1, parseResult.Item2, "//comment");
         }
@@ -450,8 +449,7 @@ public void TestEmptyComment()
         [Test]
         public void TestEmptyRemComment()
         {
-            string code = @"Rem
-";
+            string code = @"Rem";
             var parseResult = Parse(code);
             AssertTree(parseResult.Item1, parseResult.Item2, "//remComment");
         }
@@ -460,8 +458,7 @@ public void TestEmptyRemComment()
         [Test]
         public void TestOneCharRemComment()
         {
-            string code = @"Rem a
-";
+            string code = @"Rem a";
             var parseResult = Parse(code);
             AssertTree(parseResult.Item1, parseResult.Item2, "//remComment");
         }
@@ -470,8 +467,7 @@ public void TestOneCharRemComment()
         [Test]
         public void TestCommentThatLooksLikeAnnotation()
         {
-            string code = @"'@param foo; the value of something
-";
+            string code = @"'@param foo; the value of something";
             var parseResult = Parse(code);
             AssertTree(parseResult.Item1, parseResult.Item2, "//comment");
         }
@@ -500,8 +496,7 @@ Sub FooFoo()
         [Test]
         public void TestOneCharComment()
         {
-            string code = @"'a
-";
+            string code = @"'a";
             var parseResult = Parse(code);
             AssertTree(parseResult.Item1, parseResult.Item2, "//comment");
         }
@@ -2185,6 +2180,23 @@ End Sub
             AssertTree(parseResult.Item1, parseResult.Item2, "//variableSubStmt", matches => matches.Count == 1);
         }
 
+        [Category("Parser")]
+        [Test]
+        public void UserDefinedType_TreatsFinalCommentAsComment()
+        {
+            // See Issue #3789
+            const string code = @"
+Private Type tX
+    foo As String
+    bar As Long
+    'foobar as shouldNotBeVisible
+End Type
+";
+            var parseResult = Parse(code);
+            AssertTree(parseResult.Item1, parseResult.Item2, "//udtMember", matches => matches.Count == 2);
+            AssertTree(parseResult.Item1, parseResult.Item2, "//commentOrAnnotation", matches => matches.Count == 1);
+        }
+
         private Tuple<VBAParser, ParserRuleContext> Parse(string code, PredictionMode predictionMode = null)
         {
             var stream = new AntlrInputStream(code);