|
764 | 764 | <key>comment</key> |
765 | 765 | <string>(entity) {</string> |
766 | 766 | <key>begin</key> |
767 | | - <string>(?i)\s+([\w-]+)\s*(\[)?\s*((?:[\w-]+)|(?:"[\w\s-]+"))?\s*(\])?\s*({)</string> |
| 767 | + <string>(?i)\s*([\w-]+)\s*(\[)?\s*((?:[\w-]+)|(?:"[\w\s-]+"))?\s*(\])?\s*({)</string> |
768 | 768 | <key>beginCaptures</key> |
769 | 769 | <dict> |
770 | 770 | <key>1</key> |
|
797 | 797 | <array> |
798 | 798 | <dict> |
799 | 799 | <key>comment</key> |
800 | | - <string>(type) (name) (PK|FK)? ("comment")?</string> |
| 800 | + <string>(type) (name) (constraints)? ("comment")?</string> |
801 | 801 | <key>match</key> |
802 | | - <string>(?i)\s*([\w-]+)\s+([\w-]+)\s+(PK|FK)?\s*("["\($&%\^/#.,?!;:*+=<>\'\\\-\w\s]*")?\s*</string> |
| 802 | + <string>(?i)\s*([\w-]+)\s+([\w-]+)\s+([PFU]K(?:,\s*[PFU]K){0,2})?\s*("[^"\r\n]*")?\s*</string> |
803 | 803 | <key>captures</key> |
804 | 804 | <dict> |
805 | 805 | <key>1</key> |
|
1503 | 1503 | <key>comment</key> |
1504 | 1504 | <string>(Graph Link)("Multiline text")(Graph Link)</string> |
1505 | 1505 | <key>begin</key> |
1506 | | - <string>(?i)\s*((?:-{2,5}|={2,5})[xo>]?\|)</string> |
| 1506 | + <string>(?i)\s*((?:-?\.{1,4}-|-{2,5}|={2,5})[xo>]?\|)</string> |
1507 | 1507 | <key>beginCaptures</key> |
1508 | 1508 | <dict> |
1509 | 1509 | <key>1</key> |
|
1626 | 1626 | <key>comment</key> |
1627 | 1627 | <string>(Graph Link)</string> |
1628 | 1628 | <key>match</key> |
1629 | | - <string>(?i)\s*([ox<]?(?:-.{1,3}-|-{1,3}|={1,3})[ox>]?)</string> |
| 1629 | + <string>(?i)\s*([ox<]?(?:-?\.{1,4}-|-{1,4}|={1,4})[ox>]?)</string> |
1630 | 1630 | <key>captures</key> |
1631 | 1631 | <dict> |
1632 | 1632 | <key>1</key> |
|
2588 | 2588 | <key>name</key> |
2589 | 2589 | <string>comment</string> |
2590 | 2590 | </dict> |
| 2591 | + <dict> |
| 2592 | + <key>match</key> |
| 2593 | + <string>^(?i)\s*(direction)\s+(BT|RL|TB|LR)</string> |
| 2594 | + <key>captures</key> |
| 2595 | + <dict> |
| 2596 | + <key>1</key> |
| 2597 | + <dict> |
| 2598 | + <key>name</key> |
| 2599 | + <string>keyword.control.mermaid</string> |
| 2600 | + </dict> |
| 2601 | + <key>2</key> |
| 2602 | + <dict> |
| 2603 | + <key>name</key> |
| 2604 | + <string>entity.name.function.mermaid</string> |
| 2605 | + </dict> |
| 2606 | + </dict> |
| 2607 | + </dict> |
2591 | 2608 | <dict> |
2592 | 2609 | <key>comment</key> |
2593 | 2610 | <string>}</string> |
|
2628 | 2645 | <key>comment</key> |
2629 | 2646 | <string>(state) : (description)</string> |
2630 | 2647 | <key>match</key> |
2631 | | - <string>(?i)([\w-]+)\s+(:)\s+(\s*[-\w\s]+\b)</string> |
| 2648 | + <string>(?i)([\w-]+)\s*(:)\s*(\s*[^:]+)</string> |
2632 | 2649 | <key>captures</key> |
2633 | 2650 | <dict> |
2634 | 2651 | <key>1</key> |
|
2665 | 2682 | <array> |
2666 | 2683 | <dict> |
2667 | 2684 | <key>comment</key> |
2668 | | - <string>"(description)" as (state)</string> |
| 2685 | + <string>"(description)" as (state) ({)</string> |
2669 | 2686 | <key>match</key> |
2670 | | - <string>(?i)\s*("[-\w\s]+\b")\s+(as)\s+([\w-]+)</string> |
| 2687 | + <string>(?i)\s*("[^"]+")\s*(as)\s+([\w-]+)\s*({)?</string> |
2671 | 2688 | <key>captures</key> |
2672 | 2689 | <dict> |
2673 | 2690 | <key>1</key> |
|
2685 | 2702 | <key>name</key> |
2686 | 2703 | <string>variable</string> |
2687 | 2704 | </dict> |
| 2705 | + <key>4</key> |
| 2706 | + <dict> |
| 2707 | + <key>name</key> |
| 2708 | + <string>keyword.control.mermaid</string> |
| 2709 | + </dict> |
2688 | 2710 | </dict> |
2689 | 2711 | </dict> |
2690 | 2712 | <dict> |
2691 | 2713 | <key>comment</key> |
2692 | | - <string>(state name) {</string> |
| 2714 | + <string>(state name) ({)</string> |
2693 | 2715 | <key>match</key> |
2694 | 2716 | <string>(?i)\s*([\w-]+)\s+({)</string> |
2695 | 2717 | <key>captures</key> |
|
2733 | 2755 | <key>comment</key> |
2734 | 2756 | <string>(state) --></string> |
2735 | 2757 | <key>begin</key> |
2736 | | - <string>(?i)([\w-]+)\s+(-->)</string> |
| 2758 | + <string>(?i)([\w-]+)\s*(-->)</string> |
2737 | 2759 | <key>beginCaptures</key> |
2738 | 2760 | <dict> |
2739 | 2761 | <key>1</key> |
|
2753 | 2775 | <key>comment</key> |
2754 | 2776 | <string>(state) (:)? (transition text)?</string> |
2755 | 2777 | <key>match</key> |
2756 | | - <string>(?i)\s+([\w-]+)\s*(:)?\s*([^\n:]+)?</string> |
| 2778 | + <string>(?i)\s*([\w-]+)\s*(:)?\s*([^\n:]+)?</string> |
2757 | 2779 | <key>captures</key> |
2758 | 2780 | <dict> |
2759 | 2781 | <key>1</key> |
|
2805 | 2827 | <key>comment</key> |
2806 | 2828 | <string>[*] --> (state) (:)? (transition text)?</string> |
2807 | 2829 | <key>match</key> |
2808 | | - <string>(?i)(\[\*\])\s+(-->)\s+([\w-]+)\s*(:)?\s*([^\n:]+)?</string> |
| 2830 | + <string>(?i)(\[\*\])\s*(-->)\s*([\w-]+)\s*(:)?\s*([^\n:]+)?</string> |
2809 | 2831 | <key>captures</key> |
2810 | 2832 | <dict> |
2811 | 2833 | <key>1</key> |
|
2839 | 2861 | <key>comment</key> |
2840 | 2862 | <string>note left|right of (state name)</string> |
2841 | 2863 | <key>match</key> |
2842 | | - <string>(?i)^\s*(note (?:left|right) of)\s+([\w-]+)\s+(:)\s*([^\n:]+)</string> |
| 2864 | + <string>(?i)^\s*(note (?:left|right) of)\s+([\w-]+)\s*(:)\s*([^\n:]+)</string> |
2843 | 2865 | <key>captures</key> |
2844 | 2866 | <dict> |
2845 | 2867 | <key>1</key> |
|
0 commit comments