Skip to content

Commit 9756824

Browse files
committed
fixed attribute parsing in properties methods and events
1 parent 326bf67 commit 9756824

File tree

1 file changed

+59
-7
lines changed

1 file changed

+59
-7
lines changed

Matlab.tmbundle/Syntaxes/MATLAB.tmLanguage

Lines changed: 59 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,12 @@
991991
<dict>
992992
<key>patterns</key>
993993
<array>
994+
<dict>
995+
<key>name</key>
996+
<string>punctuation.separator.modifier.comma.matlab</string>
997+
<key>match</key>
998+
<string>,</string>
999+
</dict>
9941000
<dict>
9951001
<key>name</key>
9961002
<string>storage.modifier.properties.matlab</string>
@@ -1009,7 +1015,7 @@
10091015
</dict>
10101016
</dict>
10111017
<key>end</key>
1012-
<string>,|(?=\))</string>
1018+
<string>(?=\)|,)</string>
10131019
<key>patterns</key>
10141020
<array>
10151021
<dict>
@@ -1022,7 +1028,17 @@
10221028
<key>name</key>
10231029
<string>storage.modifier.access.matlab</string>
10241030
<key>match</key>
1025-
<string>public|protected|private</string>
1031+
<string>public|protected|private|immutable</string>
1032+
</dict>
1033+
<dict>
1034+
<key>include</key>
1035+
<string>#curly_brackets</string>
1036+
</dict>
1037+
<dict>
1038+
<key>name</key>
1039+
<string>constant.integer.matlab</string>
1040+
<key>match</key>
1041+
<string>[0-9]+</string>
10261042
</dict>
10271043
</array>
10281044
</dict>
@@ -1075,6 +1091,12 @@
10751091
<dict>
10761092
<key>patterns</key>
10771093
<array>
1094+
<dict>
1095+
<key>name</key>
1096+
<string>punctuation.separator.modifier.comma.matlab</string>
1097+
<key>match</key>
1098+
<string>,</string>
1099+
</dict>
10781100
<dict>
10791101
<key>name</key>
10801102
<string>storage.modifier.methods.matlab</string>
@@ -1083,9 +1105,17 @@
10831105
</dict>
10841106
<dict>
10851107
<key>begin</key>
1086-
<string>=\s*</string>
1108+
<string>(=)\s*</string>
10871109
<key>end</key>
1088-
<string>,|(?=\))</string>
1110+
<string>(?=\)|,)</string>
1111+
<key>beginCaptures</key>
1112+
<dict>
1113+
<key>1</key>
1114+
<dict>
1115+
<key>name</key>
1116+
<string>keyword.operator.assignment.matlab</string>
1117+
</dict>
1118+
</dict>
10891119
<key>patterns</key>
10901120
<array>
10911121
<dict>
@@ -1100,6 +1130,10 @@
11001130
<key>match</key>
11011131
<string>public|protected|private</string>
11021132
</dict>
1133+
<dict>
1134+
<key>include</key>
1135+
<string>#curly_brackets</string>
1136+
</dict>
11031137
</array>
11041138
</dict>
11051139
</array>
@@ -1149,15 +1183,29 @@
11491183
<array>
11501184
<dict>
11511185
<key>name</key>
1152-
<string>variable.parameter.events.matlab</string>
1186+
<string>punctuation.separator.modifier.comma.matlab</string>
1187+
<key>match</key>
1188+
<string>,</string>
1189+
</dict>
1190+
<dict>
1191+
<key>name</key>
1192+
<string>storage.modifier.events.matlab</string>
11531193
<key>match</key>
11541194
<string>[a-zA-Z][a-zA-Z0-9_]*</string>
11551195
</dict>
11561196
<dict>
11571197
<key>begin</key>
1158-
<string>=\s*</string>
1198+
<string>(=)\s*</string>
1199+
<key>beginCaptures</key>
1200+
<dict>
1201+
<key>1</key>
1202+
<dict>
1203+
<key>name</key>
1204+
<string>keyword.operator.assignment.matlab</string>
1205+
</dict>
1206+
</dict>
11591207
<key>end</key>
1160-
<string>,|(?=\))</string>
1208+
<string>(?=\)|,)</string>
11611209
<key>patterns</key>
11621210
<array>
11631211
<dict>
@@ -1172,6 +1220,10 @@
11721220
<key>match</key>
11731221
<string>public|protected|private</string>
11741222
</dict>
1223+
<dict>
1224+
<key>include</key>
1225+
<string>#curly_brackets</string>
1226+
</dict>
11751227
</array>
11761228
</dict>
11771229
</array>

0 commit comments

Comments
 (0)