Skip to content

Commit 4800753

Browse files
forivallforivall
committed
Improve scopes of type cast declarations
1 parent c9c955a commit 4800753

11 files changed

+30
-25
lines changed

‎TypeScript.YAML-tmLanguage

+4-3
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ repository:
13751375
match: '{{startOfIdentifier}}(as)\s+(const)(?=\s*([,}]|$))'
13761376
captures:
13771377
'1': { name: keyword.control.as.ts }
1378-
'2': { name: storage.modifier.ts }
1378+
'2': { name: storage.modifier.const.type.ts }
13791379
- name: meta.object.member.ts
13801380
begin: '{{startOfIdentifier}}(as)\s+'
13811381
beginCaptures:
@@ -1561,7 +1561,7 @@ repository:
15611561
match: \s*(<)\s*(const)\s*(>)
15621562
captures:
15631563
'1': { name: meta.brace.angle.ts }
1564-
'2': { name: storage.modifier.ts }
1564+
'2': { name: storage.modifier.const.type.ts }
15651565
'3': { name: meta.brace.angle.ts }
15661566
- name: cast.expr.ts
15671567
# We need to differentiate between the relational '<' operator and the beginning of a type assertion/cast using the surrounding context.
@@ -1624,11 +1624,12 @@ repository:
16241624
- match: '{{startOfIdentifier}}(as)\s+(const)(?=\s*($|[;,:})\]]))'
16251625
captures:
16261626
'1': { name: keyword.control.as.ts }
1627-
'2': { name: storage.modifier.ts }
1627+
'2': { name: storage.modifier.const.type.ts }
16281628
- begin: '{{startOfIdentifier}}(as)\s+'
16291629
beginCaptures:
16301630
'1': { name: keyword.control.as.ts }
16311631
end: (?=$|^|[;,:})\]]|\|\||\&\&|({{startOfIdentifier}}(as)\s+)|(\s+\<))
1632+
contentName: meta.type.cast.ts
16321633
patterns:
16331634
- include: '#type'
16341635
- name: keyword.operator.spread.ts

‎TypeScript.tmLanguage

+5-3
Original file line numberDiff line numberDiff line change
@@ -4440,7 +4440,7 @@
44404440
<key>2</key>
44414441
<dict>
44424442
<key>name</key>
4443-
<string>storage.modifier.ts</string>
4443+
<string>storage.modifier.const.type.ts</string>
44444444
</dict>
44454445
</dict>
44464446
</dict>
@@ -5099,7 +5099,7 @@
50995099
<key>2</key>
51005100
<dict>
51015101
<key>name</key>
5102-
<string>storage.modifier.ts</string>
5102+
<string>storage.modifier.const.type.ts</string>
51035103
</dict>
51045104
<key>3</key>
51055105
<dict>
@@ -5281,7 +5281,7 @@
52815281
<key>2</key>
52825282
<dict>
52835283
<key>name</key>
5284-
<string>storage.modifier.ts</string>
5284+
<string>storage.modifier.const.type.ts</string>
52855285
</dict>
52865286
</dict>
52875287
</dict>
@@ -5298,6 +5298,8 @@
52985298
</dict>
52995299
<key>end</key>
53005300
<string>(?=$|^|[;,:})\]]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
5301+
<key>contentName</key>
5302+
<string>meta.type.cast.ts</string>
53015303
<key>patterns</key>
53025304
<array>
53035305
<dict>

‎TypeScriptReact.tmLanguage

+4-2
Original file line numberDiff line numberDiff line change
@@ -4464,7 +4464,7 @@
44644464
<key>2</key>
44654465
<dict>
44664466
<key>name</key>
4467-
<string>storage.modifier.tsx</string>
4467+
<string>storage.modifier.const.type.tsx</string>
44684468
</dict>
44694469
</dict>
44704470
</dict>
@@ -5227,7 +5227,7 @@
52275227
<key>2</key>
52285228
<dict>
52295229
<key>name</key>
5230-
<string>storage.modifier.tsx</string>
5230+
<string>storage.modifier.const.type.tsx</string>
52315231
</dict>
52325232
</dict>
52335233
</dict>
@@ -5244,6 +5244,8 @@
52445244
</dict>
52455245
<key>end</key>
52465246
<string>(?=$|^|[;,:})\]]|\|\||\&amp;\&amp;|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as)\s+)|(\s+\&lt;))</string>
5247+
<key>contentName</key>
5248+
<string>meta.type.cast.tsx</string>
52475249
<key>patterns</key>
52485250
<array>
52495251
<dict>

‎tests/baselines/Issue314.baseline.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Grammar: TypeScript.tmLanguage
3636
^
3737
source.ts meta.var.expr.ts
3838
^
39-
source.ts meta.var.expr.ts entity.name.type.ts
39+
source.ts meta.var.expr.ts meta.type.cast.ts entity.name.type.ts
4040
^
41-
source.ts meta.var.expr.ts
41+
source.ts meta.var.expr.ts meta.type.cast.ts
4242
^
4343
source.ts meta.var.expr.ts keyword.operator.ternary.ts
4444
^

