Skip to content

Commit c0cba7d

Browse files
sheetalkamatsheetalkamat
committed
Support override
Fixes #868
1 parent 398fb82 commit c0cba7d

File tree

5 files changed

+136
-56
lines changed

5 files changed

+136
-56
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -531,19 +531,19 @@ repository:
531531
# as optional operator only if it is not followed by assignment or type annotation
532532
parameter-name:
533533
patterns:
534-
- match: '{{startOfIdentifier}}(public|protected|private|readonly)\s+(?=(public|protected|private|readonly)\s+)'
534+
- match: '{{startOfIdentifier}}(override|public|protected|private|readonly)\s+(?=(override|public|protected|private|readonly)\s+)'
535535
captures:
536536
'1': { name: storage.modifier.ts }
537537
- match: |-
538-
(?x)(?:{{startOfIdentifier}}(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)(?={{functionLikeAssignmentOrType}})
538+
(?x)(?:{{startOfIdentifier}}(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)(?={{functionLikeAssignmentOrType}})
539539
captures:
540540
'1': { name: storage.modifier.ts }
541541
'2': { name: keyword.operator.rest.ts }
542542
'3': { name: entity.name.function.ts variable.language.this.ts }
543543
'4': { name: entity.name.function.ts }
544544
'5': { name: keyword.operator.optional.ts }
545545
- match: |-
546-
(?x)(?:{{startOfIdentifier}}(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)
546+
(?x)(?:{{startOfIdentifier}}(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)
547547
captures:
548548
'1': { name: storage.modifier.ts }
549549
'2': { name: keyword.operator.rest.ts }
@@ -722,38 +722,41 @@ repository:
722722
patterns:
723723
# constructor signature
724724
- name: meta.method.declaration.ts
725-
begin: '(?x){{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:){{endOfIdentifier}}'
725+
begin: '(?x){{startOfIdentifier}}(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?\s*\b(constructor)\b(?!:){{endOfIdentifier}}'
726726
beginCaptures:
727-
'1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
728-
'2': { name: storage.modifier.ts } # captures keyword (abstract)
729-
'3': { name: storage.modifier.async.ts } # captures keyword (async)
730-
'4': { name: storage.type.ts } # captures keyword (constructor)
727+
'1': { name: storage.modifier.ts } # captures keyword (override)
728+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
729+
'3': { name: storage.modifier.ts } # captures keyword (abstract)
730+
'4': { name: storage.modifier.async.ts } # captures keyword (async)
731+
'5': { name: storage.type.ts } # captures keyword (constructor)
731732
end: (?=\}|;|,|$)|(?<=\})
732733
patterns:
733734
- include: '#method-declaration-name'
734735
- include: '#function-body'
735736
# new or call signature
736737
- name: meta.method.declaration.ts
737-
begin: '(?x){{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:){{endOfIdentifier}})|(?:(\*)\s*)?)(?=\s*({{typeParameters}})?[\(])'
738-
beginCaptures:
739-
'1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
740-
'2': { name: storage.modifier.ts } # captures keyword (abstract)
741-
'3': { name: storage.modifier.async.ts } # captures keyword (async)
742-
'4': { name: keyword.operator.new.ts } # captures keyword (new)
743-
'5': { name: keyword.generator.asterisk.ts } # captures keyword (*)
738+
begin: '(?x){{startOfIdentifier}}(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:(?:\s*\b(new)\b(?!:){{endOfIdentifier}})|(?:(\*)\s*)?)(?=\s*({{typeParameters}})?[\(])'
739+
beginCaptures:
740+
'1': { name: storage.modifier.ts } # captures keyword (override)
741+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
742+
'3': { name: storage.modifier.ts } # captures keyword (abstract)
743+
'4': { name: storage.modifier.async.ts } # captures keyword (async)
744+
'5': { name: keyword.operator.new.ts } # captures keyword (new)
745+
'6': { name: keyword.generator.asterisk.ts } # captures keyword (*)
744746
end: (?=\}|;|,|$)|(?<=\})
745747
patterns:
746748
- include: '#method-declaration-name'
747749
- include: '#function-body'
748750
# method, accessor
749751
- name: meta.method.declaration.ts
750-
begin: '(?x){{startOfIdentifier}}(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*({{propertyName}}\s*(\??))\s*({{typeParameters}})?[\(])'
751-
beginCaptures:
752-
'1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
753-
'2': { name: storage.modifier.ts } # captures keyword (abstract)
754-
'3': { name: storage.modifier.async.ts } # captures keyword (async)
755-
'4': { name: storage.type.property.ts } # captures keyword (get|set)
756-
'5': { name: keyword.generator.asterisk.ts } # captures keyword (*)
752+
begin: '(?x){{startOfIdentifier}}(?:\b(override)\s+)?(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=\s*({{propertyName}}\s*(\??))\s*({{typeParameters}})?[\(])'
753+
beginCaptures:
754+
'1': { name: storage.modifier.ts } # captures keyword (override)
755+
'2': { name: storage.modifier.ts } # captures keyword (public or private or protected)
756+
'3': { name: storage.modifier.ts } # captures keyword (abstract)
757+
'4': { name: storage.modifier.async.ts } # captures keyword (async)
758+
'5': { name: storage.type.property.ts } # captures keyword (get|set)
759+
'6': { name: keyword.generator.asterisk.ts } # captures keyword (*)
757760
end: (?=\}|;|,|$)|(?<=\})
758761
patterns:
759762
- include: '#method-declaration-name'
@@ -997,7 +1000,7 @@ repository:
9971000

