fixed all rendering differences

mermaid-js · Jul 27, 2024 · 275dbe9 · 275dbe9
1 parent 9f6a7b7
commit 275dbe9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/mermaid/src/diagrams/git/gitGraphAst.ts b/packages/mermaid/src/diagrams/git/gitGraphAst.ts
@@ -287,6 +287,7 @@ export const cherryPick = function (
   targetId = common.sanitizeText(targetId, getConfig());
   const config = getConfig();
   tags = tags?.map((tag) => common.sanitizeText(tag, config));
+
   parentCommitId = common.sanitizeText(parentCommitId, getConfig());
 
   if (!sourceId || !state.records.commits.has(sourceId)) {
@@ -383,6 +384,7 @@ export const cherryPick = function (
             }`,
           ],
     };
+
     state.records.head = commit;
     state.records.commits.set(commit.id, commit);
     state.records.branches.set(state.records.currBranch, commit.id);

diff --git a/packages/mermaid/src/diagrams/git/gitGraphParser.ts b/packages/mermaid/src/diagrams/git/gitGraphParser.ts
@@ -76,7 +76,7 @@ const parseCheckout = (checkout: CheckoutAst) => {
 
 const parseCherryPicking = (cherryPicking: CherryPickingAst) => {
   const id = cherryPicking.id;
-  const tags = cherryPicking.tags ?? undefined;
+  const tags = cherryPicking.tags?.length === 0 ? undefined : cherryPicking.tags;
   const parent = cherryPicking.parent;
   db.cherryPick(id, '', tags, parent);
 };

diff --git a/packages/parser/src/language/gitGraph/gitGraph.langium b/packages/parser/src/language/gitGraph/gitGraph.langium
@@ -65,7 +65,7 @@ Merge:
     (
         'id:' id=STRING
         |'tag:' tags+=STRING
-        |'type:' name=('NORMAL' | 'REVERSE' | 'HIGHLIGHT')
+        |'type:' type=('NORMAL' | 'REVERSE' | 'HIGHLIGHT')
     )* EOL;
 
 Checkout:
@@ -76,7 +76,7 @@ CherryPicking:
     (
         'id:' id=STRING
         |'tag:' tags+=STRING
-        |'parent:' id=STRING
+        |'parent:' parent=STRING
     )* EOL;