Skip to content

Commit e038ac8

Browse files
sheetalkamatsheetalkamat
committed
Rename meta.function.type.parameter.ts to meta.parameters.ts
1 parent 037f419 commit e038ac8

Some content is hidden

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

49 files changed

+1276
-1276
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ repository:
480480
- include: '#method-declaration-name'
481481
- include: '#comment'
482482
- include: '#type-parameters'
483-
- include: '#function-type-parameters'
483+
- include: '#function-parameters'
484484
- include: '#return-type'
485485
- include: '#method-overload-declaration'
486486
- include: '#decl-block'
@@ -543,7 +543,7 @@ repository:
543543
patterns:
544544
- include: '#comment'
545545
- include: '#type-parameters'
546-
- include: '#function-type-parameters'
546+
- include: '#function-parameters'
547547
- include: '#return-type'
548548
- include: '#function-overload-declaration'
549549
- include: '#decl-block'
@@ -712,12 +712,12 @@ repository:
712712
- include: '#type-tuple'
713713
- include: '#type-object'
714714
- include: '#type-operator'
715-
- include: '#type-paren-or-function-type-parameters'
715+
- include: '#type-paren-or-function-parameters'
716716
- include: '#type-function-return-type'
717717
- include: '#type-name'
718718

719-
function-type-parameters:
720-
name: meta.function.type.parameter.ts
719+
function-parameters:
720+
name: meta.parameters.ts
721721
begin: \(
722722
beginCaptures:
723723
'0': { name: punctuation.definition.parameters.begin.ts }
@@ -740,7 +740,7 @@ repository:
740740
# (number | string) or (param: number, param2: string)
741741
# and it can be nested, for example
742742
# (number | (param: number, param2: string) => void)
743-
type-paren-or-function-type-parameters:
743+
type-paren-or-function-parameters:
744744
name: meta.type.paren.cover.ts
745745
begin: '(?:\b(new)\b)?\s*(\()'
746746
beginCaptures:
@@ -752,7 +752,7 @@ repository:
752752
patterns:
753753
- include: '#comment'
754754
- include: '#type'
755-
- include: '#function-type-parameters'
755+
- include: '#function-parameters'
756756

757757
type-operator:
758758
name: keyword.operator.type.ts

‎TypeScript.tmLanguage

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@
13541354
</dict>
13551355
<dict>
13561356
<key>include</key>
1357-
<string>#function-type-parameters</string>
1357+
<string>#function-parameters</string>
13581358
</dict>
13591359
<dict>
13601360
<key>include</key>
@@ -1395,7 +1395,7 @@
13951395
<key>name</key>
13961396
<string>meta.function.overload.ts</string>
13971397
</dict>
1398-
<key>function-type-parameters</key>
1398+
<key>function-parameters</key>
13991399
<dict>
14001400
<key>begin</key>
14011401
<string>\(</string>
@@ -1418,7 +1418,7 @@
14181418
</dict>
14191419
</dict>
14201420
<key>name</key>
1421-
<string>meta.function.type.parameter.ts</string>
1421+
<string>meta.parameters.ts</string>
14221422
<key>patterns</key>
14231423
<array>
14241424
<dict>
@@ -1886,7 +1886,7 @@
18861886
</dict>
18871887
<dict>
18881888
<key>include</key>
1889-
<string>#function-type-parameters</string>
1889+
<string>#function-parameters</string>
18901890
</dict>
18911891
<dict>
18921892
<key>include</key>
@@ -3308,7 +3308,7 @@
33083308
</dict>
33093309
<dict>
33103310
<key>include</key>
3311-
<string>#type-paren-or-function-type-parameters</string>
3311+
<string>#type-paren-or-function-parameters</string>
33123312
</dict>
33133313
<dict>
33143314
<key>include</key>
@@ -3592,7 +3592,7 @@
35923592
</dict>
35933593
</array>
35943594
</dict>
3595-
<key>type-paren-or-function-type-parameters</key>
3595+
<key>type-paren-or-function-parameters</key>
35963596
<dict>
35973597
<key>begin</key>
35983598
<string>(?:\b(new)\b)?\s*(\()</string>
@@ -3633,7 +3633,7 @@
36333633
</dict>
36343634
<dict>
36353635
<key>include</key>
3636-
<string>#function-type-parameters</string>
3636+
<string>#function-parameters</string>
36373637
</dict>
36383638
</array>
36393639
</dict>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ repository:
484484
- include: '#method-declaration-name'
485485
- include: '#comment'
486486
- include: '#type-parameters'
487-
- include: '#function-type-parameters'
487+
- include: '#function-parameters'
488488
- include: '#return-type'
489489
- include: '#method-overload-declaration'
490490
- include: '#decl-block'
@@ -547,7 +547,7 @@ repository:
547547
patterns:
548548
- include: '#comment'
549549
- include: '#type-parameters'
550-
- include: '#function-type-parameters'
550+
- include: '#function-parameters'
551551
- include: '#return-type'
552552
- include: '#function-overload-declaration'
553553
- include: '#decl-block'
@@ -716,12 +716,12 @@ repository:
716716
- include: '#type-tuple'
717717
- include: '#type-object'
718718
- include: '#type-operator'
719-
- include: '#type-paren-or-function-type-parameters'
719+
- include: '#type-paren-or-function-parameters'
720720
- include: '#type-function-return-type'
721721
- include: '#type-name'
722722

723-
function-type-parameters:
724-
name: meta.function.type.parameter.tsx
723+
function-parameters:
724+
name: meta.parameters.tsx
725725
begin: \(
726726
beginCaptures:
727727
'0': { name: punctuation.definition.parameters.begin.tsx }
@@ -744,7 +744,7 @@ repository:
744744
# (number | string) or (param: number, param2: string)
745745
# and it can be nested, for example
746746
# (number | (param: number, param2: string) => void)
747-
type-paren-or-function-type-parameters:
747+
type-paren-or-function-parameters:
748748
name: meta.type.paren.cover.tsx
749749
begin: '(?:\b(new)\b)?\s*(\()'
750750
beginCaptures:
@@ -756,11 +756,11 @@ repository:
756756
patterns:
757757
- include: '#comment'
758758
- include: '#type'
759-
- include: '#function-type-parameters'
759+
- include: '#function-parameters'
760760

761761
type-operator:
762762
name: keyword.operator.type.tsx
763-
match: '[.|]'
763+
match: '[&|]'
764764

765765
type-function-return-type:
766766
name: meta.type.function.return.tsx

‎TypeScriptReact.tmLanguage

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@
13221322
</dict>
13231323
<dict>
13241324
<key>include</key>
1325-
<string>#function-type-parameters</string>
1325+
<string>#function-parameters</string>
13261326
</dict>
13271327
<dict>
13281328
<key>include</key>
@@ -1363,7 +1363,7 @@
13631363
<key>name</key>
13641364
<string>meta.function.overload.tsx</string>
13651365
</dict>
1366-
<key>function-type-parameters</key>
1366+
<key>function-parameters</key>
13671367
<dict>
13681368
<key>begin</key>
13691369
<string>\(</string>
@@ -1386,7 +1386,7 @@
13861386
</dict>
13871387
</dict>
13881388
<key>name</key>
1389-
<string>meta.function.type.parameter.tsx</string>
1389+
<string>meta.parameters.tsx</string>
13901390
<key>patterns</key>
13911391
<array>
13921392
<dict>
@@ -2283,7 +2283,7 @@
22832283
</dict>
22842284
<dict>
22852285
<key>include</key>
2286-
<string>#function-type-parameters</string>
2286+
<string>#function-parameters</string>
22872287
</dict>
22882288
<dict>
22892289
<key>include</key>
@@ -3709,7 +3709,7 @@
37093709
</dict>
37103710
<dict>
37113711
<key>include</key>
3712-
<string>#type-paren-or-function-type-parameters</string>
3712+
<string>#type-paren-or-function-parameters</string>
37133713
</dict>
37143714
<dict>
37153715
<key>include</key>
@@ -3942,7 +3942,7 @@
39423942
<key>type-operator</key>
39433943
<dict>
39443944
<key>match</key>
3945-
<string>[.|]</string>
3945+
<string>[&amp;|]</string>
39463946
<key>name</key>
39473947
<string>keyword.operator.type.tsx</string>
39483948
</dict>
@@ -3993,7 +3993,7 @@
39933993
</dict>
39943994
</array>
39953995
</dict>
3996-
<key>type-paren-or-function-type-parameters</key>
3996+
<key>type-paren-or-function-parameters</key>
39973997
<dict>
39983998
<key>begin</key>
39993999
<string>(?:\b(new)\b)?\s*(\()</string>
@@ -4034,7 +4034,7 @@
40344034
</dict>
40354035
<dict>
40364036
<key>include</key>
4037-
<string>#function-type-parameters</string>
4037+
<string>#function-parameters</string>
40384038
</dict>
40394039
</array>
40404040
</dict>

‎tests/baselines/Abstracts.baseline.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ cow.makeSound();
6060
^^^^^^^^^
6161
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
6262
^
63-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
63+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
6464
^
65-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
65+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
6666
^
6767
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
6868
^
@@ -97,9 +97,9 @@ cow.makeSound();
9797
^^^^^^^^^
9898
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
9999
^
100-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
100+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
101101
^
102-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
102+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
103103
^
104104
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.return.type.ts
105105
^
@@ -139,9 +139,9 @@ cow.makeSound();
139139
^^^^^^^^^
140140
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
141141
^
142-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
142+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
143143
^
144-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
144+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
145145
^
146146
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
147147
^
@@ -193,9 +193,9 @@ cow.makeSound();
193193
^^^^^^^^^
194194
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts entity.name.function.ts
195195
^
196-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
196+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
197197
^
198-
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
198+
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
199199
^
200200
source.ts meta.declaration.object.ts meta.object.body.ts meta.method.declaration.ts
201201
^

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -161,45 +161,45 @@ function f(x: string | ((value: string) => number)) {
161161
^
162162
source.ts meta.function.ts entity.name.function.ts
163163
^
164-
source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.begin.ts
164+
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
165165
^
166-
source.ts meta.function.ts meta.function.type.parameter.ts variable.parameter.ts
166+
source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
167167
^
168-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
168+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
169169
^
170-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
170+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
171171
^^^^^^
172-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts support.type.primitive.ts
172+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
173173
^
174-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts
174+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
175175
^
176-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts keyword.operator.type.ts
176+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.ts
177177
^
178-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts
178+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts
179179
^
180-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts
180+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts
181181
^
182-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts
182+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts
183183
^^^^^
184-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts entity.name.type.ts
184+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts entity.name.type.ts
185185
^^
186-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts
186+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts
187187
^^^^^^
188-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts
188+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts support.type.primitive.ts
189189
^
190-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts
190+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.paren.cover.ts meta.brace.round.ts
191191
^
192-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts
192+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts
193193
^^
194-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts
194+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts storage.type.function.arrow.ts
195195
^
196-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts
196+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts
197197
^^^^^^
198-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts
198+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.type.function.return.ts support.type.primitive.ts
199199
^
200-
source.ts meta.function.ts meta.function.type.parameter.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts
200+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts meta.type.paren.cover.ts meta.brace.round.ts
201201
^
202-
source.ts meta.function.ts meta.function.type.parameter.ts punctuation.definition.parameters.end.ts
202+
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
203203
^
204204
source.ts meta.function.ts
205205
^

0 commit comments

Comments
 (0)