Really fixed the commenting in fields with validations

jhipster · Dec 21, 2016 · 21ac3e4 · 21ac3e4
1 parent 223b495
commit 21ac3e4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 13 deletions.
diff --git a/lib/dsl/grammar.txt b/lib/dsl/grammar.txt
@@ -124,13 +124,13 @@ entityBody
   / '' { return []; }
 
 fieldDeclList
-  = SPACE* com:comment? SPACE* f:FIELD_NAME SPACE_WITHOUT_NEWLINE* t:type SPACE_WITHOUT_NEWLINE* vl:validationList? SPACE_WITHOUT_NEWLINE* com2:comment? SPACE* ','? SPACE* fdl:fieldDeclList {
+  = SPACE* com:comment? SPACE* f:FIELD_NAME SPACE_WITHOUT_NEWLINE* t:type SPACE_WITHOUT_NEWLINE* vl:validationList? SPACE_WITHOUT_NEWLINE* com2:comment? SPACE_WITHOUT_NEWLINE* ','? SPACE* fdl:fieldDeclList {
     return addUniqueElements([{ name: f, type: t, validations: vl, javadoc: com || com2 }], fdl );
   }
   / '' { return []; }
 
 validationList
-  = v:validation SPACE* vl:validationList { return addUniqueElements([v], vl); }
+  = v:validation SPACE_WITHOUT_NEWLINE* vl:validationList { return addUniqueElements([v], vl); }
   / '' { return []; }
 
 //Relationship

diff --git a/lib/dsl/pegjs_parser.js b/lib/dsl/pegjs_parser.js
diff --git a/test/spec/parser/jdl_parser_test.js b/test/spec/parser/jdl_parser_test.js
@@ -455,6 +455,25 @@ describe('JDLParser', function () {
               validations: {}
             }
           });
+          expect(content.entities.TestEntity2.fields).to.deep.eq({
+            first: {
+              name: 'first',
+              comment: 'first comment',
+              type: 'String',
+              validations: {
+                required: {
+                  name: 'required',
+                  value: ''
+                }
+              }
+            },
+            second: {
+              name: 'second',
+              comment: 'second comment',
+              type: 'String',
+              validations: {}
+            }
+          });
         });
       });
     });

diff --git a/test/test_files/field_comments.jdl b/test/test_files/field_comments.jdl
@@ -1,9 +1,17 @@
 entity TestEntity {
-    /** first comment */
-    first String
-    /** second comment */
-    second String
-    third Integer
-    /* another */
-    fourth String
+  /** first comment */
+  first String
+  /** second comment */
+  second String
+  third Integer
+  /* another */
+  fourth String
+}
+
+
+entity TestEntity2 {
+  /** first comment */
+  first String required
+  /** second comment */
+  second String
 }