9981001
access-modifier:
9991002
name: storage.modifier.ts
1000-
match: '{{startOfIdentifier}}(abstract|public|protected|private|readonly|static|declare){{endOfIdentifier}}'
1003+
match: '{{startOfIdentifier}}(abstract|declare|override|public|protected|private|readonly|static){{endOfIdentifier}}'
10011004

10021005
property-accessor:
10031006
name: storage.type.property.ts
@@ -1581,19 +1584,19 @@ repository:
15811584
- include: '#string'
15821585
- include: '#decorator'
15831586
- include: '#destructuring-parameter'
1584-
- match: '{{startOfIdentifier}}(public|protected|private|readonly)\s+(?=(public|protected|private|readonly)\s+)'
1587+
- match: '{{startOfIdentifier}}(override|public|protected|private|readonly)\s+(?=(override|public|protected|private|readonly)\s+)'
15851588
captures:
15861589
'1': { name: storage.modifier.ts }
15871590
- match: |-
1588-
(?x)(?:{{startOfIdentifier}}(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)(?={{functionLikeAssignmentOrType}})
1591+
(?x)(?:{{startOfIdentifier}}(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)(?={{functionLikeAssignmentOrType}})
15891592
captures:
15901593
'1': { name: storage.modifier.ts }
15911594
'2': { name: keyword.operator.rest.ts }
15921595
'3': { name: entity.name.function.ts variable.language.this.ts }
15931596
'4': { name: entity.name.function.ts }
15941597
'5': { name: keyword.operator.optional.ts }
15951598
- match: |-
1596-
(?x)(?:{{startOfIdentifier}}(public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)(?=\s*[:,]|$)
1599+
(?x)(?:{{startOfIdentifier}}(override|public|private|protected|readonly)\s+)?(?:(\.\.\.)\s*)?(?<!=|:){{startOfIdentifier}}(?:(this)|({{identifier}})){{endOfIdentifier}}\s*(\??)(?=\s*[:,]|$)
15971600
captures:
15981601
'1': { name: storage.modifier.ts }
15991602
'2': { name: keyword.operator.rest.ts }

‎TypeScript.tmLanguage‎

Lines changed: 30 additions & 15 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>
@@ -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>

0 commit comments

Comments
 (0)