Skip to content

Commit 731bab7

Browse files
sheetalkamatsheetalkamat
committed
Dont consume space after cast expression
Fixes #684
1 parent ebdbdaf commit 731bab7

File tree

8 files changed

+86
-14
lines changed

8 files changed

+86
-14
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ repository:
14561456
begin: (?:(?<!\+\+|--)(?<={{lookBehindReturn}}|{{lookBehindThrow}}|{{lookBehindYield}}|{{lookBehindAwait}}|{{lookBehindDefault}}|[=(,:>*?\&\|\^]|[^_$[:alnum:]](?:\+\+|\-\-)|[^\+]\+|[^\-]\-))\s*(<)(?!<?\=)(?!\s*$)
14571457
beginCaptures:
14581458
'1': { name: meta.brace.angle.ts }
1459-
end: (\>)\s*
1459+
end: (\>)
14601460
endCaptures:
14611461
'1': { name: meta.brace.angle.ts }
14621462
patterns:
@@ -1469,7 +1469,7 @@ repository:
14691469
begin: (?:(?<=^))\s*(<)(?={{identifier}}\s*>)
14701470
beginCaptures:
14711471
'1': { name: meta.brace.angle.ts }
1472-
end: (\>)\s*
1472+
end: (\>)
14731473
endCaptures:
14741474
'1': { name: meta.brace.angle.ts }
14751475
patterns:

‎TypeScript.tmLanguage‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4680,7 +4680,7 @@
46804680
</dict>
46814681
</dict>
46824682
<key>end</key>
4683-
<string>(\&gt;)\s*</string>
4683+
<string>(\&gt;)</string>
46844684
<key>endCaptures</key>
46854685
<dict>
46864686
<key>1</key>
@@ -4711,7 +4711,7 @@
47114711
</dict>
47124712
</dict>
47134713
<key>end</key>
4714-
<string>(\&gt;)\s*</string>
4714+
<string>(\&gt;)</string>
47154715
<key>endCaptures</key>
47164716
<dict>
47174717
<key>1</key>

‎tests/baselines/ArrowFunctionInsideTypeAssertion.baseline.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ Grammar: TypeScript.tmLanguage
368368
^
369369
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
370370
^
371-
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts cast.expr.ts
371+
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts
372372
^
373373
source.ts meta.function.ts meta.block.ts meta.block.ts meta.var.expr.ts variable.other.readwrite.ts
374374
> return f("hello world")

‎tests/baselines/Issue375.baseline.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Grammar: TypeScript.tmLanguage
102102
^
103103
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
104104
^
105-
source.ts meta.var.expr.ts cast.expr.ts
105+
source.ts meta.var.expr.ts
106106
^
107107
source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
108108
^
@@ -145,7 +145,7 @@ Grammar: TypeScript.tmLanguage
145145
^
146146
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
147147
^
148-
source.ts meta.var.expr.ts cast.expr.ts
148+
source.ts meta.var.expr.ts
149149
^
150150
source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
151151
> x: '2'
@@ -189,7 +189,7 @@ Grammar: TypeScript.tmLanguage
189189
^
190190
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
191191
^
192-
source.ts meta.var.expr.ts cast.expr.ts
192+
source.ts meta.var.expr.ts
193193
^
194194
source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
195195
> x: '3'
@@ -251,7 +251,7 @@ Grammar: TypeScript.tmLanguage
251251
^
252252
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
253253
^
254-
source.ts meta.var.expr.ts cast.expr.ts
254+
source.ts meta.var.expr.ts meta.array.literal.ts
255255
^
256256
source.ts meta.var.expr.ts meta.array.literal.ts meta.brace.square.ts
257257
> new Foo('4'),
@@ -395,7 +395,7 @@ Grammar: TypeScript.tmLanguage
395395
^
396396
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
397397
^
398-
source.ts meta.var.expr.ts cast.expr.ts
398+
source.ts meta.var.expr.ts
399399
^
400400
source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
401401
^
@@ -458,7 +458,7 @@ Grammar: TypeScript.tmLanguage
458458
^
459459
source.ts meta.var.expr.ts cast.expr.ts meta.brace.angle.ts
460460
^
461-
source.ts meta.var.expr.ts cast.expr.ts
461+
source.ts meta.var.expr.ts
462462
^
463463
source.ts meta.var.expr.ts meta.objectliteral.ts punctuation.definition.block.ts
464464
^

‎tests/baselines/Issue62.baseline.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Grammar: TypeScript.tmLanguage
2929
^
3030
source.ts meta.export.default.ts cast.expr.ts meta.brace.angle.ts
3131
^
32-
source.ts meta.export.default.ts cast.expr.ts
32+
source.ts meta.export.default.ts
3333
^
3434
source.ts meta.export.default.ts meta.objectliteral.ts punctuation.definition.block.ts
3535
> // config object

‎tests/baselines/Issue684.baseline.txt‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
original file
2+
-----------------------------------
3+
// @onlyOwnGrammar - As this has type assertion
4+
function f(p: string) {
5+
return <number> <unknown> p;
6+
}
7+
-----------------------------------
8+
9+
Grammar: TypeScript.tmLanguage
10+
-----------------------------------
11+
>// @onlyOwnGrammar - As this has type assertion
12+
^^
13+
source.ts comment.line.double-slash.ts punctuation.definition.comment.ts
14+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
15+
source.ts comment.line.double-slash.ts
16+
>function f(p: string) {
17+
^^^^^^^^
18+
source.ts meta.function.ts storage.type.function.ts
19+
^
20+
source.ts meta.function.ts
21+
^
22+
source.ts meta.function.ts meta.definition.function.ts entity.name.function.ts
23+
^
24+
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
25+
^
26+
source.ts meta.function.ts meta.parameters.ts variable.parameter.ts
27+
^
28+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
29+
^
30+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts
31+
^^^^^^
32+
source.ts meta.function.ts meta.parameters.ts meta.type.annotation.ts support.type.primitive.ts
33+
^
34+
source.ts meta.function.ts meta.parameters.ts punctuation.definition.parameters.end.ts
35+
^
36+
source.ts meta.function.ts
37+
^
38+
source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts
39+
> return <number> <unknown> p;
40+
^^^^
41+
source.ts meta.function.ts meta.block.ts
42+
^^^^^^
43+
source.ts meta.function.ts meta.block.ts keyword.control.flow.ts
44+
^
45+
source.ts meta.function.ts meta.block.ts cast.expr.ts
46+
^
47+
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts
48+
^^^^^^
49+
source.ts meta.function.ts meta.block.ts cast.expr.ts support.type.primitive.ts
50+
^
51+
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts
52+
^
53+
source.ts meta.function.ts meta.block.ts cast.expr.ts
54+
^
55+
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts
56+
^^^^^^^
57+
source.ts meta.function.ts meta.block.ts cast.expr.ts support.type.primitive.ts
58+
^
59+
source.ts meta.function.ts meta.block.ts cast.expr.ts meta.brace.angle.ts
60+
^
61+
source.ts meta.function.ts meta.block.ts
62+
^
63+
source.ts meta.function.ts meta.block.ts variable.other.readwrite.ts
64+
^
65+
source.ts meta.function.ts meta.block.ts punctuation.terminator.statement.ts
66+
>}
67+
^
68+
source.ts meta.function.ts meta.block.ts punctuation.definition.block.ts

‎tests/baselines/Issue77.baseline.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Grammar: TypeScript.tmLanguage
6969
^
7070
source.ts cast.expr.ts meta.brace.angle.ts
7171
^
72-
source.ts cast.expr.ts
72+
source.ts
7373
^^^^
7474
source.ts constant.language.null.ts
7575
>
@@ -165,7 +165,7 @@ Grammar: TypeScript.tmLanguage
165165
^
166166
source.ts cast.expr.ts meta.brace.angle.ts
167167
^
168-
source.ts cast.expr.ts
168+
source.ts
169169
^^^^
170170
source.ts constant.language.null.ts
171171
>

‎tests/cases/Issue684.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// @onlyOwnGrammar - As this has type assertion
2+
function f(p: string) {
3+
return <number> <unknown> p;
4+
}

0 commit comments

Comments
 (0)