[java] RecordBody - test with more annotation and use deep lookahead

Record constructors are not allowed to throw exceptions.
hirsute-chauve · Feb 28, 2020 · 7d3df99 · 7d3df99
1 parent 0ecd1da
commit 7d3df99
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt
@@ -1162,9 +1162,9 @@ void RecordBody():
 void RecordBodyDeclaration() #void :
 {}
 {
-  LOOKAHEAD(4) RecordConstructorDeclaration()
+  LOOKAHEAD(ClassOrInterfaceBodyDeclaration()) ClassOrInterfaceBodyDeclaration()
   |
-  ClassOrInterfaceBodyDeclaration()
+  RecordConstructorDeclaration()
 }
 
 void RecordConstructorDeclaration():
@@ -1176,7 +1176,6 @@ void RecordConstructorDeclaration():
   modifiers = Modifiers() { jjtThis.setModifiers(modifiers); }
   [TypeParameters()]
   <IDENTIFIER> { jjtThis.setImage(token.image); }
-  [ "throws" NameList() ]
   "{" ( BlockStatement() )* "}"
 }
 

diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14PreviewTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14PreviewTest.java
@@ -120,6 +120,7 @@ public void innerRecords() {
         Assert.assertTrue(complex.isNested());
         Assert.assertEquals(0, complex.getRecordComponents().get(0).findChildrenOfType(ASTAnnotation.class).size());
         Assert.assertEquals(1, complex.getRecordComponents().get(1).findChildrenOfType(ASTAnnotation.class).size());
+        Assert.assertTrue(complex.getChild(1).getChild(0).getChild(1) instanceof ASTConstructorDeclaration);
 
         ASTRecordDeclaration nested = recordDecls.get(1);
         Assert.assertEquals("Nested", nested.getName());

diff --git a/.../src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/Records.java b/.../src/test/resources/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java14/Records.java
@@ -7,15 +7,26 @@
 public class Records {
 
     @Target(ElementType.TYPE_USE)
-    @interface Nullable {
-    }
+    @interface Nullable { }
+
+    @Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER})
+    @interface MyAnnotation { }
 
     public record MyComplex(int real, @Deprecated int imaginary) {
+        // explicit declaration of a canonical constructor
+        @MyAnnotation
+        public MyComplex(@MyAnnotation int real, int imaginary) {
+            if (real > 100) throw new IllegalArgumentException("too big");
+            this.real = real;
+            this.imaginary = imaginary;
+        }
         public record Nested(int a) {};
     }
 
 
     public record Range(int lo, int hi) {
+        // compact record constructor
+        @MyAnnotation
         public Range {
           if (lo > hi)  /* referring here to the implicit constructor parameters */
             throw new IllegalArgumentException(String.format("(%d,%d)", lo, hi));