marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-22 16:59:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a regression with classDiagram supporting comments

Browse Source
This commit is contained in:
chris moran
2020-07-27 07:38:12 -04:00
parent c4ad95760a
commit 1fc142a59f
2 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/diagrams/class/parser/classDiagram.jison
View File

@@ -17,11 +17,11 @@
<type_directive>":" { this.popState(); this.begin('arg_directive'); return ':'; }
<type_directive,arg_directive>\}\%\% { this.popState(); this.popState(); return 'close_directive'; }
<arg_directive>((?:(?!\}\%\%).|\n)*) return 'arg_directive';
\%%(?!\{)[^\n]* /* skip comments */
[^\}]\%\%[^\n]* /* skip comments */
\%\%[^\n]*\n* /* do nothing */
\n+ return 'NEWLINE';
\s+ /* skip whitespace */
\%\%(?!\{)*[^\n]* /* skip comments */
[^\}]\%\%*[^\n]* /* skip comments */
\%\%*[^\n]*[\n]* /* do nothing */
[\n]+ return 'NEWLINE';
[\s]+ /* skip whitespace */
"classDiagram-v2" return 'CLASS_DIAGRAM';
"classDiagram" return 'CLASS_DIAGRAM';
[\{] { this.begin("struct"); /*console.log('Starting struct');*/return 'STRUCT_START';}
@@ -146,11 +146,15 @@ mermaidDoc
;
graphConfig
: CLASS_DIAGRAM NEWLINE statements EOF
: NEWLINE
| NEWLINE graphConfig
| graphConfig NEWLINE
| CLASS_DIAGRAM NEWLINE statements EOF
;
statements
: statement
| NEWLINE statement
| statement NEWLINE
| statement NEWLINE statements
;