Fix for #761: rework annotation parser grammar to support content assist

- grammar allows trailing comma in annotation body, which will be error for groovyc but not eclipse compiler (maybe this can be fixed in future)
groovy · Nov 9, 2018 · 32220b9 · 32220b9
1 parent 726c152
commit 32220b9
Show file tree

Hide file tree

Showing 20 changed files with 40,705 additions and 40,648 deletions.
diff --git a/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/groovy.g b/base/org.codehaus.groovy24/src/org/codehaus/groovy/antlr/groovy.g
@@ -282,7 +282,7 @@ tokens {
     List errorList;
     public List getErrorList() { return errorList; }
 
-    List<Comment> comments = new ArrayList<Comment>();
+    List<Comment> comments = new ArrayList<>();
     public List<Comment> getComments() { return comments; }
     // GRECLIPSE end
 
@@ -1127,7 +1127,7 @@ modifier
     ;
 
 annotation!  {Token first = LT(1);}
-    :   AT! i:identifier nls! (options{greedy=true;}: LPAREN! ( args:annotationArguments )? RPAREN! )?
+    :   AT! i:identifier nls! ( LPAREN! ( args:annotationArguments )? RPAREN! )?
         {#annotation = #(create(ANNOTATION,"ANNOTATION",first,LT(1)), i, args);}
     // GRECLIPSE add -- allow freestanding '@' for content assist
     |   AT! nls!
@@ -1141,51 +1141,43 @@ annotationsInternal
             {break; /* go out of the ()* loop*/}
             AT "interface"
         |
-            annotation nls!)*
+            annotation nls!
+        )*
     ;
 
 annotationsOpt  {Token first = LT(1);}
     :   (
-               // See comment above on hushing warnings.
-               options{generateAmbigWarnings=false;}:
-               annotationsInternal
+            // See comment above on hushing warnings.
+            options{generateAmbigWarnings=false;}:
+            annotationsInternal
         )?
-        {#annotationsOpt = #(create(ANNOTATIONS, "ANNOTATIONS", first, LT(1)), #annotationsOpt);}
+        {#annotationsOpt = #(create(ANNOTATIONS,"ANNOTATIONS",first,LT(1)), #annotationsOpt);}
     ;
 
 annotationArguments
     :   v:annotationMemberValueInitializer
-            { Token itkn = new Token(IDENT, "value");
-              AST i;
-              #i = #(create(IDENT, "value", itkn, itkn));
-                #annotationArguments = #(create(ANNOTATION_MEMBER_VALUE_PAIR,"ANNOTATION_MEMBER_VALUE_PAIR",LT(1),LT(1)), i, v);}
-            | annotationMemberValuePairs
+        {Token itkn = new Token(IDENT,"value"); AST i; #i = #(create(IDENT,"value",itkn,itkn));
+         #annotationArguments = #(create(ANNOTATION_MEMBER_VALUE_PAIR,"ANNOTATION_MEMBER_VALUE_PAIR",LT(1),LT(1)), i, v);}
+        | annotationMemberValuePairs
     ;
 
 annotationMemberValuePairs
-    :   annotationMemberValuePair ( COMMA! nls! annotationMemberValuePair )*
+    // GRECLIPSE edit -- allow trailing comma
+    //:   annotationMemberValuePair ( COMMA! nls! annotationMemberValuePair )*
+    :   annotationMemberValuePair (
+            (COMMA nls! RPAREN) => COMMA! nls!
+        |
+            COMMA! nls! annotationMemberValuePair
+        )*
+    // GRECLIPSE end
     ;
 
 annotationMemberValuePair!  {Token first = LT(1);}
-    // GRECLIPSE edit -- allow the pair to exist with no value initializer; user may want content assist for value
+    // GRECLIPSE edit -- allow pair with no value initializer
     //:   i:annotationIdent ASSIGN! nls! v:annotationMemberValueInitializer
-    :   i:annotationIdent ASSIGN! nls! ( v:annotationMemberValueInitializer )?
-            {#annotationMemberValuePair = #(create(ANNOTATION_MEMBER_VALUE_PAIR,"ANNOTATION_MEMBER_VALUE_PAIR",first,LT(1)),i,v);}
-        // GRECLIPSE add
-        exception
-        catch [RecognitionException e] {
-            // finish invalid member-value pair if the closing parenthesis is next
-            if (LT(1).getType() == RPAREN) {
-                reportError(e);
-                if (#i == null) {
-                    #i = missingIdentifier(first, LT(1));
-                }
-                #annotationMemberValuePair = #(create(ANNOTATION_MEMBER_VALUE_PAIR,"ANNOTATION_MEMBER_VALUE_PAIR",first,LT(1)),i,v);
-            } else {
-                throw e;
-            }
-        }
-        // GRECLIPSE end
+    :   i:annotationIdent ( ASSIGN! nls! ( v:annotationMemberValueInitializer )? )?
+        {#annotationMemberValuePair = #(create(ANNOTATION_MEMBER_VALUE_PAIR,"ANNOTATION_MEMBER_VALUE_PAIR",first,LT(1)), i, v);}
+    // GRECLIPSE end
     ;
 
 annotationIdent
@@ -1197,35 +1189,6 @@ annotationMemberValueInitializer
     :   conditionalExpression[0] | annotation
     ;
 
-/*OBS*
-// This is an initializer used to set up an annotation member array.
-annotationMemberArrayInitializer
-    :   lc:LCURLY^ {#lc.setType(ANNOTATION_ARRAY_INIT);}
-        (   annotationMemberArrayValueInitializer
-            (
-                // CONFLICT: does a COMMA after an initializer start a new
-                // initializer or start the option ',' at end?
-                // ANTLR generates proper code by matching
-                // the comma as soon as possible.
-                options {
-                        warnWhenFollowAmbig = false;
-                }
-            :
-                COMMA! nls! annotationMemberArrayValueInitializer
-            )*
-            (COMMA! nls!)?
-        )?
-        RCURLY!
-    ;
-
-// The two things that can initialize an annotation array element are a conditional expression
-// and an annotation (nested annotation array initialisers are not valid)
-annotationMemberArrayValueInitializer
-    :   conditionalExpression[0]
-    |   annotation nls!
-    ;
-*OBS*/
-
 superClassClause!
     {Token first = LT(1);}
     :