‎tests/baselines/Issue500.baseline.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ Grammar: TypeScript.tmLanguage
1515
^
1616
source.ts
1717
^^^
18-
source.ts support.type.primitive.ts
18+
source.ts meta.type.cast.ts support.type.primitive.ts
1919
^
20-
source.ts
20+
source.ts meta.type.cast.ts
2121
^^
2222
source.ts keyword.control.as.ts
2323
^
2424
source.ts
2525
^^^^^^
26-
source.ts support.type.primitive.ts
26+
source.ts meta.type.cast.ts support.type.primitive.ts
2727
^
2828
source.ts punctuation.terminator.statement.ts

‎tests/baselines/Issue59.baseline.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ Grammar: TypeScript.tmLanguage
4545
^
4646
source.ts meta.class.ts meta.field.declaration.ts
4747
^
48-
source.ts meta.class.ts meta.field.declaration.ts meta.object.type.ts punctuation.definition.block.ts
48+
source.ts meta.class.ts meta.field.declaration.ts meta.type.cast.ts meta.object.type.ts punctuation.definition.block.ts
4949
^
50-
source.ts meta.class.ts meta.field.declaration.ts meta.object.type.ts punctuation.definition.block.ts
50+
source.ts meta.class.ts meta.field.declaration.ts meta.type.cast.ts meta.object.type.ts punctuation.definition.block.ts
5151
^
5252
source.ts meta.class.ts punctuation.terminator.statement.ts
5353
> public a: string;

‎tests/baselines/Issue647.baseline.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Grammar: TypeScript.tmLanguage
5252
^
5353
source.ts meta.function.ts meta.block.ts
5454
^^^^^^
55-
source.ts meta.function.ts meta.block.ts support.type.primitive.ts
55+
source.ts meta.function.ts meta.block.ts meta.type.cast.ts support.type.primitive.ts
5656
^
5757
source.ts meta.function.ts meta.block.ts
5858
^

‎tests/baselines/Issue695.baseline.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ Grammar: TypeScript.tmLanguage
127127
^
128128
source.ts meta.var.expr.ts
129129
^^^^^^^^^^^^^^^^^^^^^^^^^^^
130-
source.ts meta.var.expr.ts entity.name.type.ts
130+
source.ts meta.var.expr.ts meta.type.cast.ts entity.name.type.ts
131131
^
132132
source.ts punctuation.terminator.statement.ts

‎tests/baselines/Issue762.baseline.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Grammar: TypeScript.tmLanguage
1515
^
1616
source.ts
1717
^^^
18-
source.ts support.type.primitive.ts
18+
source.ts meta.type.cast.ts support.type.primitive.ts
1919
^
20-
source.ts
20+
source.ts meta.type.cast.ts
2121
^^
2222
source.ts keyword.operator.logical.ts
2323
^

‎tests/baselines/constType.baseline.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Grammar: TypeScript.tmLanguage
5656
^
5757
source.ts meta.var.expr.ts
5858
^^^^^
59-
source.ts meta.var.expr.ts storage.modifier.ts
59+
source.ts meta.var.expr.ts storage.modifier.const.type.ts
6060
^
6161
source.ts punctuation.terminator.statement.ts
6262
>let r2 = {...p} as const;
@@ -87,7 +87,7 @@ Grammar: TypeScript.tmLanguage
8787
^
8888
source.ts meta.var.expr.ts
8989
^^^^^
90-
source.ts meta.var.expr.ts storage.modifier.ts
90+
source.ts meta.var.expr.ts storage.modifier.const.type.ts
9191
^
9292
source.ts punctuation.terminator.statement.ts
9393
>let p1 = { x: 10, y: 20 as const };
@@ -134,7 +134,7 @@ Grammar: TypeScript.tmLanguage
134134
^
135135
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
136136
^^^^^
137-
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts
137+
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts
138138
^
139139
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
140140
^
@@ -167,7 +167,7 @@ Grammar: TypeScript.tmLanguage
167167
^
168168
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
169169
^^^^^
170-
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts
170+
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts
171171
^
172172
source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.separator.comma.ts
173173
^
@@ -185,7 +185,7 @@ Grammar: TypeScript.tmLanguage
185185
^
186186
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts
187187
^^^^^
188-
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.ts
188+
source.ts meta.var.expr.ts meta.objectliteral.ts meta.object.member.ts storage.modifier.const.type.ts
189189
^
190190
source.ts meta.var.expr.ts meta.objectliteral.ts
191191
^

‎tests/baselines/constTypeAssert.baseline.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Grammar: TypeScript.tmLanguage
2727
^
2828
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
2929
^^^^^
30-
source.ts meta.var.expr.ts cast.expr.ts storage.modifier.ts
30+
source.ts meta.var.expr.ts cast.expr.ts storage.modifier.const.type.ts
3131
^
3232
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
3333
^

0 commit comments

Comments
 (0)