Merge 63fbcf0 into 7bf35a8

Enteee · Aug 20, 2019 · 84c79d2 · 84c79d2
2 parents 7bf35a8 + 63fbcf0
commit 84c79d2
Show file tree

Hide file tree

Showing 8 changed files with 1,749 additions and 1,471 deletions.
diff --git a/src/plantuml-trace.js b/src/plantuml-trace.js
diff --git a/src/plantuml.js b/src/plantuml.js
diff --git a/src/plantuml.pegjs b/src/plantuml.pegjs
@@ -5,7 +5,7 @@
 PlantUMLFile
   = (
       (!"@startuml" .)*
-      "@startuml" _ NewLine
+      "@startuml" _ DiagramId? _ NewLine
         uml:UML
       "@enduml" _ NewLine?
       (!"@startuml" .)*
@@ -14,6 +14,9 @@ PlantUMLFile
       }
     )*
 
+DiagramId
+  = "(" _ "id" _ "=" Name ")"
+
 UML
   = elements:UMLElement*
   {

diff --git a/test/fixtures/ignore-preprocessor-args/in.plantuml b/test/fixtures/ignore-preprocessor-args/in.plantuml
@@ -0,0 +1,2 @@
+@startuml(id=MY_OWN_ID)
+@enduml
diff --git a/test/fixtures/ignore-preprocessor-args/parse-out.default b/test/fixtures/ignore-preprocessor-args/parse-out.default
@@ -0,0 +1,5 @@
+[
+  {
+    "elements": []
+  }
+]
diff --git a/test/fixtures/ignore-preprocessor-args/parse-out.graph b/test/fixtures/ignore-preprocessor-args/parse-out.graph
@@ -0,0 +1,4 @@
+{
+  "nodes": [],
+  "edges": []
+}
diff --git a/test/fixtures/ignore-preprocessor-args/parseFile-out.default b/test/fixtures/ignore-preprocessor-args/parseFile-out.default
@@ -0,0 +1,10 @@
+[
+  {
+    "name": "test/fixtures/ignore-preprocessor-args/in.plantuml",
+    "diagrams": [
+      {
+        "elements": []
+      }
+    ]
+  }
+]
diff --git a/test/fixtures/ignore-preprocessor-args/parseFile-out.graph b/test/fixtures/ignore-preprocessor-args/parseFile-out.graph
@@ -0,0 +1,16 @@
+{
+  "nodes": [
+    {
+      "name": "test/fixtures/ignore-preprocessor-args/in.plantuml",
+      "diagrams": [
+        {
+          "elements": []
+        }
+      ],
+      "id": "test/fixtures/ignore-preprocessor-args/in.plantuml",
+      "type": "File",
+      "hidden": true
+    }
+  ],
+  "edges": []
+}