Skip to content

Commit d7576f2

Browse files
committed
Add simple variable assignment expression matching to object literal member to handle cases where the destructuring parameters of arrow are span multiple lines
Fixes #510
1 parent d22d017 commit d7576f2

File tree

5 files changed

+500
-0
lines changed

5 files changed

+500
-0
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1639,6 +1639,11 @@ repository:
16391639
match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)
16401640
captures:
16411641
'1': { name: variable.other.readwrite.ts }
1642+
- name: meta.object.member.ts
1643+
begin: (?=[_$[:alpha:]][_$[:alnum:]]*\s*=)
1644+
end: (?=,|\}|$)
1645+
patterns:
1646+
- include: '#expression'
16421647
- include: '#object-member-body'
16431648
- include: '#punctuation-comma'
16441649

TypeScript.tmLanguage

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4491,6 +4491,21 @@
44914491
</dict>
44924492
</dict>
44934493
</dict>
4494+
<dict>
4495+
<key>name</key>
4496+
<string>meta.object.member.ts</string>
4497+
<key>begin</key>
4498+
<string>(?=[_$[:alpha:]][_$[:alnum:]]*\s*=)</string>
4499+
<key>end</key>
4500+
<string>(?=,|\}|$)</string>
4501+
<key>patterns</key>
4502+
<array>
4503+
<dict>
4504+
<key>include</key>
4505+
<string>#expression</string>
4506+
</dict>
4507+
</array>
4508+
</dict>
44944509
<dict>
44954510
<key>include</key>
44964511
<string>#object-member-body</string>

TypeScriptReact.tmLanguage

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4437,6 +4437,21 @@
44374437
</dict>
44384438
</dict>
44394439
</dict>
4440+
<dict>
4441+
<key>name</key>
4442+
<string>meta.object.member.tsx</string>
4443+
<key>begin</key>
4444+
<string>(?=[_$[:alpha:]][_$[:alnum:]]*\s*=)</string>
4445+
<key>end</key>
4446+
<string>(?=,|\}|$)</string>
4447+
<key>patterns</key>
4448+
<array>
4449+
<dict>
4450+
<key>include</key>
4451+
<string>#expression</string>
4452+
</dict>
4453+
</array>
4454+
</dict>
44404455
<dict>
44414456
<key>include</key>
44424457
<string>#object-member-body</string>

0 commit comments

Comments
 (0)