Skip to content

Commit 6fe1b65

Browse files
sheetalkamatsheetalkamat
committed
Fix the computerd property name regex when there is template string containing []
Fixes #359
1 parent ad57425 commit 6fe1b65

File tree

5 files changed

+211
-39
lines changed

5 files changed

+211
-39
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ repository:
107107
object-binding-element:
108108
patterns:
109109
- include: '#comment'
110-
- begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))
110+
- begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))
111111
end: (?=,|\})
112112
patterns:
113113
- include: '#object-binding-element-propertyName'
@@ -118,7 +118,7 @@ repository:
118118
- include: '#punctuation-comma'
119119

120120
object-binding-element-propertyName:
121-
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))
121+
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))
122122
end: (:)
123123
endCaptures:
124124
'0': { name: punctuation.destructuring.ts }
@@ -294,7 +294,7 @@ repository:
294294
patterns:
295295
- include: '#comment'
296296
- include: '#variable-initializer'
297-
- begin: (?=((\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\])))
297+
- begin: (?=((\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\])))
298298
end: (?=,|\}|$)
299299
patterns:
300300
- include: '#string'
@@ -521,13 +521,13 @@ repository:
521521

522522
field-declaration:
523523
name: meta.field.declaration.ts
524-
begin: (?<!\()(?:(?<!\.|\$)\b(readonly)\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\?\s*)?(=|:))
524+
begin: (?<!\()(?:(?<!\.|\$)\b(readonly)\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))
525525
beginCaptures:
526526
'1': { name: storage.modifier.ts }
527527
end: '(?=\}|;|,|$)|(?<=\})'
528528
patterns:
529529
- include: '#variable-initializer'
530-
- begin: (?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\?\s*)?(=|:))
530+
- begin: (?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))
531531
end: (?=[};,=]|$)|(?<=\})
532532
patterns:
533533
- include: '#type-annotation'
@@ -565,7 +565,7 @@ repository:
565565

566566
method-declaration:
567567
name: meta.method.declaration.ts
568-
begin: (?<!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\<]))
568+
begin: (?<!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\<]))
569569
beginCaptures:
570570
'1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
571571
'2': { name: storage.modifier.ts } # captures keyword (abstract)
@@ -585,7 +585,7 @@ repository:
585585
- include: '#decl-block'
586586

587587
method-overload-declaration:
588-
begin: (?<!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\<]))
588+
begin: (?<!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\<]))
589589
beginCaptures:
590590
'1': { name: storage.modifier.ts } # captures keyword (public or private or protected)
591591
'2': { name: storage.modifier.ts } # captures keyword (abstract)
@@ -599,7 +599,7 @@ repository:
599599
- include: '#method-declaration-name'
600600

601601
method-declaration-name:
602-
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??)\s*[\(\<])
602+
begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\<])
603603
end: (?=\(|\<)
604604
patterns:
605605
- include: '#string'
@@ -611,7 +611,7 @@ repository:
611611

612612
object-literal-method-declaration:
613613
name: meta.method.declaration.ts
614-
begin: (?<!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\<])
614+
begin: (?<!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\<])
615615
beginCaptures:
616616
'1': { name: storage.modifier.async.ts } # captures keyword (async)
617617
'2': { name: storage.type.property.ts } # captures keyword (get|set)
@@ -627,7 +627,7 @@ repository:
627627
- include: '#decl-block'
628628

629629
object-literal-method-overload-declaration:
630-
begin: (?<!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\<])
630+
begin: (?<!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\<])
631631
beginCaptures:
632632
'1': { name: storage.modifier.async.ts } # captures keyword (async)
633633
'2': { name: storage.type.property.ts } # captures keyword (get|set)
@@ -790,7 +790,7 @@ repository:
790790
parameter-object-binding-element:
791791
patterns:
792792
- include: '#comment'
793-
- begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))
793+
- begin: (?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))
794794
end: (?=,|\})
795795
patterns:
796796
- include: '#object-binding-element-propertyName'
@@ -1472,11 +1472,11 @@ repository:
14721472
- include: '#comment'
14731473
- include: '#object-literal-method-declaration'
14741474
- name: meta.object.member.ts
1475-
begin: (?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]+\])+\]))\s*:)
1475+
begin: (?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]*\])+\]))\s*:)
14761476
end: (?=,|\})
14771477
patterns:
14781478
- name: meta.object-literal.key.ts
1479-
begin: (?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]+\])+\]))\s*:)
1479+
begin: (?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]*\])+\]))\s*:)
14801480
end: ':'
14811481
endCaptures:
14821482
'0': { name: punctuation.separator.key-value.ts }

