Skip to content

Commit fe400e6

Browse files
DanielRosenwasserDanielRosenwasser
committed
Update grammar files.
1 parent e45e059 commit fe400e6

File tree

2 files changed

+98
-48
lines changed

2 files changed

+98
-48
lines changed

‎TypeScript.tmLanguage

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,7 @@
14441444
<array>
14451445
<dict>
14461446
<key>match</key>
1447-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|protected|private|readonly)\s+(?=(public|protected|private|readonly)\s+)</string>
1447+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(override|public|protected|private|readonly)\s+(?=(override|public|protected|private|readonly)\s+)</string>
14481448
<key>captures</key>
14491449
<dict>
14501450
<key>1</key>
@@ -1456,7 +1456,7 @@
14561456
</dict>
14571457
<dict>
14581458
<key>match</key>
1459-
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
1459+
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
14601460
# function assignment |
14611461
(=\s*(
14621462
((async\s+)?(
@@ -1557,7 +1557,7 @@
15571557
</dict>
15581558
<dict>
15591559
<key>match</key>
1560-
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)</string>
1560+
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)</string>
15611561
<key>captures</key>
15621562
<dict>
15631563
<key>1</key>
@@ -2223,7 +2223,7 @@
22232223
<key>name</key>
22242224
<string>meta.method.declaration.ts</string>
22252225
<key>begin</key>
2226-
<string>(?x)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
2226+
<string>(?x)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
22272227
<key>beginCaptures</key>
22282228
<dict>
22292229
<key>1</key>
@@ -2239,9 +2239,14 @@
22392239
<key>3</key>
22402240
<dict>
22412241
<key>name</key>
2242-
<string>storage.modifier.async.ts</string>
2242+
<string>storage.modifier.ts</string>
22432243
</dict>
22442244
<key>4</key>
2245+
<dict>
2246+
<key>name</key>
2247+
<string>storage.modifier.async.ts</string>
2248+
</dict>
2249+
<key>5</key>
22452250
<dict>
22462251
<key>name</key>
22472252
<string>storage.type.ts</string>
@@ -2265,7 +2270,7 @@
22652270
<key>name</key>
22662271
<string>meta.method.declaration.ts</string>
22672272
<key>begin</key>
2268-
<string>(?x)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=&lt;&gt;]|=[^&lt;])*\&gt;)*\&gt;)*&gt;\s*))?[\(])</string>
2273+
<string>(?x)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.)))|(?:(\*)\s*)?)(?=\s*((&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=&lt;&gt;]|=[^&lt;]|\&lt;\s*([_$[:alpha:]]|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\]))([^=&lt;&gt;]|=[^&lt;])*\&gt;)*\&gt;)*&gt;\s*))?[\(])</string>
22692274
<key>beginCaptures</key>
22702275
<dict>
22712276
<key>1</key>
@@ -2281,14 +2286,19 @@
22812286
<key>3</key>
22822287
<dict>
22832288
<key>name</key>
2284-
<string>storage.modifier.async.ts</string>
2289+
<string>storage.modifier.ts</string>
22852290
</dict>
22862291
<key>4</key>
22872292
<dict>
22882293
<key>name</key>
2289-
<string>keyword.operator.new.ts</string>
2294+
<string>storage.modifier.async.ts</string>
22902295
</dict>
22912296
<key>5</key>
2297+
<dict>
2298+
<key>name</key>
2299+
<string>keyword.operator.new.ts</string>
2300+
</dict>
2301+
<key>6</key>
22922302
<dict>
22932303
<key>name</key>
22942304
<string>keyword.generator.asterisk.ts</string>
@@ -2312,7 +2322,7 @@
23122322
<key>name</key>
23132323
<string>meta.method.declaration.ts</string>
23142324
<key>begin</key>
2315-
<string>(?x)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?&lt;!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?&lt;!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?&lt;!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?&lt;!\$)(?:
2325+
<string>(?x)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*(((\b(?&lt;!\$)0(?:x|X)[0-9a-fA-F][0-9a-fA-F_]*(n)?\b(?!\$))|(\b(?&lt;!\$)0(?:b|B)[01][01_]*(n)?\b(?!\$))|(\b(?&lt;!\$)0(?:o|O)?[0-7][0-7_]*(n)?\b(?!\$))|((?&lt;!\$)(?:
23162326
(?:\b[0-9][0-9_]*(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.1E+3
23172327
(?:\b[0-9][0-9_]*(\.)[eE][+-]?[0-9][0-9_]*(n)?\b)| # 1.E+3
23182328
(?:\B(\.)[0-9][0-9_]*[eE][+-]?[0-9][0-9_]*(n)?\b)| # .1E+3
@@ -2337,14 +2347,19 @@
23372347
<key>3</key>
23382348
<dict>
23392349
<key>name</key>
2340-
<string>storage.modifier.async.ts</string>
2350+
<string>storage.modifier.ts</string>
23412351
</dict>
23422352
<key>4</key>
23432353
<dict>
23442354
<key>name</key>
2345-
<string>storage.type.property.ts</string>
2355+
<string>storage.modifier.async.ts</string>
23462356
</dict>
23472357
<key>5</key>
2358+
<dict>
2359+
<key>name</key>
2360+
<string>storage.type.property.ts</string>
2361+
</dict>
2362+
<key>6</key>
23482363
<dict>
23492364
<key>name</key>
23502365
<string>keyword.generator.asterisk.ts</string>
@@ -3151,7 +3166,7 @@
31513166
<key>name</key>
31523167
<string>storage.modifier.ts</string>
31533168
<key>match</key>
3154-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(abstract|public|protected|private|readonly|static|declare)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
3169+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(abstract|declare|override|public|protected|private|readonly|static)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
31553170
</dict>
31563171
<key>property-accessor</key>
31573172
<dict>
@@ -4168,7 +4183,7 @@
41684183
<key>name</key>
41694184
<string>string.regexp.ts</string>
41704185
<key>begin</key>
4171-
<string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
4186+
<string>(?&lt;=\))\s*\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
41724187
<key>beginCaptures</key>
41734188
<dict>
41744189
<key>0</key>
@@ -4178,7 +4193,7 @@
41784193
</dict>
41794194
</dict>
41804195
<key>end</key>
4181-
<string>(/)([gimsuy]*)</string>
4196+
<string>(/)([dgimsuy]*)</string>
41824197
<key>endCaptures</key>
41834198
<dict>
41844199
<key>1</key>
@@ -5073,7 +5088,7 @@
50735088
</dict>
50745089
<dict>
50755090
<key>match</key>
5076-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|protected|private|readonly)\s+(?=(public|protected|private|readonly)\s+)</string>
5091+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(override|public|protected|private|readonly)\s+(?=(override|public|protected|private|readonly)\s+)</string>
50775092
<key>captures</key>
50785093
<dict>
50795094
<key>1</key>
@@ -5085,7 +5100,7 @@
50855100
</dict>
50865101
<dict>
50875102
<key>match</key>
5088-
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
5103+
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*
50895104
# function assignment |
50905105
(=\s*(
50915106
((async\s+)?(
@@ -5186,7 +5201,7 @@
51865201
</dict>
51875202
<dict>
51885203
<key>match</key>
5189-
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*[:,]|$)</string>
5204+
<string>(?x)(?:(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?&lt;!=|:)(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(this)|([_$[:alpha:]][_$[:alnum:]]*))(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))\s*(\??)(?=\s*[:,]|$)</string>
51905205
<key>captures</key>
51915206
<dict>
51925207
<key>1</key>
@@ -5648,7 +5663,7 @@
56485663
</dict>
56495664
</dict>
56505665
<key>end</key>
5651-
<string>(?=[,);}\]=&gt;]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))</string>
5666+
<string>(?=[,);}\]=&gt;:&amp;|{\?]|$|;|^\s*$|(?:^\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\b))</string>
56525667
<key>patterns</key>
56535668
<array>
56545669
<dict>
@@ -7424,10 +7439,15 @@
74247439
<array>
74257440
<dict>
74267441
<key>begin</key>
7427-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(new)\b(?=\s*\&lt;)</string>
7442+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(abstract)\s+)?(new)\b(?=\s*\&lt;)</string>
74287443
<key>beginCaptures</key>
74297444
<dict>
74307445
<key>1</key>
7446+
<dict>
7447+
<key>name</key>
7448+
<string>meta.type.constructor.ts storage.modifier.ts</string>
7449+
</dict>
7450+
<key>2</key>
74317451
<dict>
74327452
<key>name</key>
74337453
<string>meta.type.constructor.ts keyword.control.new.ts</string>
@@ -7451,10 +7471,15 @@
74517471
<key>name</key>
74527472
<string>meta.type.constructor.ts</string>
74537473
<key>begin</key>
7454-
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(new)\b\s*(?=\()</string>
7474+
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(abstract)\s+)?(new)\b\s*(?=\()</string>
74557475
<key>beginCaptures</key>
74567476
<dict>
74577477
<key>1</key>
7478+
<dict>
7479+
<key>name</key>
7480+
<string>storage.modifier.ts</string>
7481+
</dict>
7482+
<key>2</key>
74587483
<dict>
74597484
<key>name</key>
74607485
<string>keyword.control.new.ts</string>
@@ -8227,7 +8252,7 @@
82278252
<key>name</key>
82288253
<string>string.regexp.ts</string>
82298254
<key>begin</key>
8230-
<string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
8255+
<string>(?&lt;!\+\+|--|})(?&lt;=[=(:,\[?+!]|^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case|=&gt;|&amp;&amp;|\|\||\*\/)\s*(\/)(?![\/*])(?=(?:[^\/\\\[\()]|\\.|\[([^\]\\]|\\.)+\]|\(([^\)\\]|\\.)+\))+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
82318256
<key>beginCaptures</key>
82328257
<dict>
82338258
<key>1</key>
@@ -8237,7 +8262,7 @@
82378262
</dict>
82388263
</dict>
82398264
<key>end</key>
8240-
<string>(/)([gimsuy]*)</string>
8265+
<string>(/)([dgimsuy]*)</string>
82418266
<key>endCaptures</key>
82428267
<dict>
82438268
<key>1</key>
@@ -8263,7 +8288,7 @@
82638288
<key>name</key>
82648289
<string>string.regexp.ts</string>
82658290
<key>begin</key>
8266-
<string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([gimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
8291+
<string>((?&lt;![_$[:alnum:])\]]|\+\+|--|}|\*\/)|((?&lt;=^return|[^\._$[:alnum:]]return|^case|[^\._$[:alnum:]]case))\s*)\/(?![\/*])(?=(?:[^\/\\\[]|\\.|\[([^\]\\]|\\.)*\])+\/([dgimsuy]+|(?![\/\*])|(?=\/\*))(?!\s*[a-zA-Z0-9_$]))</string>
82678292
<key>beginCaptures</key>
82688293
<dict>
82698294
<key>0</key>
@@ -8273,7 +8298,7 @@
82738298
</dict>
82748299
</dict>
82758300
<key>end</key>
8276-
<string>(/)([gimsuy]*)</string>
8301+
<string>(/)([dgimsuy]*)</string>
82778302
<key>endCaptures</key>
82788303
<dict>
82798304
<key>1</key>

0 commit comments

Comments
 (0)