Skip to content

Commit 0027931

Browse files
committed
As operator can end at ':' if its part of ternary operation
Fixes #314
1 parent eb922b6 commit 0027931

File tree

5 files changed

+73
-3
lines changed

5 files changed

+73
-3
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ repository:
13671367
- begin: (?<!\.|\$)\bas\b(?!\$)
13681368
beginCaptures:
13691369
'0': { name: keyword.control.as.ts }
1370-
end: (?=$|[;,})\]])
1370+
end: (?=$|[;,:})\]])
13711371
patterns:
13721372
- include: '#type'
13731373
- name: keyword.operator.spread.ts

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3843,7 +3843,7 @@
38433843
</dict>
38443844
</dict>
38453845
<key>end</key>
3846-
<string>(?=$|[;,})\]])</string>
3846+
<string>(?=$|[;,:})\]])</string>
38473847
<key>patterns</key>
38483848
<array>
38493849
<dict>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3825,7 +3825,7 @@
38253825
</dict>
38263826
</dict>
38273827
<key>end</key>
3828-
<string>(?=$|[;,})\]])</string>
3828+
<string>(?=$|[;,:})\]])</string>
38293829
<key>patterns</key>
38303830
<array>
38313831
<dict>

tests/baselines/Issue314.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+
let x = a ? b as X : c;
4+
let y = 123;
5+
-----------------------------------
6+
7+
Grammar: TypeScript.tmLanguage
8+
-----------------------------------
9+
>let x = a ? b as X : c;
10+
^^^
11+
source.ts meta.var.expr.ts storage.type.ts
12+
^
13+
source.ts meta.var.expr.ts
14+
^
15+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
16+
^
17+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
18+
^
19+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
20+
^
21+
source.ts meta.var.expr.ts
22+
^
23+
source.ts meta.var.expr.ts variable.other.readwrite.ts
24+
^
25+
source.ts meta.var.expr.ts
26+
^
27+
source.ts meta.var.expr.ts keyword.operator.ternary.ts
28+
^
29+
source.ts meta.var.expr.ts
30+
^
31+
source.ts meta.var.expr.ts variable.other.readwrite.ts
32+
^
33+
source.ts meta.var.expr.ts
34+
^^
35+
source.ts meta.var.expr.ts keyword.control.as.ts
36+
^
37+
source.ts meta.var.expr.ts
38+
^
39+
source.ts meta.var.expr.ts entity.name.type.ts
40+
^
41+
source.ts meta.var.expr.ts
42+
^
43+
source.ts meta.var.expr.ts keyword.operator.ternary.ts
44+
^
45+
source.ts meta.var.expr.ts
46+
^
47+
source.ts meta.var.expr.ts variable.other.readwrite.ts
48+
^
49+
source.ts punctuation.terminator.statement.ts
50+
^^
51+
source.ts
52+
>let y = 123;
53+
^^^
54+
source.ts meta.var.expr.ts storage.type.ts
55+
^
56+
source.ts meta.var.expr.ts
57+
^
58+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts variable.other.readwrite.ts
59+
^
60+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
61+
^
62+
source.ts meta.var.expr.ts keyword.operator.assignment.ts
63+
^
64+
source.ts meta.var.expr.ts
65+
^^^
66+
source.ts meta.var.expr.ts constant.numeric.decimal.ts
67+
^
68+
source.ts punctuation.terminator.statement.ts

tests/cases/Issue314.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
let x = a ? b as X : c;
2+
let y = 123;

0 commit comments

Comments
 (0)