‎TypeScript.tmLanguage

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
</dict>
288288
<dict>
289289
<key>begin</key>
290-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))</string>
290+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
291291
<key>end</key>
292292
<string>(?=,|\})</string>
293293
<key>patterns</key>
@@ -323,7 +323,7 @@
323323
<key>object-binding-element-propertyName</key>
324324
<dict>
325325
<key>begin</key>
326-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))</string>
326+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
327327
<key>end</key>
328328
<string>(:)</string>
329329
<key>endCaptures</key>
@@ -890,7 +890,7 @@
890890
</dict>
891891
<dict>
892892
<key>begin</key>
893-
<string>(?=((\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\])))</string>
893+
<string>(?=((\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\])))</string>
894894
<key>end</key>
895895
<string>(?=,|\}|$)</string>
896896
<key>patterns</key>
@@ -1659,7 +1659,7 @@
16591659
<key>name</key>
16601660
<string>meta.field.declaration.ts</string>
16611661
<key>begin</key>
1662-
<string>(?&lt;!\()(?:(?&lt;!\.|\$)\b(readonly)\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\?\s*)?(=|:))</string>
1662+
<string>(?&lt;!\()(?:(?&lt;!\.|\$)\b(readonly)\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))</string>
16631663
<key>beginCaptures</key>
16641664
<dict>
16651665
<key>1</key>
@@ -1678,7 +1678,7 @@
16781678
</dict>
16791679
<dict>
16801680
<key>begin</key>
1681-
<string>(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\?\s*)?(=|:))</string>
1681+
<string>(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))</string>
16821682
<key>end</key>
16831683
<string>(?=[};,=]|$)|(?&lt;=\})</string>
16841684
<key>patterns</key>
@@ -1745,7 +1745,7 @@
17451745
<key>name</key>
17461746
<string>meta.method.declaration.ts</string>
17471747
<key>begin</key>
1748-
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
1748+
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
17491749
<key>beginCaptures</key>
17501750
<dict>
17511751
<key>1</key>
@@ -1821,7 +1821,7 @@
18211821
<key>method-overload-declaration</key>
18221822
<dict>
18231823
<key>begin</key>
1824-
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
1824+
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
18251825
<key>beginCaptures</key>
18261826
<dict>
18271827
<key>1</key>
@@ -1873,7 +1873,7 @@
18731873
<key>method-declaration-name</key>
18741874
<dict>
18751875
<key>begin</key>
1876-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??)\s*[\(\&lt;])</string>
1876+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\&lt;])</string>
18771877
<key>end</key>
18781878
<string>(?=\(|\&lt;)</string>
18791879
<key>patterns</key>
@@ -1905,7 +1905,7 @@
19051905
<key>name</key>
19061906
<string>meta.method.declaration.ts</string>
19071907
<key>begin</key>
1908-
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
1908+
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
19091909
<key>beginCaptures</key>
19101910
<dict>
19111911
<key>1</key>
@@ -1961,7 +1961,7 @@
19611961
<key>object-literal-method-overload-declaration</key>
19621962
<dict>
19631963
<key>begin</key>
1964-
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
1964+
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
19651965
<key>beginCaptures</key>
19661966
<dict>
19671967
<key>1</key>
@@ -2455,7 +2455,7 @@
24552455
</dict>
24562456
<dict>
24572457
<key>begin</key>
2458-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))</string>
2458+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
24592459
<key>end</key>
24602460
<string>(?=,|\})</string>
24612461
<key>patterns</key>
@@ -4061,7 +4061,7 @@
40614061
<key>name</key>
40624062
<string>meta.object.member.ts</string>
40634063
<key>begin</key>
4064-
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]+\])+\]))\s*:)</string>
4064+
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]*\])+\]))\s*:)</string>
40654065
<key>end</key>
40664066
<string>(?=,|\})</string>
40674067
<key>patterns</key>
@@ -4070,7 +4070,7 @@
40704070
<key>name</key>
40714071
<string>meta.object-literal.key.ts</string>
40724072
<key>begin</key>
4073-
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]+\])+\]))\s*:)</string>
4073+
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]*\])+\]))\s*:)</string>
40744074
<key>end</key>
40754075
<string>:</string>
40764076
<key>endCaptures</key>

