Release 8.13.2

Fix for broken test
Merge branch '2292_Class_Diagram_curly_brace_space_issue' into release/8.13.2
2025-10-03 22:29:38 +02:00 · 2021-09-29 20:22:45 +02:00 · 2021-09-29 20:20:44 +02:00 · 2021-09-29 20:06:32 +02:00 · 2021-09-29 17:13:14 +02:00
9 changed files with 23 additions and 16 deletions
--- a/cypress/integration/rendering/classDiagram-v2.spec.js
+++ b/cypress/integration/rendering/classDiagram-v2.spec.js
@@ -375,7 +375,7 @@ describe('Class diagram V2', () => {
    imgSnapshotTest(
      `
    classDiagram-v2
-      Foo {
+      class Foo {
        +String bar$
      }
            `,
@@ -408,7 +408,7 @@ describe('Class diagram V2', () => {
    );
    cy.get('svg');
  });
-  
+
  it('18: should handle the direction statemnent with LR', () => {
    imgSnapshotTest(
      `
--- a/dist/mermaid.core.js
+++ b/dist/mermaid.core.js
--- a/dist/mermaid.core.js.map
+++ b/dist/mermaid.core.js.map
--- a/dist/mermaid.js
+++ b/dist/mermaid.js
--- a/dist/mermaid.js.map
+++ b/dist/mermaid.js.map
--- a/dist/mermaid.min.js
+++ b/dist/mermaid.min.js
--- a/dist/mermaid.min.js.map
+++ b/dist/mermaid.min.js.map
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mermaid",
-  "version": "8.13.0",
+  "version": "8.13.2",
  "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
  "main": "dist/mermaid.core.js",
  "keywords": [
--- a/src/diagrams/class/parser/classDiagram.jison
+++ b/src/diagrams/class/parser/classDiagram.jison
@@ -29,7 +29,8 @@
 <arg_directive>((?:(?!\}\%\%).|\n)*)                            return 'arg_directive';
 \%\%(?!\{)*[^\n]*(\r?\n?)+                                      /* skip comments */
 \%\%[^\n]*(\r?\n)*                                              /* skip comments */
-(\r?\n)+                return 'NEWLINE';
+
+\s*(\r?\n)+                return 'NEWLINE';
 \s+                     /* skip whitespace */
 "classDiagram-v2"       return 'CLASS_DIAGRAM';
 "classDiagram"          return 'CLASS_DIAGRAM';
@@ -262,7 +263,7 @@ classStatement
    ;

 annotationStatement
-    : ANNOTATION_START alphaNumToken ANNOTATION_END className  { yy.addAnnotation($4,$2); }
+    :ANNOTATION_START alphaNumToken ANNOTATION_END className  { yy.addAnnotation($4,$2); }
    ;

 members
Author	SHA1	Message	Date
Knut Sveidqvist	2758d64778	Release 8.13.2	2021-09-29 20:22:45 +02:00
Knut Sveidqvist	8ee3155f2a	Fix for broken test	2021-09-29 20:20:44 +02:00
Ashish Jain	cb2294d6f2	Merge branch '2292_Class_Diagram_curly_brace_space_issue' into release/8.13.2	2021-09-29 20:06:32 +02:00
Ashish Jain	55eebd9309	2292 Fix for broken class diagram on space after the '{' curly brace	2021-09-29 17:13:14 +02:00