fix: Java-parser routing to the wrong rule on class defining records …

…with simplified and normal constructor
jhipster · May 21, 2021 · 7828cdf · 7828cdf
1 parent 6bc93b9
commit 7828cdf
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 1 deletion.
diff --git a/packages/java-parser/src/productions/classes.js b/packages/java-parser/src/productions/classes.js
@@ -850,7 +850,8 @@ function defineRules($, t) {
 
       if (
         tokenMatcher(nextTokenType, t.Class) ||
-        tokenMatcher(nextTokenType, t.Enum)
+        tokenMatcher(nextTokenType, t.Enum) ||
+        tokenMatcher(nextTokenType, t.Record)
       ) {
         return classBodyTypes.classDeclaration;
       }
@@ -923,6 +924,7 @@ function defineRules($, t) {
   $.RULE("isCompactConstructorDeclaration", () => {
     $.MANY($.constructorModifier);
     $.SUBRULE($.simpleTypeName);
+    $.CONSUME(t.LCurly);
   });
 }
 

diff --git a/packages/java-parser/test/records/records-spec.js b/packages/java-parser/test/records/records-spec.js
@@ -25,4 +25,42 @@ describe("The Java Parser fixed bugs", () => {
     `;
     expect(() => javaParser.parse(input, "compilationUnit")).to.not.throw();
   });
+
+  it("should handle Java records with simplified constructors inside java class declaration", () => {
+    const input = `
+    public class RecordClass {
+      record MyRecord(String name, int age) {
+          public MyRecord {
+            if (age < 0) {
+              throw new IllegalArgumentException("Age cannot be negative");
+            }
+    
+            if (name == null || name.isBlank()) {
+              throw new IllegalArgumentException("Name cannot be blank");
+            }
+          }
+      }
+    }
+    `;
+    expect(() => javaParser.parse(input, "compilationUnit")).to.not.throw();
+  });
+
+  it("should handle Java records with constructor inside java class declaration", () => {
+    const input = `
+    public class RecordClass {
+      record MyRecord(String name, int age) {
+          public MyRecord(String name, int age) {
+            if (age < 0) {
+              throw new IllegalArgumentException("Age cannot be negative");
+            }
+    
+            if (name == null || name.isBlank()) {
+              throw new IllegalArgumentException("Name cannot be blank");
+            }
+          }
+      }
+    }
+    `;
+    expect(() => javaParser.parse(input, "compilationUnit")).to.not.throw();
+  });
 });
diff --git a/packages/prettier-plugin-java/test/unit-test/records/_input.java b/packages/prettier-plugin-java/test/unit-test/records/_input.java
@@ -38,4 +38,34 @@ class T {
     void t() {
         record = "12";
     }
+
+class MyRecordSimplifiedConstructor {
+    record MyRecord(String name, int age
+    ) {
+public MyRecord {
+            if (age < 0) {
+              throw new IllegalArgumentException("Age cannot be negative");
+            }
+
+      if (name == null || name.isBlank()) {
+              throw new IllegalArgumentException("Name cannot be blank");
+       }
+          }
+      }
+}
+
+class MyRecordConstructor {
+    record MyRecord(String name,
+     int age) {
+          public MyRecord(String name,
+           int age) {
+            if (age < 0) {
+  throw new IllegalArgumentException("Age cannot be negative");
+            }
+                if (name == null || name.isBlank()) {
+              throw new IllegalArgumentException("Name cannot be blank");
+        }
+          }
+      }
+}
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/records/_output.java b/packages/prettier-plugin-java/test/unit-test/records/_output.java
@@ -31,4 +31,33 @@ class T {
   void t() {
     record = "12";
   }
+
+  class MyRecordSimplifiedConstructor {
+
+    record MyRecord(String name, int age) {
+      public MyRecord {
+        if (age < 0) {
+          throw new IllegalArgumentException("Age cannot be negative");
+        }
+
+        if (name == null || name.isBlank()) {
+          throw new IllegalArgumentException("Name cannot be blank");
+        }
+      }
+    }
+  }
+
+  class MyRecordConstructor {
+
+    record MyRecord(String name, int age) {
+      public MyRecord(String name, int age) {
+        if (age < 0) {
+          throw new IllegalArgumentException("Age cannot be negative");
+        }
+        if (name == null || name.isBlank()) {
+          throw new IllegalArgumentException("Name cannot be blank");
+        }
+      }
+    }
+  }
 }