marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-20 16:56:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added keywords as valid text token, fix for issue #8

Browse Source
This commit is contained in:
knsv
2014-12-03 07:49:41 +01:00
parent 7b09a6d1bf
commit 0539b8a74e
3 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/parser/flow.jison
View File

@@ -264,9 +264,12 @@ textToken: ALPHA
{$$ = $1;} {$$ = $1;}
| MINUS | MINUS
{$$ = $1;} {$$ = $1;}
| DIR | keywords
{$$ = $1;} {$$ = $1;}
; ;
keywords
: STYLE | LINKSTYLE | CLASSDEF | CLASS | CLICK | GRAPH | DIR;
textNoTags: textNoTagsToken textNoTags: textNoTagsToken
{$$=$1;} {$$=$1;}
@@ -296,7 +299,7 @@ textNoTagsToken: ALPHA
{$$ = $1;} {$$ = $1;}
| MINUS | MINUS
{$$ = $1;} {$$ = $1;}
| DIR | keywords
{$$ = $1;} {$$ = $1;}
; ;

44
src/parser/flow.js
View File

File diff suppressed because one or more lines are too long

9
src/parser/flow.spec.js
View File

@@ -98,6 +98,15 @@ describe('when parsing ',function(){
expect(edges[0].type).toBe('arrow_cross'); expect(edges[0].type).toBe('arrow_cross');
expect(edges[0].text).toBe('text including URL space'); expect(edges[0].text).toBe('text including URL space');
});
it('should handle text on edges with graph keyword',function(){
var res = flow.parser.parse('graph TD;A--x|text including graph space|B;');
var vert = flow.parser.yy.getVertices();
var edges = flow.parser.yy.getEdges();
expect(edges[0].text).toBe('text including graph space');
}); });
it('should handle multi-line text',function(){ it('should handle multi-line text',function(){
var res = flow.parser.parse('graph TD;A--o|text space|B;\n B-->|more text with space|C;'); var res = flow.parser.parse('graph TD;A--o|text space|B;\n B-->|more text with space|C;');