Skip to content

Commit 2b9b377

Browse files
committed
bump vscode-mermaid-syntax-highlight to 1.6.0
1 parent 5cd346c commit 2b9b377

File tree

1 file changed

+55
-6
lines changed

1 file changed

+55
-6
lines changed

MermaidEditor/Syntaxes/Mermaid/mermaid.tmLanguage

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<key>comment</key>
9191
<string>(class name) : (visibility)?(function)( (function param/generic param)? )(classifier)? (return/generic return)?$</string>
9292
<key>match</key>
93-
<string>([\w-]+)\s?(:)\s([\+~#-])?([\w-]+)(\()([\w-]+)?(~)?([\w-]+)?(~)?\s?([\w-]+)?(\))([*\$])?\s?([\w-]+)?(~)?([\w-]+)?(~)?$</string>
93+
<string>([\w-]+)\s?(:)\s([\+~#-])?([\w-]+)(\()([\w-]+)?(~)?([\w-]+)?(~)?\s?([\w-]+)?(\))([*\$]{0,2})\s?([\w-]+)?(~)?([\w-]+)?(~)?$</string>
9494
<key>captures</key>
9595
<dict>
9696
<key>1</key>
@@ -360,7 +360,7 @@
360360
</dict>
361361
</array>
362362
<key>end</key>
363-
<string>(\))([*\$])?\s?([\w-]+)?(~)?([\w-]+)?(~)?$</string>
363+
<string>(\))([*\$]{0,2})\s?([\w-]+)?(~)?([\w-]+)?(~)?$</string>
364364
<key>endCaptures</key>
365365
<dict>
366366
<key>1</key>
@@ -546,7 +546,7 @@
546546
<key>comment</key>
547547
<string>(entity) {</string>
548548
<key>begin</key>
549-
<string>\s+([\w-]+)\s+({)</string>
549+
<string>\s+([\w-]+)\s*({)</string>
550550
<key>beginCaptures</key>
551551
<dict>
552552
<key>1</key>
@@ -591,6 +591,12 @@
591591
</dict>
592592
</dict>
593593
</dict>
594+
<dict>
595+
<key>match</key>
596+
<string>\%%.*</string>
597+
<key>name</key>
598+
<string>comment</string>
599+
</dict>
594600
</array>
595601
<key>end</key>
596602
<string>(})</string>
@@ -607,7 +613,7 @@
607613
<key>comment</key>
608614
<string>(entity) (relationship) (entity) : (label)</string>
609615
<key>match</key>
610-
<string>\s*([\w-]+)\s+((?:\|o|\|\||}o|}\|)(?:..|--)(?:o\||\|\||o{|\|{))\s+([\w-]+)\s+(:)\s+((?:"[\w\s]*")|(?:[\w-]+))</string>
616+
<string>\s*([\w-]+)\s*((?:\|o|\|\||}o|}\||one or (?:zero|more|many)|zero or (?:one|more|many)|many\((?:0|1)\)|only one|0\+|1\+?)(?:..|--)(?:o\||\|\||o{|\|{|one or (?:zero|more|many)|zero or (?:one|more|many)|many\((?:0|1)\)|only one|0\+|1\+?))\s*([\w-]+)\s*(:)\s*((?:"[\w\s]*")|(?:[\w-]+))</string>
611617
<key>captures</key>
612618
<dict>
613619
<key>1</key>
@@ -1662,9 +1668,9 @@
16621668
</dict>
16631669
<dict>
16641670
<key>comment</key>
1665-
<string>(alt/else/opt/par/and/autonumber)(text)</string>
1671+
<string>(alt/else/option/par/and/autonumber/critical/opt)(text)</string>
16661672
<key>match</key>
1667-
<string>\s*(alt|else|opt|par|and|rect|autonumber)(?:\s+([^#;]*))?</string>
1673+
<string>\s*(alt|else|option|par|and|rect|autonumber|critical|opt)(?:\s+([^#;]*))?</string>
16681674
<key>captures</key>
16691675
<dict>
16701676
<key>1</key>
@@ -1713,6 +1719,49 @@
17131719
</dict>
17141720
</dict>
17151721
</dict>
1722+
<dict>
1723+
<key>comment</key>
1724+
<string>(box transparent text)</string>
1725+
<key>match</key>
1726+
<string>\s*(box)\s+(transparent)(?:\s+([^;#]*))?</string>
1727+
<key>captures</key>
1728+
<dict>
1729+
<key>1</key>
1730+
<dict>
1731+
<key>name</key>
1732+
<string>keyword.control.mermaid</string>
1733+
</dict>
1734+
<key>2</key>
1735+
<dict>
1736+
<key>name</key>
1737+
<string>entity.name.function.mermaid</string>
1738+
</dict>
1739+
<key>3</key>
1740+
<dict>
1741+
<key>name</key>
1742+
<string>string</string>
1743+
</dict>
1744+
</dict>
1745+
</dict>
1746+
<dict>
1747+
<key>comment</key>
1748+
<string>(box text)</string>
1749+
<key>match</key>
1750+
<string>\s*(box)(?:\s+([^;#]*))?</string>
1751+
<key>captures</key>
1752+
<dict>
1753+
<key>1</key>
1754+
<dict>
1755+
<key>name</key>
1756+
<string>keyword.control.mermaid</string>
1757+
</dict>
1758+
<key>2</key>
1759+
<dict>
1760+
<key>name</key>
1761+
<string>string</string>
1762+
</dict>
1763+
</dict>
1764+
</dict>
17161765
</array>
17171766
<key>end</key>
17181767
<string>(^|\G)(?=\s*[`:~]{3,}\s*$)</string>

0 commit comments

Comments
 (0)