Skip to content

Commit 01b3bf1

Browse files
sheetalkamatsheetalkamat
committed
Don't scope object literal keys as entity.name.attribute-name
1 parent 6443ff7 commit 01b3bf1

15 files changed

+60
-71
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,11 +1333,10 @@ repository:
13331333
patterns:
13341334
- include: '#expression'
13351335
- name: meta.object.member.ts
1336-
begin: ([_$[:alpha:]][_$[:alnum:]]*)\s*(:)
1336+
begin: (?:[_$[:alpha:]][_$[:alnum:]]*)\s*(:)
13371337
beginCaptures:
13381338
'0': { name: meta.object-literal.key.ts }
1339-
'1': { name: entity.name.type.attribute-name.ts }
1340-
'2': { name: punctuation.separator.key-value.ts }
1339+
'1': { name: punctuation.separator.key-value.ts }
13411340
end: (?=,|\})
13421341
patterns:
13431342
- include: '#expression'

‎TypeScript.tmLanguage

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3708,7 +3708,7 @@
37083708
<key>name</key>
37093709
<string>meta.object.member.ts</string>
37103710
<key>begin</key>
3711-
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(:)</string>
3711+
<string>(?:[_$[:alpha:]][_$[:alnum:]]*)\s*(:)</string>
37123712
<key>beginCaptures</key>
37133713
<dict>
37143714
<key>0</key>
@@ -3717,11 +3717,6 @@
37173717
<string>meta.object-literal.key.ts</string>
37183718
</dict>
37193719
<key>1</key>
3720-
<dict>
3721-
<key>name</key>
3722-
<string>entity.name.type.attribute-name.ts</string>
3723-
</dict>
3724-
<key>2</key>
37253720
<dict>
37263721
<key>name</key>
37273722
<string>punctuation.separator.key-value.ts</string>

‎TypeScriptReact.tmLanguage

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3690,7 +3690,7 @@
36903690
<key>name</key>
36913691
<string>meta.object.member.tsx</string>
36923692
<key>begin</key>
3693-
<string>([_$[:alpha:]][_$[:alnum:]]*)\s*(:)</string>
3693+
<string>(?:[_$[:alpha:]][_$[:alnum:]]*)\s*(:)</string>
36943694
<key>beginCaptures</key>
36953695
<dict>
36963696
<key>0</key>
@@ -3699,11 +3699,6 @@
36993699
<string>meta.object-literal.key.tsx</string>
37003700
</dict>
37013701
<key>1</key>
3702-
<dict>
3703-
<key>name</key>
3704-
<string>entity.name.type.attribute-name.tsx</string>
3705-
</dict>
3706-
<key>2</key>
37073702
<dict>
37083703
<key>name</key>
37093704
<string>punctuation.separator.key-value.tsx</string>

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Grammar: TypeScript.tmLanguage
5959
^^^^
6060
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
6161
^^^^^^^^^^^^
62-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
62+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
6363
^
6464
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
6565
^

‎tests/baselines/FunctionMethodReturnTypes.baseline.txt

Lines changed: 18 additions & 18 deletions
Large diffs are not rendered by default.

‎tests/baselines/Issue143.baseline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Grammar: TypeScript.tmLanguage
7373
^
7474
source.ts meta.decorator.ts meta.object-literal.ts punctuation.definition.block.ts
7575
^^^^^^^^
76-
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
76+
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
7777
^
7878
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
7979
^
@@ -245,7 +245,7 @@ Grammar: TypeScript.tmLanguage
245245
^^
246246
source.ts meta.decorator.ts meta.object-literal.ts
247247
^^^^^^^^
248-
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
248+
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
249249
^
250250
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
251251
^
@@ -264,7 +264,7 @@ Grammar: TypeScript.tmLanguage
264264
^^
265265
source.ts meta.decorator.ts meta.object-literal.ts
266266
^^^^^^^^
267-
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
267+
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
268268
^
269269
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
270270
^
@@ -283,7 +283,7 @@ Grammar: TypeScript.tmLanguage
283283
^^
284284
source.ts meta.decorator.ts meta.object-literal.ts
285285
^^^^^^^^^^
286-
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
286+
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
287287
^
288288
source.ts meta.decorator.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
289289
^

