Reorder alternatives in annotationArgList in grammar

Previously the options without explicit parentheses were preferred and matched to expressions with parentheses consuming them as part or the argument.

Author: MDoerner

Rubberduck.Parsing/Grammar/VBAParser.g4

@@ -955,11 +955,12 @@ annotationList : SINGLEQUOTE (AT annotation)+ (COLON commentBody)?;
 annotation : annotationName annotationArgList? whiteSpace?;
 annotationName : unrestrictedIdentifier;
 annotationArgList : 
-    whiteSpace annotationArg
-    | whiteSpace annotationArg (whiteSpace? COMMA whiteSpace? annotationArg)+
+    whiteSpace? LPAREN whiteSpace? annotationArg whiteSpace? RPAREN
     | whiteSpace? LPAREN whiteSpace? RPAREN
-    | whiteSpace? LPAREN whiteSpace? annotationArg whiteSpace? RPAREN
-    | whiteSpace? LPAREN annotationArg (whiteSpace? COMMA whiteSpace? annotationArg)+ whiteSpace? RPAREN;
+    | whiteSpace? LPAREN annotationArg (whiteSpace? COMMA whiteSpace? annotationArg)+ whiteSpace? RPAREN
+    | whiteSpace annotationArg
+    | whiteSpace annotationArg (whiteSpace? COMMA whiteSpace? annotationArg)+
+;
 annotationArg : expression;
 
 mandatoryLineContinuation : LINE_CONTINUATION WS*;

RubberduckTests/Annotations/AnnotationResolutionTests.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using NUnit.Framework;
+using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Symbols;
 using RubberduckTests.Mocks;
 
@@ -556,5 +557,50 @@ Public Function Bar() As Variant '@Ignore MissingAttribute
                 Assert.AreEqual(expectedAnnotationCount, actualAnnotationCount);
             }
         }
+
+        [Test]
+        //Cf. issue #5071 at https://github.com/rubberduck-vba/Rubberduck/issues/5071
+        public void AnnotationArgumentIsRecognisedWithWhiteSpaceInBetween()
+        {
+            const string inputCode =
+                @"
+'@description (""Function description"")
+Public Function Bar() As Variant
+End Function";
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
+            using (var state = MockParser.CreateAndParse(vbe.Object))
+            {
+                var declaration = state.DeclarationFinder.UserDeclarations(DeclarationType.Function).Single();
+                var annotation = declaration.Annotations.OfType<DescriptionAnnotation>().Single();
+
+                var expectedAnnotationArgument = "Function description";
+                var actualAnnotationArgument = annotation.Description;
+
+                Assert.AreEqual(expectedAnnotationArgument, actualAnnotationArgument);
+            }
+        }
+
+        [Test]
+        public void AnnotationArgumentIsRecognisedWithLineContinuationsInBetween()
+        {
+            const string inputCode =
+                @"
+'@description _
+ _
+ (""Function description"")
+Public Function Bar() As Variant
+End Function";
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out _);
+            using (var state = MockParser.CreateAndParse(vbe.Object))
+            {
+                var declaration = state.DeclarationFinder.UserDeclarations(DeclarationType.Function).Single();
+                var annotation = declaration.Annotations.OfType<DescriptionAnnotation>().Single();
+
+                var expectedAnnotationArgument = "Function description";
+                var actualAnnotationArgument = annotation.Description;
+
+                Assert.AreEqual(expectedAnnotationArgument, actualAnnotationArgument);
+            }
+        }
     }
 }