Skip to content

Commit c5c0e6e

Browse files
sheetalkamatsheetalkamat
authored
Merge pull request #325 from Microsoft/definitionScope
Add scope meta.definition to varible, function, method and field declarations
2 parents d81c7e3 + 19899b1 commit c5c0e6e

File tree

134 files changed

+689
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+689
-689
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ repository:
4444
name: meta.var-single-variable.expr.ts
4545
begin: ([_$[:alpha:]][_$[:alnum:]]*)
4646
beginCaptures:
47-
'1': { name: variable.other.readwrite.ts }
47+
'1': { name: meta.definition.variable.ts variable.other.readwrite.ts }
4848
end: (?=$|[;,=}]|(\s+(of|in)\s+))
4949
patterns:
5050
- include: '#type-annotation'
@@ -79,7 +79,7 @@ repository:
7979
patterns:
8080
- include: '#object-binding-pattern'
8181
- include: '#array-binding-pattern'
82-
- name: variable.other.readwrite.ts
82+
- name: meta.definition.variable.ts variable.other.readwrite.ts
8383
match: ([_$[:alpha:]][_$[:alnum:]]*)
8484
- include: '#variable-initializer'
8585
- include: '#object-binding-pattern'
@@ -100,7 +100,7 @@ repository:
100100
match: (?:(\.\.\.)\s*)?([_$[:alpha:]][_$[:alnum:]]*)
101101
captures:
102102
'1': { name: keyword.operator.rest.ts }
103-
'2': { name: variable.other.readwrite.ts }
103+
'2': { name: meta.definition.variable.ts variable.other.readwrite.ts }
104104

105105
object-binding-pattern:
106106
begin: (?:(\.\.\.)\s*)?(\{)
@@ -489,7 +489,7 @@ repository:
489489
- include: '#string'
490490
- include: '#array-literal'
491491
- include: '#comment'
492-
- name: variable.object.property.ts
492+
- name: meta.definition.property.ts variable.object.property.ts
493493
match: '[_$[:alpha:]][_$[:alnum:]]*'
494494
- name: keyword.operator.optional.ts
495495
match: \?
@@ -535,7 +535,7 @@ repository:
535535
patterns:
536536
- include: '#string'
537537
- include: '#array-literal'
538-
- name: entity.name.function.ts
538+
- name: meta.definition.method.ts entity.name.function.ts
539539
match: '[_$[:alpha:]][_$[:alnum:]]*'
540540
- name: keyword.operator.optional.ts
541541
match: \?
@@ -562,7 +562,7 @@ repository:
562562
'2': { name: storage.modifier.async.ts }
563563
'3': { name: storage.type.function.ts }
564564
'4': { name: keyword.generator.asterisk.ts }
565-
'5': { name: entity.name.function.ts }
565+
'5': { name: meta.definition.function.ts entity.name.function.ts }
566566
end: (?=;|\})|(?<=\})
567567
patterns:
568568
- include: '#comment'
@@ -580,7 +580,7 @@ repository:
580580
'2': { name: storage.modifier.async.ts }
581581
'3': { name: storage.type.function.ts }
582582
'4': { name: keyword.generator.asterisk.ts }
583-
'5': { name: entity.name.function.ts }
583+
'5': { name: meta.definition.function.ts entity.name.function.ts }
584584

585585
object-literal:
586586
name: meta.object-literal.ts

‎TypeScript.tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<key>1</key>
136136
<dict>
137137
<key>name</key>
138-
<string>variable.other.readwrite.ts</string>
138+
<string>meta.definition.variable.ts variable.other.readwrite.ts</string>
139139
</dict>
140140
</dict>
141141
<key>end</key>
@@ -246,7 +246,7 @@
246246
</dict>
247247
<dict>
248248
<key>name</key>
249-
<string>variable.other.readwrite.ts</string>
249+
<string>meta.definition.variable.ts variable.other.readwrite.ts</string>
250250
<key>match</key>
251251
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
252252
</dict>
@@ -318,7 +318,7 @@
318318
<key>2</key>
319319
<dict>
320320
<key>name</key>
321-
<string>variable.other.readwrite.ts</string>
321+
<string>meta.definition.variable.ts variable.other.readwrite.ts</string>
322322
</dict>
323323
</dict>
324324
</dict>
@@ -1610,7 +1610,7 @@
16101610
</dict>
16111611
<dict>
16121612
<key>name</key>
1613-
<string>variable.object.property.ts</string>
1613+
<string>meta.definition.property.ts variable.object.property.ts</string>
16141614
<key>match</key>
16151615
<string>[_$[:alpha:]][_$[:alnum:]]*</string>
16161616
</dict>
@@ -1772,7 +1772,7 @@
17721772
</dict>
17731773
<dict>
17741774
<key>name</key>
1775-
<string>entity.name.function.ts</string>
1775+
<string>meta.definition.method.ts entity.name.function.ts</string>
17761776
<key>match</key>
17771777
<string>[_$[:alpha:]][_$[:alnum:]]*</string>
17781778
</dict>
@@ -1862,7 +1862,7 @@
18621862
<key>5</key>
18631863
<dict>
18641864
<key>name</key>
1865-
<string>entity.name.function.ts</string>
1865+
<string>meta.definition.function.ts entity.name.function.ts</string>
18661866
</dict>
18671867
</dict>
18681868
<key>end</key>
@@ -1926,7 +1926,7 @@
19261926
<key>5</key>
19271927
<dict>
19281928
<key>name</key>
1929-
<string>entity.name.function.ts</string>
1929+
<string>meta.definition.function.ts entity.name.function.ts</string>
19301930
</dict>
19311931
</dict>
19321932
</dict>