‎tests/baselines/Issue171.baseline.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Grammar: TypeScript.tmLanguage
266266
^^^^^^
267267
source.ts meta.function.ts meta.block.ts meta.object-literal.ts
268268
^^^^^^^^^^^^^
269-
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
269+
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
270270
^
271271
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
272272
^
@@ -285,7 +285,7 @@ Grammar: TypeScript.tmLanguage
285285
^^^^^^
286286
source.ts meta.function.ts meta.block.ts meta.object-literal.ts
287287
^^^^^^^^^
288-
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
288+
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
289289
^
290290
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
291291
^
@@ -300,7 +300,7 @@ Grammar: TypeScript.tmLanguage
300300
^^^^^^
301301
source.ts meta.function.ts meta.block.ts meta.object-literal.ts
302302
^^^^^^^^^
303-
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
303+
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
304304
^
305305
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
306306
^
@@ -315,7 +315,7 @@ Grammar: TypeScript.tmLanguage
315315
^^^^^^
316316
source.ts meta.function.ts meta.block.ts meta.object-literal.ts
317317
^^^^^^^^^^^^^^^^^^^^^^
318-
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
318+
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
319319
^
320320
source.ts meta.function.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
321321
^

‎tests/baselines/Issue197.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Grammar: TypeScript.tmLanguage
176176
^
177177
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts
178178
^^^^^^^^^^
179-
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
179+
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
180180
^
181181
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
182182
^
@@ -203,7 +203,7 @@ Grammar: TypeScript.tmLanguage
203203
^
204204
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts
205205
^^^^^^^^^^
206-
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
206+
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
207207
^
208208
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
209209
^
@@ -230,7 +230,7 @@ Grammar: TypeScript.tmLanguage
230230
^
231231
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts
232232
^^^^^^^^^^
233-
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
233+
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
234234
^
235235
source.ts meta.class.ts meta.array.literal.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
236236
^

‎tests/baselines/Issue251.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Grammar: TypeScript.tmLanguage
156156
^
157157
source.ts meta.block.ts meta.block.ts meta.object-literal.ts
158158
^
159-
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
159+
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
160160
^
161161
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
162162
^
@@ -172,7 +172,7 @@ Grammar: TypeScript.tmLanguage
172172
^
173173
source.ts meta.block.ts meta.block.ts meta.object-literal.ts
174174
^
175-
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
175+
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
176176
^
177177
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
178178
^
@@ -188,7 +188,7 @@ Grammar: TypeScript.tmLanguage
188188
^
189189
source.ts meta.block.ts meta.block.ts meta.object-literal.ts
190190
^^^^
191-
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
191+
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
192192
^
193193
source.ts meta.block.ts meta.block.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
194194
^

‎tests/baselines/TsxSamples.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ Grammar: TypeScriptReact.tmLanguage
609609
^
610610
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx
611611
^^^
612-
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx entity.name.type.attribute-name.tsx
612+
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx
613613
^
614614
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx punctuation.separator.key-value.tsx
615615
^
@@ -891,7 +891,7 @@ Grammar: TypeScriptReact.tmLanguage
891891
^
892892
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx punctuation.definition.block.tsx
893893
^^^^^^
894-
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx entity.name.type.attribute-name.tsx
894+
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx
895895
^
896896
source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx punctuation.separator.key-value.tsx
897897
^

‎tests/baselines/TsxSamples.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Grammar: TypeScriptReact.tmLanguage
223223
[51, 26]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.without-attributes.tsx meta.jsx.children.tsx meta.brace.curly.tsx meta.array.literal.tsx meta.tag.without-attributes.tsx punctuation.definition.tag.begin.tsx
224224
>var d = <div dangerouslySetInnerHTML={{__html: 'First &middot; Second'}} />
225225
^^^^^^
226-
[52, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx entity.name.type.attribute-name.tsx
226+
[52, 40]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx meta.object-literal.key.tsx
227227
^
228228
[52, 48]: source.tsx meta.var.expr.tsx meta.var-single-variable.expr.tsx meta.tag.tsx meta.brace.curly.tsx meta.object-literal.tsx meta.object.member.tsx string.quoted.single.tsx punctuation.definition.string.begin.tsx
229229
>var e = <div data-custom-attribute="foo" />

‎tests/baselines/binder.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Grammar: TypeScript.tmLanguage
178178
^
179179
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
180180
^^^^^
181-
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
181+
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
182182
^
183183
source.ts meta.function.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
184184
^

‎tests/baselines/multipleVariableDeclaration.baseline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Grammar: TypeScript.tmLanguage
232232
^
233233
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts
234234
^^^
235-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts entity.name.type.attribute-name.ts
235+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts
236236
^
237237
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.object-literal.ts meta.object.member.ts meta.object-literal.key.ts punctuation.separator.key-value.ts
238238
^

0 commit comments

Comments
 (0)