marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-15 21:39:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #957 from GDFaber/master

Browse Source 
Flowchart parsing issue with CRLF #894
This commit is contained in:
Nacho
2019-09-27 09:12:19 -04:00
committed by GitHub
parent 490d42fce1 095233e6cf
commit f49bae6622
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dist/index.html vendored
View File

@@ -439,5 +439,18 @@ Class08 <--> C2: Cool label
}, 100) }, 100)
} }
</script> </script>
<script>
const testLineEndings = (test, input) => {
try {
mermaid.render(test, input, () => {});
} catch (err) {
console.error("Error in %s:\n\n%s", test, err);
}
};
testLineEndings("CR", "graph LR\rsubgraph CR\rA --> B\rend");
testLineEndings("LF", "graph LR\nsubgraph LF\nA --> B\nend");
testLineEndings("CRLF", "graph LR\r\nsubgraph CRLF\r\nA --> B\r\nend");
</script>
</body> </body>
</html> </html>

2
src/diagrams/flowchart/parser/flow.jison
View File

@@ -169,7 +169,7 @@
"{" return 'DIAMOND_START' "{" return 'DIAMOND_START'
"}" return 'DIAMOND_STOP' "}" return 'DIAMOND_STOP'
"\"" return 'QUOTE'; "\"" return 'QUOTE';
\n+ return 'NEWLINE'; (\r|\n|\r\n)+ return 'NEWLINE';
\s return 'SPACE'; \s return 'SPACE';
<<EOF>> return 'EOF'; <<EOF>> return 'EOF';