‎TypeScriptReact.tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
<key>1</key>
136136
<dict>
137137
<key>name</key>
138-
<string>variable.other.readwrite.tsx</string>
138+
<string>meta.definition.variable.tsx variable.other.readwrite.tsx</string>
139139
</dict>
140140
</dict>
141141
<key>end</key>
@@ -246,7 +246,7 @@
246246
</dict>
247247
<dict>
248248
<key>name</key>
249-
<string>variable.other.readwrite.tsx</string>
249+
<string>meta.definition.variable.tsx variable.other.readwrite.tsx</string>
250250
<key>match</key>
251251
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
252252
</dict>
@@ -318,7 +318,7 @@
318318
<key>2</key>
319319
<dict>
320320
<key>name</key>
321-
<string>variable.other.readwrite.tsx</string>
321+
<string>meta.definition.variable.tsx variable.other.readwrite.tsx</string>
322322
</dict>
323323
</dict>
324324
</dict>
@@ -1614,7 +1614,7 @@
16141614
</dict>
16151615
<dict>
16161616
<key>name</key>
1617-
<string>variable.object.property.tsx</string>
1617+
<string>meta.definition.property.tsx variable.object.property.tsx</string>
16181618
<key>match</key>
16191619
<string>[_$[:alpha:]][_$[:alnum:]]*</string>
16201620
</dict>
@@ -1776,7 +1776,7 @@
17761776
</dict>
17771777
<dict>
17781778
<key>name</key>
1779-
<string>entity.name.function.tsx</string>
1779+
<string>meta.definition.method.tsx entity.name.function.tsx</string>
17801780
<key>match</key>
17811781
<string>[_$[:alpha:]][_$[:alnum:]]*</string>
17821782
</dict>
@@ -1866,7 +1866,7 @@
18661866
<key>5</key>
18671867
<dict>
18681868
<key>name</key>
1869-
<string>entity.name.function.tsx</string>
1869+
<string>meta.definition.function.tsx entity.name.function.tsx</string>
18701870
</dict>
18711871
</dict>
18721872
<key>end</key>
@@ -1930,7 +1930,7 @@
19301930
<key>5</key>
19311931
<dict>
19321932
<key>name</key>
1933-
<string>entity.name.function.tsx</string>
1933+
<string>meta.definition.function.tsx entity.name.function.tsx</string>
19341934
</dict>
19351935
</dict>
19361936
</dict>

‎tests/baselines/Abstracts.baseline.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Grammar: TypeScript.tmLanguage
4343
^
4444
source.ts meta.class.ts
4545
^^^
46-
source.ts meta.class.ts meta.field.declaration.ts variable.object.property.ts
46+
source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
4747
^
4848
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
4949
^
@@ -60,7 +60,7 @@ Grammar: TypeScript.tmLanguage
6060
^
6161
source.ts meta.class.ts meta.method.declaration.ts
6262
^^^^^^^^^
63-
source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
63+
source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
6464
^
6565
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
6666
^
@@ -103,7 +103,7 @@ Grammar: TypeScript.tmLanguage
103103
^
104104
source.ts meta.class.ts meta.method.declaration.ts
105105
^^^^^^^^^
106-
source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
106+
source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
107107
^
108108
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
109109
^
@@ -145,7 +145,7 @@ Grammar: TypeScript.tmLanguage
145145
^^^
146146
source.ts meta.class.ts
147147
^^^^^^^^^
148-
source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
148+
source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
149149
^
150150
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
151151
^
@@ -201,7 +201,7 @@ Grammar: TypeScript.tmLanguage
201201
^^^
202202
source.ts meta.class.ts
203203
^^^^^^^^^
204-
source.ts meta.class.ts meta.method.declaration.ts entity.name.function.ts
204+
source.ts meta.class.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
205205
^
206206
source.ts meta.class.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
207207
^
@@ -240,7 +240,7 @@ Grammar: TypeScript.tmLanguage
240240
^
241241
source.ts meta.var.expr.ts
242242
^^^
243-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
243+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
244244
^
245245
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
246246
^

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Grammar: TypeScript.tmLanguage
4646
^
4747
source.ts meta.var.expr.ts
4848
^^^^^^
49-
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
49+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
5050
^
5151
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
5252
^
@@ -223,7 +223,7 @@ Grammar: TypeScript.tmLanguage
223223
^
224224
source.ts meta.function.ts
225225
^
226-
source.ts meta.function.ts entity.name.function.ts
226+
source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
227227
^
228228
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
229229
^
@@ -336,7 +336,7 @@ Grammar: TypeScript.tmLanguage
336336
^
337337
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts
338338
^
339-
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
339+
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
340340
^
341341
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts meta.var-single-variable.expr.ts
342342
^

0 commit comments

Comments
 (0)