‎TypeScriptReact.tmLanguage

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
</dict>
288288
<dict>
289289
<key>begin</key>
290-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))</string>
290+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
291291
<key>end</key>
292292
<string>(?=,|\})</string>
293293
<key>patterns</key>
@@ -323,7 +323,7 @@
323323
<key>object-binding-element-propertyName</key>
324324
<dict>
325325
<key>begin</key>
326-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))</string>
326+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
327327
<key>end</key>
328328
<string>(:)</string>
329329
<key>endCaptures</key>
@@ -894,7 +894,7 @@
894894
</dict>
895895
<dict>
896896
<key>begin</key>
897-
<string>(?=((\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\])))</string>
897+
<string>(?=((\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\])))</string>
898898
<key>end</key>
899899
<string>(?=,|\}|$)</string>
900900
<key>patterns</key>
@@ -1663,7 +1663,7 @@
16631663
<key>name</key>
16641664
<string>meta.field.declaration.tsx</string>
16651665
<key>begin</key>
1666-
<string>(?&lt;!\()(?:(?&lt;!\.|\$)\b(readonly)\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\?\s*)?(=|:))</string>
1666+
<string>(?&lt;!\()(?:(?&lt;!\.|\$)\b(readonly)\s+)?(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))</string>
16671667
<key>beginCaptures</key>
16681668
<dict>
16691669
<key>1</key>
@@ -1682,7 +1682,7 @@
16821682
</dict>
16831683
<dict>
16841684
<key>begin</key>
1685-
<string>(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\?\s*)?(=|:))</string>
1685+
<string>(?=((?:[_$[:alpha:]][_$[:alnum:]]*)|(?:\'[^']*\')|(?:\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:))</string>
16861686
<key>end</key>
16871687
<string>(?=[};,=]|$)|(?&lt;=\})</string>
16881688
<key>patterns</key>
@@ -1749,7 +1749,7 @@
17491749
<key>name</key>
17501750
<string>meta.method.declaration.tsx</string>
17511751
<key>begin</key>
1752-
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
1752+
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
17531753
<key>beginCaptures</key>
17541754
<dict>
17551755
<key>1</key>
@@ -1825,7 +1825,7 @@
18251825
<key>method-overload-declaration</key>
18261826
<dict>
18271827
<key>begin</key>
1828-
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
1828+
<string>(?&lt;!\.|\$)(?:\b(public|private|protected)\s+)?(?:\b(abstract)\s+)?(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(?:\b(?:(new)|(constructor))\b(?!\$|:))|(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;]))</string>
18291829
<key>beginCaptures</key>
18301830
<dict>
18311831
<key>1</key>
@@ -1877,7 +1877,7 @@
18771877
<key>method-declaration-name</key>
18781878
<dict>
18791879
<key>begin</key>
1880-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??)\s*[\(\&lt;])</string>
1880+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\&lt;])</string>
18811881
<key>end</key>
18821882
<string>(?=\(|\&lt;)</string>
18831883
<key>patterns</key>
@@ -1909,7 +1909,7 @@
19091909
<key>name</key>
19101910
<string>meta.method.declaration.tsx</string>
19111911
<key>begin</key>
1912-
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
1912+
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
19131913
<key>beginCaptures</key>
19141914
<dict>
19151915
<key>1</key>
@@ -1965,7 +1965,7 @@
19651965
<key>object-literal-method-overload-declaration</key>
19661966
<dict>
19671967
<key>begin</key>
1968-
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
1968+
<string>(?&lt;!\.|\$)(?:\b(async)\s+)?(?:\b(get|set)\s+)?(?:(\*)\s*)?(?=((([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))?\s*[\(\&lt;])</string>
19691969
<key>beginCaptures</key>
19701970
<dict>
19711971
<key>1</key>
@@ -2459,7 +2459,7 @@
24592459
</dict>
24602460
<dict>
24612461
<key>begin</key>
2462-
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]+\])+\]))\s*(:))</string>
2462+
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)|(\'[^']*\')|(\"[^"]*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
24632463
<key>end</key>
24642464
<string>(?=,|\})</string>
24652465
<key>patterns</key>
@@ -4043,7 +4043,7 @@
40434043
<key>name</key>
40444044
<string>meta.object.member.tsx</string>
40454045
<key>begin</key>
4046-
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]+\])+\]))\s*:)</string>
4046+
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]*\])+\]))\s*:)</string>
40474047
<key>end</key>
40484048
<string>(?=,|\})</string>
40494049
<key>patterns</key>
@@ -4052,7 +4052,7 @@
40524052
<key>name</key>
40534053
<string>meta.object-literal.key.tsx</string>
40544054
<key>begin</key>
4055-
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]+\])+\]))\s*:)</string>
4055+
<string>(?=(?:(?:\'[^']*\')|(?:\"[^"]*\")|(?:\[([^\[\]]|\[[^\[\]]*\])+\]))\s*:)</string>
40564056
<key>end</key>
40574057
<string>:</string>
40584058
<key>endCaptures</key>

0 commit comments

Comments
 (0)