Merge branch 'master' into dependabot/npm_and_yarn/async-3.2.2

Enteee · Apr 17, 2022 · 907b4e9 · 907b4e9
2 parents 420b114 + c49221c
commit 907b4e9
Show file tree

Hide file tree

Showing 6 changed files with 398 additions and 4 deletions.
diff --git a/src/plantuml.pegjs b/src/plantuml.pegjs
@@ -153,7 +153,7 @@ Together
 //
 
 Group
-  = _ type:GroupType " " _ name:ElementName _ Stereotypes? _ Color? _ "{" _ NewLine elements:UMLElement* _ "}" EndLine
+  = _ type:GroupType " " _ name:ElementName _ Stereotypes? _ Color? _ NewLine? _ "{" _ NewLine elements:UMLElement* _ "}" EndLine
   {
     return new types.Group(
       name.name,
@@ -221,7 +221,7 @@ NoteOf
 //
 
 Class
-  = _ isAbstract:"abstract "i? _ "class " _ name:ElementName _ generics:Generics? _ extends_:Extends? _ implements_:Implements? _ stereotypes:Stereotypes? _ "{" _ NewLine members:Member* _ "}" EndLine
+  = _ isAbstract:"abstract "i? _ "class " _ name:ElementName _ generics:Generics? _ extends_:Extends? _ implements_:Implements? _ stereotypes:Stereotypes? _ NewLine? _ "{" _ NewLine members:Member* _ "}" EndLine
   {
     return new types.Class(
       name.name,
@@ -320,7 +320,7 @@ MemberVariable
 //
 
 Interface
-  = _ "interface "i _ name:ElementName _ generics:Generics? _ extends_:Extends? _ implements_:Implements? _ stereotypes:Stereotypes? _ "{" _ NewLine members:Member* _ "}" EndLine
+  = _ "interface "i _ name:ElementName _ generics:Generics? _ extends_:Extends? _ implements_:Implements? _ stereotypes:Stereotypes? _ NewLine? _ "{" _ NewLine members:Member* _ "}" EndLine
   {
     return new types.Interface(
       name.name,
@@ -350,7 +350,7 @@ Interface
 //
 
 Enum
-  = _ "enum "i _ name:ElementName _ generics:Generics? _ extends_:Extends? _ implements_:Implements? _ stereotypes:Stereotypes? _ "{" _ NewLine members:Member* _ "}" EndLine
+  = _ "enum "i _ name:ElementName _ generics:Generics? _ extends_:Extends? _ implements_:Implements? _ stereotypes:Stereotypes? _ NewLine? _ "{" _ NewLine members:Member* _ "}" EndLine
   {
     return new types.Enum(
       name.name,

diff --git a/test/fixtures/class-empty-class/in.plantuml b/test/fixtures/class-empty-class/in.plantuml
@@ -0,0 +1,26 @@
+@startuml
+
+package P1
+{
+}
+package P2 {
+}
+
+class C1
+{
+}
+class C2 {
+}
+
+interface I1
+{
+}
+interface I2 {
+}
+
+enum E1
+{
+}
+enum E2 {
+}
+@enduml
diff --git a/test/fixtures/class-empty-class/parse-out.default b/test/fixtures/class-empty-class/parse-out.default
@@ -0,0 +1,74 @@
+[
+  {
+    "elements": [
+      {
+        "name": "P1",
+        "title": "P1",
+        "type": "package",
+        "elements": []
+      },
+      {
+        "name": "P2",
+        "title": "P2",
+        "type": "package",
+        "elements": []
+      },
+      {
+        "name": "C1",
+        "title": "C1",
+        "isAbstract": false,
+        "members": [],
+        "extends_": [],
+        "implements_": [],
+        "generics": [],
+        "stereotypes": []
+      },
+      {
+        "name": "C2",
+        "title": "C2",
+        "isAbstract": false,
+        "members": [],
+        "extends_": [],
+        "implements_": [],
+        "generics": [],
+        "stereotypes": []
+      },
+      {
+        "name": "I1",
+        "title": "I1",
+        "members": [],
+        "extends_": [],
+        "implements_": [],
+        "generics": [],
+        "stereotypes": []
+      },
+      {
+        "name": "I2",
+        "title": "I2",
+        "members": [],
+        "extends_": [],
+        "implements_": [],
+        "generics": [],
+        "stereotypes": []
+      },
+      {
+        "name": "E1",
+        "title": "E1",
+        "members": [],
+        "extends_": [],
+        "implements_": [],
+        "generics": [],
+        "stereotypes": []
+      },
+      {
+        "name": "E2",
+        "title": "E2",
+        "members": [],
+        "extends_": [],
+        "implements_": [],
+        "generics": [],
+        "stereotypes": []
+      }
+    ]
+  }
+]
diff --git a/test/fixtures/class-empty-class/parse-out.graph b/test/fixtures/class-empty-class/parse-out.graph
@@ -0,0 +1,55 @@
+{
+  "nodes": [
+    {
+      "name": "C1",
+      "title": "C1",
+      "isAbstract": false,
+      "members": [],
+      "extends_": [],
+      "implements_": [],
+      "generics": [],
+      "stereotypes": [],
+      "id": "C1",
+      "type": "Class",
+      "hidden": true
+    },
+    {
+      "name": "C2",
+      "title": "C2",
+      "isAbstract": false,
+      "members": [],
+      "extends_": [],
+      "implements_": [],
+      "generics": [],
+      "stereotypes": [],
+      "id": "C2",
+      "type": "Class",
+      "hidden": true
+    },
+    {
+      "name": "I1",
+      "title": "I1",
+      "members": [],
+      "extends_": [],
+      "implements_": [],
+      "generics": [],
+      "stereotypes": [],
+      "id": "I1",
+      "type": "Interface",
+      "hidden": true
+    },
+    {
+      "name": "I2",
+      "title": "I2",
+      "members": [],
+      "extends_": [],
+      "implements_": [],
+      "generics": [],
+      "stereotypes": [],
+      "id": "I2",
+      "type": "Interface",
+      "hidden": true
+    }
+  ],
+  "edges": []
+}
diff --git a/test/fixtures/class-empty-class/parseFile-out.default b/test/fixtures/class-empty-class/parseFile-out.default
@@ -0,0 +1,79 @@
+[
+  {
+    "name": "test/fixtures/class-empty-class/in.plantuml",
+    "diagrams": [
+      {
+        "elements": [
+          {
+            "name": "P1",
+            "title": "P1",
+            "type": "package",
+            "elements": []
+          },
+          {
+            "name": "P2",
+            "title": "P2",
+            "type": "package",
+            "elements": []
+          },
+          {
+            "name": "C1",
+            "title": "C1",
+            "isAbstract": false,
+            "members": [],
+            "extends_": [],
+            "implements_": [],
+            "generics": [],
+            "stereotypes": []
+          },
+          {
+            "name": "C2",
+            "title": "C2",
+            "isAbstract": false,
+            "members": [],
+            "extends_": [],
+            "implements_": [],
+            "generics": [],
+            "stereotypes": []
+          },
+          {
+            "name": "I1",
+            "title": "I1",
+            "members": [],
+            "extends_": [],
+            "implements_": [],
+            "generics": [],
+            "stereotypes": []
+          },
+          {
+            "name": "I2",
+            "title": "I2",
+            "members": [],
+            "extends_": [],
+            "implements_": [],
+            "generics": [],
+            "stereotypes": []
+          },
+          {
+            "name": "E1",
+            "title": "E1",
+            "members": [],
+            "extends_": [],
+            "implements_": [],
+            "generics": [],
+            "stereotypes": []
+          },
+          {
+            "name": "E2",
+            "title": "E2",
+            "members": [],
+            "extends_": [],
+            "implements_": [],
+            "generics": [],
+            "stereotypes": []
+          }
+        ]
+      }
+    ]
+  }
+]