Skip to content

Commit 87f5a51

Browse files
committed
Handle when the last property of object literal ends with } on new line
Fixes #292
1 parent 752ba0e commit 87f5a51

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ repository:
13411341
patterns:
13421342
- include: '#expression'
13431343
- name: meta.object.member.ts
1344-
match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\})
1344+
match: ([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)
13451345
captures:
13461346
'1': { name: variable.other.readwrite.ts }
13471347
- include: '#punctuation-comma'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3736,7 +3736,7 @@
37363736
<key>name</key>
37373737
<string>meta.object.member.ts</string>
37383738
<key>match</key>
3739-
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\})</string>
3739+
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)</string>
37403740
<key>captures</key>
37413741
<dict>
37423742
<key>1</key>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3718,7 +3718,7 @@
37183718
<key>name</key>
37193719
<string>meta.object.member.tsx</string>
37203720
<key>match</key>
3721-
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\})</string>
3721+
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(?=,|\}|$)</string>
37223722
<key>captures</key>
37233723
<dict>
37243724
<key>1</key>

tests/baselines/Issue292.baseline.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ Grammar: TypeScript.tmLanguage
5858
^^
5959
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
6060
> filesToDiff
61-
^^^^^^^^^^^^^^^^^^^^^
61+
^^^^^^^^
6262
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
63+
^^^^^^^^^^^
64+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts variable.other.readwrite.ts
65+
^^
66+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts
6367
> };
6468
^^^^
6569
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts

0 commit comments

Comments
 (0)