Merge pull request #1281 from mermaid-js/feature/1249_BlockComments

Multiline comments

Author: erelling

src/diagrams/class/parser/classDiagram.jison

@@ -9,7 +9,8 @@
 %x string generic struct
 
 %%
-\%\%[^\n]*\n*           /* do nothing */
+\%\%[^\n]*\n*           /* skip comments */
+\%\%\*((.|\n)*)\*\%\%   /* multiline skip comments */
 \n+                   return 'NEWLINE';
 \s+                     /* skip whitespace */
 "classDiagram"          return 'CLASS_DIAGRAM';

src/diagrams/flowchart/parser/flow.jison

@@ -10,7 +10,8 @@
 %x dir
 %x vertex
 %%
-\%\%[^\n]*\n*           /* do nothing */
+\%\%[^\n]*\n*           /* skip comments */
+\%\%\*((.|\n)*)\*\%\%   /* multiline skip comments */
 ["]                     this.begin("string");
 <string>["]             this.popState();
 <string>[^"]*           return "STR";

src/diagrams/gantt/parser/gantt.jison

@@ -17,6 +17,7 @@
 \s+                     /* skip whitespace */
 \#[^\n]*                /* skip comments */
 \%%[^\n]*               /* skip comments */
+\%\%\*((.|\n)*)\*\%\%   /* multiline skip comments */
 
 /*
 ---interactivity command---

src/diagrams/git/parser/gitGraph.jison

@@ -18,6 +18,7 @@
 \s+                             /* skip all whitespace */
 \#[^\n]*                        /* skip comments */
 \%%[^\n]*                       /* skip comments */
+\%\%\*((.|\n)*)\*\%\%           /* multiline skip comments */
 "gitGraph"                      return 'GG';
 "commit"                        return 'COMMIT';
 "branch"                        return 'BRANCH';

src/diagrams/pie/parser/pie.jison

@@ -12,7 +12,8 @@
 %}
 
 %%
-\%\%[^\n]*               /* do nothing */
+\%\%[^\n]*               /* skip comments */
+\%\%\*((.|\n)*)\*\%\%    /* multiline skip comments */
 \s+                      /* skip whitespace */
 "pie"		             return 'pie'    ;
 [\s\n\r]+                 return 'NL'      ;

src/diagrams/sequence/parser/sequenceDiagram.jison

@@ -26,6 +26,7 @@
 <ID,ALIAS,LINE>((?!\n)\s)+       /* skip same-line whitespace */
 <INITIAL,ID,ALIAS,LINE>\#[^\n]*  /* skip comments */
 \%%[^\n]*                        /* skip comments */
+\%\%\*((.|\n)*)\*\%\%     		 /* multiline skip comments */
 "participant"     { this.begin('ID'); return 'participant'; }
 <ID>[^\->:\n,;]+?(?=((?!\n)\s)+"as"(?!\n)\s|[#\n;]|$)  { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; }
 <ALIAS>"as"       { this.popState(); this.popState(); this.begin('LINE'); return 'AS'; }

src/diagrams/state/parser/stateDiagram.jison

@@ -33,10 +33,11 @@
 %%
 
 [\n]+                            return 'NL';
-\s+                              /* skip all whitespace */
+\s+                                     /* skip all whitespace */
 <ID,STATE,struct,LINE>((?!\n)\s)+       /* skip same-line whitespace */
 <INITIAL,ID,STATE,struct,LINE>\#[^\n]*  /* skip comments */
-\%%[^\n]*                        /* skip comments */
+\%%[^\n]*                               /* skip comments */
+\%\%\*((.|\n)*)\*\%\%                   /* multiline skip comments */
 
 "scale"\s+            { this.pushState('SCALE'); /* console.log('Got scale', yytext);*/ return 'scale'; }
 <SCALE>\d+            return 'WIDTH';