Made commas optional when declaring enums

Related to #461
jhipster · May 12, 2020 · 17bec2c · 17bec2c
1 parent 0504758
commit 17bec2c
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 1 deletion.
diff --git a/lib/dsl/jdl_parser.js b/lib/dsl/jdl_parser.js
@@ -334,7 +334,9 @@ module.exports = class JDLParser extends CstParser {
     this.RULE('enumPropList', () => {
       this.SUBRULE(this.enumProp);
       this.MANY(() => {
-        this.CONSUME(LexerTokens.COMMA);
+        this.OPTION(() => {
+          this.CONSUME(LexerTokens.COMMA);
+        });
         this.SUBRULE1(this.enumProp);
       });
     });

diff --git a/test/spec/grammar/grammar.spec.js b/test/spec/grammar/grammar.spec.js
@@ -938,6 +938,73 @@ entity A {
     });
   });
   context('when parsing enums', () => {
+    context('with values separated by commas', () => {
+      let parsedEnum;
+
+      before(() => {
+        const content = parseFromContent(
+          `enum MyEnum {
+  FRANCE,
+  ENGLAND,
+  ICELAND
+}
+`
+        );
+        parsedEnum = content.enums[0];
+      });
+
+      it('should parse them', () => {
+        expect(parsedEnum).to.deep.equal({
+          name: 'MyEnum',
+          values: [
+            {
+              key: 'FRANCE'
+            },
+            {
+              key: 'ENGLAND'
+            },
+            {
+              key: 'ICELAND'
+            }
+          ]
+        });
+      });
+    });
+    context('with values separated by whitespaces', () => {
+      let parsedEnum;
+
+      before(() => {
+        const content = parseFromContent(
+          `enum MyEnum {
+  FRANCE ENGLAND("aaa bbb ccc") ICELAND
+  GERMANY
+}
+`
+        );
+        parsedEnum = content.enums[0];
+      });
+
+      it('should parse them', () => {
+        expect(parsedEnum).to.deep.equal({
+          name: 'MyEnum',
+          values: [
+            {
+              key: 'FRANCE'
+            },
+            {
+              key: 'ENGLAND',
+              value: 'aaa bbb ccc'
+            },
+            {
+              key: 'ICELAND'
+            },
+            {
+              key: 'GERMANY'
+            }
+          ]
+        });
+      });
+    });
     context('without custom values', () => {
       let parsedEnum;